Title: [208644] trunk/Tools
- Revision
- 208644
- Author
- [email protected]
- Date
- 2016-11-12 00:23:55 -0800 (Sat, 12 Nov 2016)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (208643 => 208644)
--- trunk/Tools/ChangeLog 2016-11-12 08:16:44 UTC (rev 208643)
+++ trunk/Tools/ChangeLog 2016-11-12 08:23:55 UTC (rev 208644)
@@ -1,3 +1,18 @@
+2016-11-12 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
Removed unused INCLUDE_OPTIONS_FOR_DEBUGGING
Modified: trunk/Tools/Scripts/run-api-tests (208643 => 208644)
--- trunk/Tools/Scripts/run-api-tests 2016-11-12 08:16:44 UTC (rev 208643)
+++ trunk/Tools/Scripts/run-api-tests 2016-11-12 08:23:55 UTC (rev 208644)
@@ -388,17 +388,6 @@
setupMacWebKitEnvironment(productDir());
}
-sub archCommandLineArgumentsForRestrictedEnvironmentVariables()
-{
- my @arguments = ();
- foreach my $key (keys(%ENV)) {
- if ($key =~ /^DYLD_/) {
- push @arguments, "-e", "$key=$ENV{$key}";
- }
- }
- return @arguments;
-}
-
sub testToolPaths()
{
if (!isAppleWinWebKit()) {
Modified: trunk/Tools/Scripts/webkitdirs.pm (208643 => 208644)
--- trunk/Tools/Scripts/webkitdirs.pm 2016-11-12 08:16:44 UTC (rev 208643)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-11-12 08:23:55 UTC (rev 208644)
@@ -59,6 +59,7 @@
&XcodeStaticAnalyzerOption
&appDisplayNameFromBundle
&appendToEnvironmentVariableList
+ &archCommandLineArgumentsForRestrictedEnvironmentVariables
&baseProductDir
&chdirWebKit
&checkFrameworks
@@ -2437,6 +2438,17 @@
die "Not using an iOS SDK."
}
+sub archCommandLineArgumentsForRestrictedEnvironmentVariables()
+{
+ my @arguments = ();
+ foreach my $key (keys(%ENV)) {
+ if ($key =~ /^DYLD_/) {
+ push @arguments, "-e", "$key=$ENV{$key}";
+ }
+ }
+ return @arguments;
+}
+
sub runMacWebKitApp($;$)
{
my ($appPath, $useOpenCommand) = @_;
@@ -2450,7 +2462,7 @@
return system("open", "-W", "-a", $appPath, "--args", argumentsForRunAndDebugMacWebKitApp());
}
if (architecture()) {
- return system "arch", "-" . architecture(), $appPath, argumentsForRunAndDebugMacWebKitApp();
+ return system "arch", "-" . architecture(), archCommandLineArgumentsForRestrictedEnvironmentVariables(), $appPath, argumentsForRunAndDebugMacWebKitApp();
}
return system { $appPath } $appPath, argumentsForRunAndDebugMacWebKitApp();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
