diff options
Diffstat (limited to 'Tools/Scripts/run-javascriptcore-tests')
-rwxr-xr-x | Tools/Scripts/run-javascriptcore-tests | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Tools/Scripts/run-javascriptcore-tests b/Tools/Scripts/run-javascriptcore-tests index 9cb4c483b..8b79f2514 100755 --- a/Tools/Scripts/run-javascriptcore-tests +++ b/Tools/Scripts/run-javascriptcore-tests @@ -140,11 +140,16 @@ chdir "tests/mozilla" or die "Failed to switch directory to 'tests/mozilla'\n"; printf "Running: jsDriver.pl -e squirrelfish -s %s -f actual.html %s\n", jscPath($productDir), join(" ", @jsArgs); my @jsDriverCmd = ("perl", "jsDriver.pl", "-e", "squirrelfish", "-s", jscPath($productDir), "-f", "actual.html", @jsArgs); if (isGtk() || isEfl()) { - my $jhbuildPrefix = sourceDir() . "/Tools/"; - $jhbuildPrefix .= isEfl() ? "efl" : ""; - $jhbuildPrefix .= isGtk() ? "gtk" : ""; - $jhbuildPrefix .= "/run-with-jhbuild"; - unshift(@jsDriverCmd, $jhbuildPrefix); + my @jhbuildPrefix = sourceDir() . "/Tools/jhbuild/jhbuild-wrapper"; + + if (isEfl()) { + push(@jhbuildPrefix, '--efl'); + } elsif (isGtk()) { + push(@jhbuildPrefix, '--gtk'); + } + push(@jhbuildPrefix, 'run'); + + unshift(@jsDriverCmd, @jhbuildPrefix); } my $result = system(@jsDriverCmd); exit exitStatus($result) if $result; |