30288 2009-10-11 16:13:15 -0700 jsc scripts cleanup and Qt/GTK fix 2009-10-15 09:49:55 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 ossy webkit-unassigned eric oldest_to_newest 153946 0 ossy 2009-10-11 16:13:15 -0700 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; +} 153951 1 41008 ossy 2009-10-11 16:30:04 -0700 Created attachment 41008 proposed patch 154082 2 41008 darin 2009-10-12 09:17:32 -0700 Comment on attachment 41008 proposed patch Looks OK. r=me 154155 3 41008 commit-queue 2009-10-12 13:56:59 -0700 Comment on attachment 41008 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. 154157 4 41008 commit-queue 2009-10-12 14:07:10 -0700 Comment on attachment 41008 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. 154181 5 ossy 2009-10-12 15:28:23 -0700 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. 154813 6 eric 2009-10-15 09:49:55 -0700 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! 41008 2009-10-11 16:30:04 -0700 2009-10-12 14:07:10 -0700 proposed patch cleanup.patch text/plain 4716 ossy ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1ZDllYWY2Li4xMGVmOTE2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDktMTAt MTEgIENzYWJhIE9zenRyb2dvbmFjICA8b3N6aUBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAganNjIHNjcmlwdHMgY2xlYW51 cCBhbmQgUXQvR1RLIGZpeAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzAyODgKKworICAgICAgICBEdXBsaWNhdGVkIGpzY1BhdGgoKSBtb3ZlZCB0byB3 ZWJraXRkaXJzLnBtLgorICAgICAgICBOZXcganNjUHJvZHVjdERpcigpIGFkZGVkIHRvIHdlYmtp dGRpcnMucG0gaW5zdGVhZCBvZiBkdXBsaWNhdGVkIGNvZGVzLgorICAgICAgICBDb25maWd1cmF0 aW9uIGFkZGVkIChyZWxlYXNlL2RlYnVnKSB0byBwYXRoIGZvciBRdC1wb3J0IG9uIFdpbmRvd3Mu CisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0czoKKyAgICAgICAg KiBTY3JpcHRzL3J1bi1qc2M6CisgICAgICAgICogU2NyaXB0cy9ydW4tc3Vuc3BpZGVyOgorICAg ICAgICAqIFNjcmlwdHMvc3Vuc3BpZGVyLWNvbXBhcmUtcmVzdWx0czoKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdGRpcnMucG06CisKIDIwMDktMTAtMTEgIEtldmluIE9sbGl2aWVyICA8a2V2aW5v QHRoZW9sbGl2aWVycy5jb20+CiAKICAgICAgICAgd3ggYnVpbGQgZml4LCBhZGQgYmluZGluZ3Mg dG8gc291cmNlL2luY2x1ZGUgZGlycyBub3cgdGhhdCB0aGVyZSBhcmUgc291cmNlcyB0aGVyZS4K ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3Rz IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMKaW5kZXggODY1 YWUxZC4uZmI0YzM4OCAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tamF2YXNj cmlwdGNvcmUtdGVzdHMKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNv cmUtdGVzdHMKQEAgLTEwMCwyMSArMTAwLDEwIEBAIGlmICghZGVmaW5lZCgkcm9vdCkgJiYgISRz a2lwQnVpbGQpIHsKIH0KIAogCi1teSAkcHJvZHVjdERpciA9IHByb2R1Y3REaXIoKTsKLQotJHBy b2R1Y3REaXIgLj0gIi9KYXZhU2NyaXB0Q29yZSIgaWYgaXNRdCgpOwotJHByb2R1Y3REaXIgLj0g Ii9Qcm9ncmFtcyIgaWYgaXNHdGsoKTsKK215ICRwcm9kdWN0RGlyID0ganNjUHJvZHVjdERpcigp OwogJEVOVntEWUxEX0ZSQU1FV09SS19QQVRIfSA9ICRwcm9kdWN0RGlyOwogc2V0UGF0aEZvclJ1 bm5pbmdXZWJLaXRBcHAoXCVFTlYpIGlmIGlzQ3lnd2luKCk7CiAKLXN1YiBqc2NQYXRoKCQpCi17 Ci0gICAgbXkgKCRwcm9kdWN0RGlyKSA9IEBfOwotICAgIG15ICRqc2NOYW1lID0gImpzYyI7Ci0g ICAgJGpzY05hbWUgLj0gIl9kZWJ1ZyIgIGlmIChpc0N5Z3dpbigpICYmICgkY29uZmlndXJhdGlv biBlcSAiRGVidWciKSk7Ci0gICAgcmV0dXJuICIkcHJvZHVjdERpci8kanNjTmFtZSI7Ci19Ci0K IHN1YiB0ZXN0YXBpUGF0aCgkKQogewogICAgIG15ICgkcHJvZHVjdERpcikgPSBAXzsKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLWpzYyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv cnVuLWpzYwppbmRleCAyMGRjNWU4Li4yOWFiMzU1IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL3J1bi1qc2MKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tanNjCkBAIC00Mywx MCArNDMsMTAgQEAgR2V0T3B0aW9ucygiY291bnR8Yz1pIiA9PiBcJGNvdW50LAogICAgICAgICAg ICAidmVyYm9zZXx2IiA9PiBcJHZlcmJvc2UpOwogZGllICIkdXNhZ2VcbiIgaWYgKEBBUkdWIDwg MSk7CiAKLW15ICRqc2MgPSBwcm9kdWN0RGlyKCkgLiAiL2pzYyBAQVJHViI7CitteSAkanNjID0g anNjUHJvZHVjdERpcigpIC4gIi9qc2MgQEFSR1YiOwogJGpzYyAuPSAiIDI+IC9kZXYvbnVsbCIg dW5sZXNzICR2ZXJib3NlOwogCi1teSAkZHlsZCA9IHByb2R1Y3REaXIoKTsKK215ICRkeWxkID0g anNjUHJvZHVjdERpcigpOwogCiAkRU5WeyJEWUxEX0ZSQU1FV09SS19QQVRIIn0gPSAkZHlsZDsK IHByaW50IFNUREVSUiAiUnVubmluZyAkY291bnQgdGltZShzKTogRFlMRF9GUkFNRVdPUktfUEFU SD0kZHlsZCAkanNjXG4iOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tc3Vu c3BpZGVyIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tc3Vuc3BpZGVyCmluZGV4IDM2N2ZkMDYu LmU2M2Y1ZDEgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXN1bnNwaWRlcgor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi1zdW5zcGlkZXIKQEAgLTEwMywyMyArMTAzLDEy IEBAIHN1YiBzZXR1cEVudmlyb25tZW50Rm9yRXhlY3V0aW9uKCQpCiAgICAgIyBGSVhNRTogT3Ro ZXIgcGxhdGZvcm1zIG1heSB3aXNoIHRvIGF1Z21lbnQgdGhpcyBtZXRob2QgdG8gdXNlIExEX0xJ QlJBUllfUEFUSCwgZXRjLgogfQogCi1zdWIganNjUGF0aCgkKQotewotICAgIG15ICgkcHJvZHVj dERpcikgPSBAXzsKLSAgICBteSAkanNjTmFtZSA9ICJqc2MiOwotICAgICRqc2NOYW1lIC49ICJf ZGVidWciICBpZiAoaXNDeWd3aW4oKSAmJiAoJGNvbmZpZ3VyYXRpb24gZXEgIkRlYnVnIikpOwot ICAgIHJldHVybiAiJHByb2R1Y3REaXIvJGpzY05hbWUiOwotfQotCiBidWlsZEpTQygpOwogCiBj aGRpcldlYktpdCgpOwogY2hkaXIoIlN1blNwaWRlciIpOwogCi1teSAkcHJvZHVjdERpciA9IHBy b2R1Y3REaXIoKTsKLSMgRklYTUU6IFRoaXMgaGFjayBzaG91bGQgYmUgcHVzaGVkIGRvd24gaW50 byBwcm9kdWN0RGlyKCkKLSRwcm9kdWN0RGlyIC49ICIvSmF2YVNjcmlwdENvcmUiIGlmIGlzUXQo KTsKLSRwcm9kdWN0RGlyIC49ICIvUHJvZ3JhbXMiIGlmIGlzR3RrKCk7CitteSAkcHJvZHVjdERp ciA9IGpzY1Byb2R1Y3REaXIoKTsKIAogc2V0dXBFbnZpcm9ubWVudEZvckV4ZWN1dGlvbigkcHJv ZHVjdERpcik7CiBteSBAYXJncyA9ICgiLS1zaGVsbCIsIGpzY1BhdGgoJHByb2R1Y3REaXIpLCAi LS1ydW5zIiwgJHRlc3RSdW5zKTsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvc3Vu c3BpZGVyLWNvbXBhcmUtcmVzdWx0cyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3Vuc3BpZGVyLWNv bXBhcmUtcmVzdWx0cwppbmRleCBjZTg3YTIzLi5hMjA3ZDdhIDEwMDc1NQotLS0gYS9XZWJLaXRU b29scy9TY3JpcHRzL3N1bnNwaWRlci1jb21wYXJlLXJlc3VsdHMKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy9zdW5zcGlkZXItY29tcGFyZS1yZXN1bHRzCkBAIC0xMDcsOSArMTA3LDcgQEAgc3Vi IHBhdGhUb0pTQygpCiAKICAgICBidWlsZEpTQygpOwogCi0gICAgbXkgJHByb2R1Y3REaXIgPSBw cm9kdWN0RGlyKCk7Ci0gICAgIyBGSVhNRTogVGhpcyBoYWNrIHNob3VsZCBiZSBwdXNoZWQgZG93 biBpbnRvIHByb2R1Y3REaXIoKQotICAgICRwcm9kdWN0RGlyIC49ICIvSmF2YVNjcmlwdENvcmUi IGlmIChpc1F0KCkgb3IgaXNHdGsoKSk7CisgICAgbXkgJHByb2R1Y3REaXIgPSBqc2NQcm9kdWN0 RGlyKCk7CiAKICAgICBzZXR1cEVudmlyb25tZW50Rm9yRXhlY3V0aW9uKCRwcm9kdWN0RGlyKTsK ICAgICByZXR1cm4gcGF0aFRvQnVpbHRKU0MoJHByb2R1Y3REaXIpOwpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCmluZGV4IGQ1MTc3ZGQuLjBjMjJjMWMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KQEAgLTIxNSw2ICsyMTUsMTQgQEAgc3ViIGRldGVybWluZUFyY2hpdGVjdHVyZQogICAg IH0KIH0KIAorc3ViIGpzY1BhdGgoJCkKK3sKKyAgICBteSAoJHByb2R1Y3REaXIpID0gQF87Cisg ICAgbXkgJGpzY05hbWUgPSAianNjIjsKKyAgICAkanNjTmFtZSAuPSAiX2RlYnVnIiAgaWYgKGlz Q3lnd2luKCkgJiYgKCRjb25maWd1cmF0aW9uIGVxICJEZWJ1ZyIpKTsKKyAgICByZXR1cm4gIiRw cm9kdWN0RGlyLyRqc2NOYW1lIjsKK30KKwogc3ViIGFyZ3VtZW50c0ZvckNvbmZpZ3VyYXRpb24o KQogewogICAgIGRldGVybWluZUNvbmZpZ3VyYXRpb24oKTsKQEAgLTMwMCw2ICszMDgsMTYgQEAg c3ViIHByb2R1Y3REaXIKICAgICByZXR1cm4gJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyOwogfQog CitzdWIganNjUHJvZHVjdERpcgoreworICAgIG15ICRwcm9kdWN0RGlyID0gZGV0ZXJtaW5lQ29u ZmlndXJhdGlvblByb2R1Y3REaXIoKTsKKyAgICAkcHJvZHVjdERpciAuPSAiL0phdmFTY3JpcHRD b3JlIiBpZiBpc1F0KCk7CisgICAgJHByb2R1Y3REaXIgLj0gIi8kY29uZmlndXJhdGlvbiIgaWYg KGlzUXQoKSAmJiBpc1dpbmRvd3MoKSk7CisgICAgJHByb2R1Y3REaXIgLj0gIi9Qcm9ncmFtcyIg aWYgaXNHdGsoKTsKKworICAgIHJldHVybiAkcHJvZHVjdERpcjsKK30KKwogc3ViIGNvbmZpZ3Vy YXRpb24oKQogewogICAgIGRldGVybWluZUNvbmZpZ3VyYXRpb24oKTsK