Bug 30288 – jsc scripts cleanup and Qt/GTK fix

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Csaba Osztrogonác]

In jsc scripts there are unnecessary code duplications:

- sub jscPath($)
We should move it to webkitdirs.pm.

-my $productDir = productDir();
-
-$productDir .= "/JavaScriptCore" if isQt();
-$productDir .= "/Programs" if isGtk();
Additionally sunspider-compare-results there is a code like this,
but not works with GTK port: $productDir .= "/JavaScriptCore" if (isQt() or isGtk());
We should use only one function instead of duplicated code.
With Qt port on Windows $productDir must contain the configuration (release/debug) too.
I propose adding a new function to webkitdirs.pm:
+sub jscProductDir
+{
+    my $productDir = determineConfigurationProductDir();
+    $productDir .= "/JavaScriptCore" if isQt();
+    $productDir .= "/$configuration" if (isQt() && isWindows());
+    $productDir .= "/Programs" if isGtk();
+
+    return $productDir;
+}

[Csaba Osztrogonác]

Created attachment 41008 [details]
proposed patch

[Darin Adler]

Comment on attachment 41008 [details]
proposed patch

Looks OK. r=me

[WebKit Commit Bot]

Comment on attachment 41008 [details]
proposed patch

Rejecting patch 41008 from commit-queue.

[e-mail] does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py.

[WebKit Commit Bot]

Comment on attachment 41008 [details]
proposed patch

Rejecting patch 41008 from commit-queue.

[e-mail] does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py.

[Csaba Osztrogonác]

Sending        WebKitTools/ChangeLog
Sending        WebKitTools/Scripts/run-javascriptcore-tests
Sending        WebKitTools/Scripts/run-jsc
Sending        WebKitTools/Scripts/run-sunspider
Sending        WebKitTools/Scripts/sunspider-compare-results
Sending        WebKitTools/Scripts/webkitdirs.pm
Transmitting file data ......
Committed revision 49476.

[Eric Seidel (no email)]

Sorry about the trouble.  Unfortunately right now the commit-queue needs a manual restart every time someone is added to the committers.py file.  I used to restart the commit-queue every day, and so this was never an issue.  Now I restart it about once a week, so we're seeing this more often.  I've restarted it just now and cq+ should work for you now.  Again, my apologies for the trouble!