43470 2010-08-04 00:28:11 -0700 Chromium buildbot: Avoid "zip" command dependency 2010-08-08 19:32:05 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other All RESOLVED FIXED P2 Normal --- 1 tkent tkent abarth dglazkov eric mrowe tony webkit.review.bot oldest_to_newest 259905 0 tkent 2010-08-04 00:28:11 -0700 Chromium buildbot: Avoid "zip" command dependency 259907 1 63423 tkent 2010-08-04 00:31:37 -0700 Created attachment 63423 Patch 260049 2 63423 tony 2010-08-04 09:12:36 -0700 Comment on attachment 63423 Patch Why do we only do this for Chromium? Why not use the same code for all platforms? > diff --git a/WebKitTools/BuildSlaveSupport/test-result-archive b/WebKitTools/BuildSlaveSupport/test-result-archive > + for file in files: > + zipFileOrDirectory(zipper, file) I think you can use os.walk instead of adding this helper method. 260426 3 63558 tkent 2010-08-04 23:43:22 -0700 Created attachment 63558 Patch 2 260428 4 tkent 2010-08-04 23:48:29 -0700 Thank you for reviewing. (In reply to comment #2) > Why do we only do this for Chromium? Why not use the same code for all platforms? I'm not sure if other platforms want to avoid zip command, and I'd like to test this change only on Chromium bots for now :-) > > + for file in files: > > + zipFileOrDirectory(zipper, file) > > I think you can use os.walk instead of adding this helper method. ok, I updated the code with os.walk. 260667 5 63558 tony 2010-08-05 09:47:06 -0700 Comment on attachment 63558 Patch 2 > diff --git a/WebKitTools/BuildSlaveSupport/test-result-archive b/WebKitTools/BuildSlaveSupport/test-result-archive > + for dirPath, dirNames, fileNames in os.walk(file): > + for fileName in fileNames: > + relativePath = os.path.join(dirPath, fileName) > + print "Adding ", relativePath Nit: I think print automatically puts a space between each argument. Not a big deal, but I think this puts 2 spaces between "Adding" and the path. Same below. 260670 6 tony 2010-08-05 09:49:42 -0700 Mark: Do you think it would be ok to use the built in python module zipfile on all platforms? 260739 7 mrowe 2010-08-05 11:45:52 -0700 (In reply to comment #6) > Mark: Do you think it would be ok to use the built in python module zipfile on all platforms? Assuming that it works on all of the relevant platforms and generates zip files that are consistent with what the existing approach is generating, I see no reason not to. 261951 8 tkent 2010-08-08 18:34:08 -0700 (In reply to comment #5) > > + print "Adding ", relativePath > > Nit: I think print automatically puts a space between each argument. Not a big deal, but I think this puts 2 spaces between "Adding" and the path. Same below. Thanks. Fixed. Landed as r64959. 261958 9 webkit.review.bot 2010-08-08 19:32:05 -0700 http://trac.webkit.org/changeset/64959 might have broken Leopard Intel Release (Tests) 63423 2010-08-04 00:31:37 -0700 2010-08-04 23:43:17 -0700 Patch bug-43470-20100804163135.patch text/plain 3065 tkent ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L3Rlc3QtcmVzdWx0LWFy Y2hpdmUgYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC90ZXN0LXJlc3VsdC1hcmNoaXZl CmluZGV4IGRmMDJkYmQxOWUyMmZhYmVjN2QxYjBjODgyNzFmNWExODM2Yjc1NjguLjliNTA0MjVk MWVhYmI0MjIzOGU4ZDA4MDg0NjIwMTQ0ZjJkNGJiN2UgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L3Rlc3QtcmVzdWx0LWFyY2hpdmUKKysrIGIvV2ViS2l0VG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvdGVzdC1yZXN1bHQtYXJjaGl2ZQpAQCAtMjMsNyArMjMsNyBAQAog IyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UgT0YKICMgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAotaW1wb3J0IG9wdHBhcnNlLCBvcywgc2h1 dGlsLCBzdWJwcm9jZXNzLCBzeXMKK2ltcG9ydCBvcHRwYXJzZSwgb3MsIHNodXRpbCwgc3VicHJv Y2Vzcywgc3lzLCB6aXBmaWxlCiAKIHNvdXJjZVJvb3REaXJlY3RvcnkgPSBvcy5wYXRoLmFic3Bh dGgob3MucGF0aC5qb2luKG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXyksICIuLiIsICIuLiIpKQog bGF5b3V0VGVzdFJlc3VsdHNEaXIgPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKHNvdXJj ZVJvb3REaXJlY3RvcnksICJsYXlvdXQtdGVzdC1yZXN1bHRzIikpCkBAIC02Niw5ICs2NiwxMiBA QCBkZWYgYXJjaGl2ZVRlc3RSZXN1bHRzKGNvbmZpZ3VyYXRpb24sIHBsYXRmb3JtKToKICAgICBp ZiBwbGF0Zm9ybSA9PSAnbWFjJzoKICAgICAgICAgaWYgc3VicHJvY2Vzcy5jYWxsKFsiZGl0dG8i LCAiLWMiLCAiLWsiLCAiLS1zZXF1ZXN0ZXJSc3JjIiwgbGF5b3V0VGVzdFJlc3VsdHNEaXIsIGFy Y2hpdmVGaWxlXSk6CiAgICAgICAgICAgICByZXR1cm4gMQotICAgIGVsaWYgcGxhdGZvcm0gaW4g KCd3aW4nLCAnZ3RrJywgJ3F0JywgJ2Nocm9taXVtJyk6CisgICAgZWxpZiBwbGF0Zm9ybSBpbiAo J3dpbicsICdndGsnLCAncXQnKToKICAgICAgICAgaWYgc3VicHJvY2Vzcy5jYWxsKFsiemlwIiwg Ii1yIiwgYXJjaGl2ZUZpbGUsICIuIl0sIGN3ZD1sYXlvdXRUZXN0UmVzdWx0c0Rpcik6CiAgICAg ICAgICAgICByZXR1cm4gMQorICAgIGVsaWYgcGxhdGZvcm0gPT0gJ2Nocm9taXVtJzoKKyAgICAg ICAgb3MuY2hkaXIobGF5b3V0VGVzdFJlc3VsdHNEaXIpCisgICAgICAgIHppcEZpbGVzUmVjdXJz aXZlbHkoYXJjaGl2ZUZpbGUsIFsiLiJdKQogCiAgICAgdHJ5OgogICAgICAgICBzaHV0aWwucm10 cmVlKGxheW91dFRlc3RSZXN1bHRzRGlyKQpAQCAtODIsNSArODUsMjYgQEAgZGVmIGFyY2hpdmVU ZXN0UmVzdWx0cyhjb25maWd1cmF0aW9uLCBwbGF0Zm9ybSk6CiAgICAgICAgIGlmIGUuZXJybm8g IT0gOTA6CiAgICAgICAgICAgICByYWlzZQogCitkZWYgemlwRmlsZU9yRGlyZWN0b3J5KHppcHBl ciwgZmlsZSk6CisgICAgaWYgb3MucGF0aC5pc2RpcihmaWxlKToKKyAgICAgICAgZm9yIGNoaWxk IGluIG9zLmxpc3RkaXIoZmlsZSk6CisgICAgICAgICAgICB6aXBGaWxlT3JEaXJlY3Rvcnkoemlw cGVyLCBvcy5wYXRoLmpvaW4oZmlsZSwgY2hpbGQpKQorICAgIGVsc2U6CisgICAgICAgIHByaW50 ICJBZGRpbmcgJXMiICUgZmlsZQorICAgICAgICB6aXBwZXIud3JpdGUoZmlsZSkKKworZGVmIHpp cEZpbGVzUmVjdXJzaXZlbHkoYXJjaGl2ZUZpbGUsIGZpbGVzKToKKyAgICAiIiJNYWtlIGEgemlw IGFyY2hpdmUuCisKKyAgICBBcmdzOgorICAgICAgICBhcmNoaXZlRmlsZTogVGhlIHJlc3VsdGFu dCB6aXAgYXJjaGl2ZSBmaWxlIG5hbWUuCisgICAgICAgIGZpbGVzOiBBIGxpc3Qgb2YgZmlsZXMg dG8gYmUgYXJjaGl2ZWQuICBJZiBhIGxpc3QgaXRlbSBpcyBhIGRpcmVjdG9yeSwKKyAgICAgICAg ICAgIGZpbGVzIGluIHRoZSBkaXJlY3RvcnkgYXJlIGFyY2hpdmVkIHJlY3Vyc2l2ZWx5LiIiIgor ICAgIHppcHBlciA9IHppcGZpbGUuWmlwRmlsZShhcmNoaXZlRmlsZSwgJ3cnLCB6aXBmaWxlLlpJ UF9ERUZMQVRFRCkKKyAgICBmb3IgZmlsZSBpbiBmaWxlczoKKyAgICAgICAgemlwRmlsZU9yRGly ZWN0b3J5KHppcHBlciwgZmlsZSkKKyAgICB6aXBwZXIuY2xvc2UoKQorICAgIHByaW50ICJDcmVh dGVkIHppcCBhcmNoaXZlIiwgYXJjaGl2ZUZpbGUKKwogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9f JzoKICAgICBzeXMuZXhpdChtYWluKCkpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggMmMwNWFjNWU3MzczYjZkNGE4MjBlMjY3 OGNmYmIxNDkxNTA2YzU2OS4uYzUzZWNiYjE3MDk2OWI2N2FlYmY1NWJmMWJjNTY0MzA5YmNhZTBh ZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTA4LTA0ICBLZW50IFRhbXVyYSAgPHRrZW50 QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDaHJvbWl1bSBidWlsZGJvdDogQXZvaWQgInppcCIgY29tbWFuZCBkZXBlbmRlbmN5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzQ3MAor CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvdGVzdC1yZXN1bHQtYXJjaGl2ZToKKyAgICAg ICAgIEZvciBDaHJvbWl1bSBwb3J0LCBjcmVhdGVzIGEgemlwIGFyY2hpdmUgd2l0aCB6aXBmaWxl IHBhY2thZ2Ugb2YgUHl0aG9uCisgICAgICAgICBpbnN0ZWFkIG9mIGV4dGVybmFsICJ6aXAiIGNv bW1hbmQuIFdlJ2QgbGlrZSB0byBhdm9pZCBhZGRpdGlvbmFsCisgICAgICAgICBjb21tYW5kIGlu c3RhbGxhdGlvbi4KKwogMjAxMC0wOC0wMyAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292Lgo= 63558 2010-08-04 23:43:22 -0700 2010-08-05 09:47:06 -0700 Patch 2 bug-43470-20100805154320.patch text/plain 3187 tkent ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L3Rlc3QtcmVzdWx0LWFy Y2hpdmUgYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC90ZXN0LXJlc3VsdC1hcmNoaXZl CmluZGV4IDlhMGFjZmU1OWNjMTExMWU1NmY2ZGZmODZiNzU0MDcyMWZkY2E2NTYuLmYxMzk4MjI0 OTU2ZDQ3NjZkYjBkNWExNGVmMjgyMmU2NTUyMTU5YzkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L3Rlc3QtcmVzdWx0LWFyY2hpdmUKKysrIGIvV2ViS2l0VG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvdGVzdC1yZXN1bHQtYXJjaGl2ZQpAQCAtMjMsNyArMjMsNyBAQAog IyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UgT0YKICMgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAotaW1wb3J0IG9wdHBhcnNlLCBvcywgc2h1 dGlsLCBzdWJwcm9jZXNzLCBzeXMKK2ltcG9ydCBvcHRwYXJzZSwgb3MsIHNodXRpbCwgc3VicHJv Y2Vzcywgc3lzLCB6aXBmaWxlCiAKIHNvdXJjZVJvb3REaXJlY3RvcnkgPSBvcy5wYXRoLmFic3Bh dGgob3MucGF0aC5qb2luKG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXyksICIuLiIsICIuLiIpKQog YXJjaGl2ZUZpbGUgPSBvcy5wYXRoLmpvaW4oc291cmNlUm9vdERpcmVjdG9yeSwgImxheW91dC10 ZXN0LXJlc3VsdHMuemlwIikKQEAgLTcyLDkgKzcyLDEyIEBAIGRlZiBhcmNoaXZlVGVzdFJlc3Vs dHMoY29uZmlndXJhdGlvbiwgcGxhdGZvcm0sIGxheW91dFRlc3RSZXN1bHRzRGlyKToKICAgICBp ZiBwbGF0Zm9ybSA9PSAnbWFjJzoKICAgICAgICAgaWYgc3VicHJvY2Vzcy5jYWxsKFsiZGl0dG8i LCAiLWMiLCAiLWsiLCAiLS1zZXF1ZXN0ZXJSc3JjIiwgbGF5b3V0VGVzdFJlc3VsdHNEaXIsIGFy Y2hpdmVGaWxlXSk6CiAgICAgICAgICAgICByZXR1cm4gMQotICAgIGVsaWYgcGxhdGZvcm0gaW4g KCd3aW4nLCAnZ3RrJywgJ3F0JywgJ2Nocm9taXVtJyk6CisgICAgZWxpZiBwbGF0Zm9ybSBpbiAo J3dpbicsICdndGsnLCAncXQnKToKICAgICAgICAgaWYgc3VicHJvY2Vzcy5jYWxsKFsiemlwIiwg Ii1yIiwgYXJjaGl2ZUZpbGUsICIuIl0sIGN3ZD1sYXlvdXRUZXN0UmVzdWx0c0Rpcik6CiAgICAg ICAgICAgICByZXR1cm4gMQorICAgIGVsaWYgcGxhdGZvcm0gPT0gJ2Nocm9taXVtJzoKKyAgICAg ICAgb3MuY2hkaXIobGF5b3V0VGVzdFJlc3VsdHNEaXIpCisgICAgICAgIHppcEZpbGVzUmVjdXJz aXZlbHkoYXJjaGl2ZUZpbGUsIFsiLiJdKQogCiAgICAgdHJ5OgogICAgICAgICBzaHV0aWwucm10 cmVlKGxheW91dFRlc3RSZXN1bHRzRGlyKQpAQCAtODgsNSArOTEsMjYgQEAgZGVmIGFyY2hpdmVU ZXN0UmVzdWx0cyhjb25maWd1cmF0aW9uLCBwbGF0Zm9ybSwgbGF5b3V0VGVzdFJlc3VsdHNEaXIp OgogICAgICAgICBpZiBlLmVycm5vICE9IDkwOgogICAgICAgICAgICAgcmFpc2UKIAorZGVmIHpp cEZpbGVzUmVjdXJzaXZlbHkoYXJjaGl2ZUZpbGUsIGZpbGVzKToKKyAgICAiIiJNYWtlIGEgemlw IGFyY2hpdmUuCisKKyAgICBBcmdzOgorICAgICAgICBhcmNoaXZlRmlsZTogVGhlIHJlc3VsdGFu dCB6aXAgYXJjaGl2ZSBmaWxlIG5hbWUuCisgICAgICAgIGZpbGVzOiBBIGxpc3Qgb2YgZmlsZXMg dG8gYmUgYXJjaGl2ZWQuICBJZiBhIGxpc3QgaXRlbSBpcyBhIGRpcmVjdG9yeSwKKyAgICAgICAg ICAgIGZpbGVzIGluIHRoZSBkaXJlY3RvcnkgYXJlIGFyY2hpdmVkIHJlY3Vyc2l2ZWx5LiIiIgor ICAgIHppcHBlciA9IHppcGZpbGUuWmlwRmlsZShhcmNoaXZlRmlsZSwgJ3cnLCB6aXBmaWxlLlpJ UF9ERUZMQVRFRCkKKyAgICBmb3IgZmlsZSBpbiBmaWxlczoKKyAgICAgICAgaWYgb3MucGF0aC5p c2RpcihmaWxlKToKKyAgICAgICAgICAgIGZvciBkaXJQYXRoLCBkaXJOYW1lcywgZmlsZU5hbWVz IGluIG9zLndhbGsoZmlsZSk6CisgICAgICAgICAgICAgICAgZm9yIGZpbGVOYW1lIGluIGZpbGVO YW1lczoKKyAgICAgICAgICAgICAgICAgICAgcmVsYXRpdmVQYXRoID0gb3MucGF0aC5qb2luKGRp clBhdGgsIGZpbGVOYW1lKQorICAgICAgICAgICAgICAgICAgICBwcmludCAiQWRkaW5nICIsIHJl bGF0aXZlUGF0aAorICAgICAgICAgICAgICAgICAgICB6aXBwZXIud3JpdGUocmVsYXRpdmVQYXRo KQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgcHJpbnQgIkFkZGluZyAiLCBmaWxlCisgICAg ICAgICAgICB6aXBwZXIud3JpdGUoZmlsZSkKKyAgICB6aXBwZXIuY2xvc2UoKQorICAgIHByaW50 ICJDcmVhdGVkIHppcCBhcmNoaXZlOiAiLCBhcmNoaXZlRmlsZQorCiBpZiBfX25hbWVfXyA9PSAn X19tYWluX18nOgogICAgIHN5cy5leGl0KG1haW4oKSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCA1ZTkwOTU4ZDA0MzQ0ODgz N2Y1YzJkM2NiZTc1ODYxNGMyMzBhNDgxLi4xYzZjMmY5YWJjZjlmOGNiMGE4YTBjMTUwNzdkZTY1 NWEwNTIwZjE5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0 VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDgtMDUgIEtlbnQgVGFtdXJh ICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENocm9taXVtIGJ1aWxkYm90OiBBdm9pZCAiemlwIiBjb21tYW5kIGRl cGVuZGVuY3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQzNDcwCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC90ZXN0LXJlc3VsdC1hcmNoaXZl OgorICAgICAgICAgRm9yIENocm9taXVtIHBvcnQsIGNyZWF0ZXMgYSB6aXAgYXJjaGl2ZSB3aXRo IHppcGZpbGUgcGFja2FnZSBvZiBQeXRob24KKyAgICAgICAgIGluc3RlYWQgb2YgZXh0ZXJuYWwg InppcCIgY29tbWFuZC4gV2UnZCBsaWtlIHRvIGF2b2lkIGFkZGl0aW9uYWwKKyAgICAgICAgIGNv bW1hbmQgaW5zdGFsbGF0aW9uLgorCiAyMDEwLTA4LTA0ICBLZW50IFRhbXVyYSAgPHRrZW50QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCg==