Bug 30288 - jsc scripts cleanup and Qt/GTK fix
Summary: jsc scripts cleanup and Qt/GTK fix
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC All
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-10-11 16:13 PDT by Csaba Osztrogonác
Modified: 2009-10-15 09:49 PDT (History)
1 user (show)

See Also:


Attachments
proposed patch (4.61 KB, patch)
2009-10-11 16:30 PDT, Csaba Osztrogonác
darin: review+
commit-queue: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Csaba Osztrogonác 2009-10-11 16:13:15 PDT
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;
+}
Comment 1 Csaba Osztrogonác 2009-10-11 16:30:04 PDT
Created attachment 41008 [details]
proposed patch
Comment 2 Darin Adler 2009-10-12 09:17:32 PDT
Comment on attachment 41008 [details]
proposed patch

Looks OK. r=me
Comment 3 WebKit Commit Bot 2009-10-12 13:56:59 PDT
Comment on attachment 41008 [details]
proposed patch

Rejecting patch 41008 from commit-queue.

ossy@webkit.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py.
Comment 4 WebKit Commit Bot 2009-10-12 14:07:10 PDT
Comment on attachment 41008 [details]
proposed patch

Rejecting patch 41008 from commit-queue.

ossy@webkit.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py.
Comment 5 Csaba Osztrogonác 2009-10-12 15:28:23 PDT
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.
Comment 6 Eric Seidel (no email) 2009-10-15 09:49:55 PDT
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!