diff options
Diffstat (limited to 'Tools/Scripts/run-webkit-tests')
| -rwxr-xr-x | Tools/Scripts/run-webkit-tests | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Tools/Scripts/run-webkit-tests b/Tools/Scripts/run-webkit-tests index 24fcfd02f..b7e1eaa7e 100755 --- a/Tools/Scripts/run-webkit-tests +++ b/Tools/Scripts/run-webkit-tests @@ -58,7 +58,7 @@ sub runningOnBuildBot() sub useNewRunWebKitTests() { # NRWT Windows support still needs work: https://bugs.webkit.org/show_bug.cgi?id=38756 - return 0 if isWindows() or isCygwin(); + return 0 if (isWindows() or isCygwin()) and !isChromium(); # NRWT does not support qt-arm: https://bugs.webkit.org/show_bug.cgi?id=64086 return 0 if isQt() and isARM(); # All other platforms should use NRWT by default. @@ -79,9 +79,11 @@ sub platformIsReadyForParallelTesting() return !isQt(); } +my $script = "perl"; my $harnessName = "old-run-webkit-tests"; if (useNewRunWebKitTests()) { + $script = "python"; $harnessName = "new-run-webkit-tests"; if (!grep(/--child-processes/, @ARGV) and !platformIsReadyForParallelTesting()) { @@ -115,4 +117,6 @@ if (isQt()) { } my $harnessPath = File::Spec->catfile(relativeScriptsDir(), $harnessName); -exec $harnessPath ($harnessPath, @ARGV) or die "Failed to execute $harnessPath"; +unshift(@ARGV, $harnessPath); +unshift(@ARGV, $script); +system(@ARGV) == 0 or die "Failed to execute $harnessPath"; |