Title: [112567] trunk/Tools
Revision
112567
Author
[email protected]
Date
2012-03-29 13:31:32 -0700 (Thu, 29 Mar 2012)

Log Message

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

Patch by Dominik Röttsches <[email protected]> on 2012-03-29
Reviewed by Martin Robinson.

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

* Scripts/run-_javascript_core-tests:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (112566 => 112567)


--- trunk/Tools/ChangeLog	2012-03-29 20:20:13 UTC (rev 112566)
+++ trunk/Tools/ChangeLog	2012-03-29 20:31:32 UTC (rev 112567)
@@ -1,3 +1,16 @@
+2012-03-29  Dominik Röttsches  <[email protected]>
+
+        [GTK][EFL] run-_javascript_core-tests should be run through jhbuild
+        https://bugs.webkit.org/show_bug.cgi?id=82581
+
+        Reviewed by Martin Robinson.
+
+        Running _javascript_core tests through jhbuild
+        for consistency with run-webkit-tests and in order to
+        avoid confusing libraries when facing regressions.
+
+        * Scripts/run-_javascript_core-tests:
+
 2012-03-29  Dirk Pranke  <[email protected]>
 
         test-webkitpy: add --timing

Modified: trunk/Tools/Scripts/run-_javascript_core-tests (112566 => 112567)


--- trunk/Tools/Scripts/run-_javascript_core-tests	2012-03-29 20:20:13 UTC (rev 112566)
+++ trunk/Tools/Scripts/run-_javascript_core-tests	2012-03-29 20:31:32 UTC (rev 112567)
@@ -137,7 +137,15 @@
 chdir("Source/_javascript_Core");
 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;
 
 my %failures;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to