Changeset 190412 in webkit

Timestamp:

Oct 1, 2015, 10:16:40 AM (9 years ago)

Author:

ap@apple.com

Message:

[Mac] Make run-api-tests work with System Integrity Protection
​https://bugs.webkit.org/show_bug.cgi?id=149711
rdar://problem/22928202

Reviewed by Dan Bernstein.

• Scripts/run-api-tests:

(runTest):
(archCommandLineArgumentsForRestrictedEnvironmentVariables):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-api-tests (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-10-01  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] Make run-api-tests work with System Integrity Protection
+        https://bugs.webkit.org/show_bug.cgi?id=149711
+        rdar://problem/22928202
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/run-api-tests:
+        (runTest):
+        (archCommandLineArgumentsForRestrictedEnvironmentVariables):
+
 2015-10-01  Daniel Bates  <dabates@apple.com>
 

trunk/Tools/Scripts/run-api-tests

@@ -41 +41 @@
 sub runTestsBySuite(\@);
 sub prepareEnvironmentForRunningTestTool();
+sub archCommandLineArgumentsForRestrictedEnvironmentVariables();
 sub testToolPaths();
 
@@ -197 +198 @@
             $pid = open3($childIn, $childOut, $childErr, qw(xcrun -sdk iphonesimulator sim --environment=merge), @commonArguments) or die "Failed to run test: $test.";
         } elsif (isAppleMacWebKit() && architecture()) {
-            $pid = open3($childIn, $childOut, $childErr, "arch", "-" . architecture(), @commonArguments) or die "Failed to run test: $test.";
+            $pid = open3($childIn, $childOut, $childErr, "arch", "-" . architecture(), archCommandLineArgumentsForRestrictedEnvironmentVariables(), @commonArguments) or die "Failed to run test: $test.";
         } else {
             $pid = open3($childIn, $childOut, $childErr, @commonArguments) or die "Failed to run test: $test.";
@@ -348 +349 @@
 }
 
+sub archCommandLineArgumentsForRestrictedEnvironmentVariables()
+{
+    my @arguments = ();
+    foreach my $key (keys(%ENV)) {
+        if ($key =~ /^DYLD_/) {
+            push @arguments, "-e", "$key=$ENV{$key}";
+        }
+    }
+    return @arguments;
+}
+
 sub testToolPaths()
 {