Changeset 208644 in webkit

Timestamp:

Nov 12, 2016, 12:23:55 AM (9 years ago)

Author:

mitz@apple.com

Message:

run-safari does not work for open source contributors
​https://bugs.webkit.org/show_bug.cgi?id=164667
<rdar://problem/29229894>

Reviewed by Joseph Pecoraro.

• Scripts/run-api-tests:

(archCommandLineArgumentsForRestrictedEnvironmentVariables): Moved from here…

• Scripts/webkitdirs.pm:

(archCommandLineArgumentsForRestrictedEnvironmentVariables): …to here
(runMacWebKitApp): Have arch(1) carry the DYLD_* variables we set in our environmet over

to the environment of the app being run.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2016-11-12  Dan Bernstein  <mitz@apple.com>
+
+        run-safari does not work for open source contributors
+        https://bugs.webkit.org/show_bug.cgi?id=164667
+        <rdar://problem/29229894>
+
+        Reviewed by Joseph Pecoraro.
+
+        * Scripts/run-api-tests:
+        (archCommandLineArgumentsForRestrictedEnvironmentVariables): Moved from here…
+        * Scripts/webkitdirs.pm:
+        (archCommandLineArgumentsForRestrictedEnvironmentVariables): …to here
+        (runMacWebKitApp): Have arch(1) carry the DYLD_* variables we set in our environmet over
+          to the environment of the app being run.
+
 2016-11-11  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Tools/Scripts/run-api-tests

@@ -389 +389 @@
 }
 
-sub archCommandLineArgumentsForRestrictedEnvironmentVariables()
-{
-    my @arguments = ();
-    foreach my $key (keys(%ENV)) {
-        if ($key =~ /^DYLD_/) {
-            push @arguments, "-e", "$key=$ENV{$key}";
-        }
-    }
-    return @arguments;
-}
-
 sub testToolPaths()
 {

trunk/Tools/Scripts/webkitdirs.pm

@@ -60 +60 @@
        &appDisplayNameFromBundle
        &appendToEnvironmentVariableList
+       &archCommandLineArgumentsForRestrictedEnvironmentVariables
        &baseProductDir
        &chdirWebKit
@@ -2438 +2439 @@
 }
 
+sub archCommandLineArgumentsForRestrictedEnvironmentVariables()
+{
+    my @arguments = ();
+    foreach my $key (keys(%ENV)) {
+        if ($key =~ /^DYLD_/) {
+            push @arguments, "-e", "$key=$ENV{$key}";
+        }
+    }
+    return @arguments;
+}
+
 sub runMacWebKitApp($;$)
 {
@@ -2451 +2463 @@
     }
     if (architecture()) {
-        return system "arch", "-" . architecture(), $appPath, argumentsForRunAndDebugMacWebKitApp();
+        return system "arch", "-" . architecture(), archCommandLineArgumentsForRestrictedEnvironmentVariables(), $appPath, argumentsForRunAndDebugMacWebKitApp();
     }
     return system { $appPath } $appPath, argumentsForRunAndDebugMacWebKitApp();