Changeset 112567 in webkit

Timestamp:

Mar 29, 2012 1:31:32 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][EFL] run-javascriptcore-tests should be run through jhbuild
​https://bugs.webkit.org/show_bug.cgi?id=82581

Patch by Dominik Röttsches <​dominik.rottsches@linux.intel.com> on 2012-03-29
Reviewed by Martin Robinson.

Running Javascriptcore tests through jhbuild
for consistency with run-webkit-tests and in order to
avoid confusing libraries when facing regressions.

• Scripts/run-javascriptcore-tests:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-javascriptcore-tests (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-29  Dominik Röttsches  <dominik.rottsches@linux.intel.com>
+
+        [GTK][EFL] run-javascriptcore-tests should be run through jhbuild
+        https://bugs.webkit.org/show_bug.cgi?id=82581
+
+        Reviewed by Martin Robinson.
+
+        Running Javascriptcore tests through jhbuild
+        for consistency with run-webkit-tests and in order to
+        avoid confusing libraries when facing regressions.
+
+        * Scripts/run-javascriptcore-tests:
+
 2012-03-29  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/run-javascriptcore-tests

@@ -138 +138 @@
 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 $result = system "perl", "jsDriver.pl", "-e", "squirrelfish", "-s", jscPath($productDir), "-f", "actual.html", @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 $result = system(@jsDriverCmd);
 exit exitStatus($result)  if $result;