117212 2013-06-04 15:10:34 -0700 [Windows] Revise Windows code in NRWT to properly distinguish between "win32" and "cygwin" behavior 2013-06-04 16:48:03 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 117098 1 bfulgham bfulgham bfulgham commit-queue dpranke glenn rniwa oldest_to_newest 897057 0 bfulgham 2013-06-04 15:10:34 -0700 Dirk Pranke pointed out that changes I made under Bug 117098 improperly treated the "win32" and "cygwin" variants of Windows builds as the same thing. Unfortunately, Windows does not provide a 'ps' tool, and so cannot be handled the same way as our Cygwin infrastructure. This patch makes the following corrections: 1. It returns to the original "win32" behavior of returning an empty list when attempting to find running PIDs. 2. Revise crashlog object to accept a "results directory" argument, rather than requiring the user to pass a port object when attempting to retrieve crash logs. 897059 1 203730 bfulgham 2013-06-04 15:14:42 -0700 Created attachment 203730 Patch 897067 2 203730 dpranke 2013-06-04 15:30:43 -0700 Comment on attachment 203730 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203730&action=review > Tools/Scripts/webkitpy/common/system/crashlogs.py:39 > + self._results_directory = results_directory I was suggesting you make one change or the other, and you came up with a weird hybrid :). I would just pass results_directory into find_newest_log(), but this is okay, too. 897092 3 bfulgham 2013-06-04 16:48:03 -0700 Committed r151191: <http://trac.webkit.org/changeset/151191> 203730 2013-06-04 15:14:42 -0700 2013-06-04 15:30:42 -0700 Patch bug-117212-20130604151345.patch text/plain 7202 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MTE4NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEzLTA2LTA0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBOUldUIGlzIG5vdCBwdXR0aW5nIGNyYXNoIGxvZ3MgaW4g cHJvcGVyIHBsYWNlIChjb3JyZWN0aW9ucykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNzIxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2NyYXNo bG9ncy5weToKKyAgICAgICAgKENyYXNoTG9ncy5fX2luaXRfXyk6IEFjY2VwdCBhIHJlc3VsdCBk aXJlY3RvcnkgYXJndW1lbnQgaW4gY29uc3RydWN0b3IuCisgICAgICAgIChDcmFzaExvZ3MuZmlu ZF9uZXdlc3RfbG9nKTogRG9uJ3QgcmVxdWlyZSAncG9ydCcgYXJndW1lbnQgYW55bW9yZS4KKyAg ICAgICAgKENyYXNoTG9ncy5fZmluZF9uZXdlc3RfbG9nX3dpbik6IE5vIGxvbmdlciB1c2UgJ3Bv cnQnIGFyZ3VtZW50LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9j cmFzaGxvZ3NfdW5pdHRlc3QucHk6CisgICAgICAgIChDcmFzaExvZ3NUZXN0LnRlc3RfZmluZF9s b2dfd2luKTogU2ltcGxpZnkgdGVzdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vZXhlY3V0aXZlLnB5OgorICAgICAgICAoRXhlY3V0aXZlLnJ1bm5pbmdfcGlkcyk6 IEhhbmRsZSAid2luMzIiIGNhc2Ugc2VwYXJhdGVseSBmcm9tICJjeWd3aW4iIGNhc2UuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weToKKyAgICAgICAgKFdpblBvcnQuX2dl dF9jcmFzaF9sb2cpOiBObyBsb25nZXIgcmVxdWlyZSAncG9ydCcgYXJndW1lbnQuCisKIDIwMTMt MDYtMDQgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVpbGQg Zml4IGFmdGVyIHIxNTA1OTIuIFdlIG5lZWQgdG8gZGlzYWJsZSBcMiBzaG91bGRuJ3QgYmUgdHJl YXRlZCBhcyBhbiBlc2NhcGUgY2hhcmFjdGVyLgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vc3lzdGVtL2NyYXNobG9ncy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vY3Jhc2hsb2dzLnB5CShyZXZpc2lvbiAxNTExODMpCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vY3Jhc2hsb2dzLnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC0zNCwxNCArMzQsMTUgQEAgY2xhc3MgQ3Jhc2hMb2dzKG9iamVjdCk6CiAK ICAgICBQSURfTElORV9SRUdFWCA9IHJlLmNvbXBpbGUocidccytHbG9iYWxccytQSUQ6XHMrXFso P1A8cGlkPlxkKylcXScpCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCk6CisgICAgZGVm IF9faW5pdF9fKHNlbGYsIGhvc3QsIHJlc3VsdHNfZGlyZWN0b3J5PU5vbmUpOgogICAgICAgICBz ZWxmLl9ob3N0ID0gaG9zdAorICAgICAgICBzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSA9IHJlc3Vs dHNfZGlyZWN0b3J5CiAKLSAgICBkZWYgZmluZF9uZXdlc3RfbG9nKHNlbGYsIHByb2Nlc3NfbmFt ZSwgcGlkPU5vbmUsIGluY2x1ZGVfZXJyb3JzPUZhbHNlLCBuZXdlcl90aGFuPU5vbmUsIHBvcnQ9 Tm9uZSk6CisgICAgZGVmIGZpbmRfbmV3ZXN0X2xvZyhzZWxmLCBwcm9jZXNzX25hbWUsIHBpZD1O b25lLCBpbmNsdWRlX2Vycm9ycz1GYWxzZSwgbmV3ZXJfdGhhbj1Ob25lKToKICAgICAgICAgaWYg c2VsZi5faG9zdC5wbGF0Zm9ybS5pc19tYWMoKToKICAgICAgICAgICAgIHJldHVybiBzZWxmLl9m aW5kX25ld2VzdF9sb2dfZGFyd2luKHByb2Nlc3NfbmFtZSwgcGlkLCBpbmNsdWRlX2Vycm9ycywg bmV3ZXJfdGhhbikKICAgICAgICAgZWxpZiBzZWxmLl9ob3N0LnBsYXRmb3JtLmlzX3dpbigpOgot ICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbmRfbmV3ZXN0X2xvZ193aW4ocHJvY2Vzc19uYW1l LCBwaWQsIGluY2x1ZGVfZXJyb3JzLCBuZXdlcl90aGFuLCBwb3J0KQorICAgICAgICAgICAgcmV0 dXJuIHNlbGYuX2ZpbmRfbmV3ZXN0X2xvZ193aW4ocHJvY2Vzc19uYW1lLCBwaWQsIGluY2x1ZGVf ZXJyb3JzLCBuZXdlcl90aGFuKQogICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgZGVmIF9sb2df ZGlyZWN0b3J5X2RhcndpbihzZWxmKToKQEAgLTc5LDExICs4MCwxMSBAQCBjbGFzcyBDcmFzaExv Z3Mob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybiBlcnJvcnMKICAgICAgICAgcmV0dXJuIE5v bmUKIAotICAgIGRlZiBfZmluZF9uZXdlc3RfbG9nX3dpbihzZWxmLCBwcm9jZXNzX25hbWUsIHBp ZCwgaW5jbHVkZV9lcnJvcnMsIG5ld2VyX3RoYW4sIHBvcnQpOgorICAgIGRlZiBfZmluZF9uZXdl c3RfbG9nX3dpbihzZWxmLCBwcm9jZXNzX25hbWUsIHBpZCwgaW5jbHVkZV9lcnJvcnMsIG5ld2Vy X3RoYW4pOgogICAgICAgICBkZWYgaXNfY3Jhc2hfbG9nKGZzLCBkaXJwYXRoLCBiYXNlbmFtZSk6 CiAgICAgICAgICAgICByZXR1cm4gYmFzZW5hbWUuc3RhcnRzd2l0aCgiQ3Jhc2hMb2ciKQogCi0g ICAgICAgIGxvZ3MgPSBzZWxmLl9ob3N0LmZpbGVzeXN0ZW0uZmlsZXNfdW5kZXIocG9ydC5yZXN1 bHRzX2RpcmVjdG9yeSgpLCBmaWxlX2ZpbHRlcj1pc19jcmFzaF9sb2cpCisgICAgICAgIGxvZ3Mg PSBzZWxmLl9ob3N0LmZpbGVzeXN0ZW0uZmlsZXNfdW5kZXIoc2VsZi5fcmVzdWx0c19kaXJlY3Rv cnksIGZpbGVfZmlsdGVyPWlzX2NyYXNoX2xvZykKICAgICAgICAgZXJyb3JzID0gJycKICAgICAg ICAgZm9yIHBhdGggaW4gcmV2ZXJzZWQoc29ydGVkKGxvZ3MpKToKICAgICAgICAgICAgIHRyeToK SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9jcmFzaGxvZ3NfdW5p dHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz dGVtL2NyYXNobG9nc191bml0dGVzdC5weQkocmV2aXNpb24gMTUxMTgzKQorKysgVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2NyYXNobG9nc191bml0dGVzdC5weQkod29ya2lu ZyBjb3B5KQpAQCAtMjk2LDE4ICsyOTYsMTUgQEAgY2xhc3MgQ3Jhc2hMb2dzVGVzdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgICAgIGZpbGVzWyd+L0NyYXNoTG9nX2FhZGRfMjAxMy0wNi0wM18x Mi0yNi0yNC0xMjEudHh0J10gPSBtaXNmb3JtYXR0ZWRfbW9ja19jcmFzaF9yZXBvcnQKICAgICAg ICAgZmlsZXN5c3RlbSA9IE1vY2tGaWxlU3lzdGVtKGZpbGVzKQogICAgICAgICBtb2NrX2hvc3Qg PSBNb2NrU3lzdGVtSG9zdChvc19uYW1lPSd3aW4nLCBmaWxlc3lzdGVtPWZpbGVzeXN0ZW0pCi0g ICAgICAgIGNyYXNoX2xvZ3MgPSBDcmFzaExvZ3MobW9ja19ob3N0KQorICAgICAgICBjcmFzaF9s b2dzID0gQ3Jhc2hMb2dzKG1vY2tfaG9zdCwgIn4iKQogCi0gICAgICAgIHdpbnBvcnQgPSBXaW5Q b3J0KG1vY2tfaG9zdCwgJ3dpbi14cCcpCi0gICAgICAgIHdpbnBvcnQuX3Jlc3VsdHNfZGlyZWN0 b3J5ID0gIn4iCi0KLSAgICAgICAgbG9nID0gY3Jhc2hfbG9ncy5maW5kX25ld2VzdF9sb2coIkR1 bXBSZW5kZXJUcmVlIiwgMjg1MjksIHBvcnQ9d2lucG9ydCkKKyAgICAgICAgbG9nID0gY3Jhc2hf bG9ncy5maW5kX25ld2VzdF9sb2coIkR1bXBSZW5kZXJUcmVlIiwgMjg1MjkpCiAgICAgICAgIHNl bGYuYXNzZXJ0TXVsdGlMaW5lRXF1YWwobG9nLCBuZXdlcl9tb2NrX2NyYXNoX3JlcG9ydCkKLSAg ICAgICAgbG9nID0gY3Jhc2hfbG9ncy5maW5kX25ld2VzdF9sb2coIkR1bXBSZW5kZXJUcmVlIiwg Mjg1MzAsIHBvcnQ9d2lucG9ydCkKKyAgICAgICAgbG9nID0gY3Jhc2hfbG9ncy5maW5kX25ld2Vz dF9sb2coIkR1bXBSZW5kZXJUcmVlIiwgMjg1MzApCiAgICAgICAgIHNlbGYuYXNzZXJ0TXVsdGlM aW5lRXF1YWwobG9nLCBtb2NrX2NyYXNoX3JlcG9ydCkKLSAgICAgICAgbG9nID0gY3Jhc2hfbG9n cy5maW5kX25ld2VzdF9sb2coIkR1bXBSZW5kZXJUcmVlIiwgMjg1MzEsIHBvcnQ9d2lucG9ydCkK KyAgICAgICAgbG9nID0gY3Jhc2hfbG9ncy5maW5kX25ld2VzdF9sb2coIkR1bXBSZW5kZXJUcmVl IiwgMjg1MzEpCiAgICAgICAgIHNlbGYuYXNzZXJ0SXNOb25lKGxvZykKLSAgICAgICAgbG9nID0g Y3Jhc2hfbG9ncy5maW5kX25ld2VzdF9sb2coIkR1bXBSZW5kZXJUcmVlIiwgbmV3ZXJfdGhhbj0x LjAsIHBvcnQ9d2lucG9ydCkKKyAgICAgICAgbG9nID0gY3Jhc2hfbG9ncy5maW5kX25ld2VzdF9s b2coIkR1bXBSZW5kZXJUcmVlIiwgbmV3ZXJfdGhhbj0xLjApCiAgICAgICAgIHNlbGYuYXNzZXJ0 SXNOb25lKGxvZykKIAogICAgICAgICBkZWYgYmFkX3JlYWQocGF0aCk6CkBAIC0zMTUsNSArMzEy LDUgQEAgY2xhc3MgQ3Jhc2hMb2dzVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKICAgICAgICAg ZmlsZXN5c3RlbS5yZWFkX3RleHRfZmlsZSA9IGJhZF9yZWFkCiAgICAgICAgIGZpbGVzeXN0ZW0u cmVhZF9iaW5hcnlfZmlsZSA9IGJhZF9yZWFkCi0gICAgICAgIGxvZyA9IGNyYXNoX2xvZ3MuZmlu ZF9uZXdlc3RfbG9nKCJEdW1wUmVuZGVyVHJlZSIsIDI4NTMxLCBwb3J0PXdpbnBvcnQsIGluY2x1 ZGVfZXJyb3JzPVRydWUpCisgICAgICAgIGxvZyA9IGNyYXNoX2xvZ3MuZmluZF9uZXdlc3RfbG9n KCJEdW1wUmVuZGVyVHJlZSIsIDI4NTMxLCBpbmNsdWRlX2Vycm9ycz1UcnVlKQogICAgICAgICBz ZWxmLmFzc2VydEluKCdJT0Vycm9yOiBObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5JywgbG9nKQpJ bmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0 aXZlLnB5CShyZXZpc2lvbiAxNTExODMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vZXhlY3V0aXZlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNzAsMTEgKzI3MCwxNCBA QCBjbGFzcyBFeGVjdXRpdmUob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogCiAg ICAgZGVmIHJ1bm5pbmdfcGlkcyhzZWxmLCBwcm9jZXNzX25hbWVfZmlsdGVyPU5vbmUpOgorICAg ICAgICBpZiBzeXMucGxhdGZvcm0gPT0gIndpbjMyIjoKKyAgICAgICAgICAgICMgRklYTUU6IHJ1 bm5pbmdfcGlkcyBpc24ndCBpbXBsZW1lbnRlZCBvbiBuYXRpdmUgV2luZG93cyB5ZXQuLi4KKyAg ICAgICAgICAgIHJldHVybiBbXQorCiAgICAgICAgIGlmIG5vdCBwcm9jZXNzX25hbWVfZmlsdGVy OgogICAgICAgICAgICAgcHJvY2Vzc19uYW1lX2ZpbHRlciA9IGxhbWJkYSBwcm9jZXNzX25hbWU6 IFRydWUKIAogICAgICAgICBydW5uaW5nX3BpZHMgPSBbXQotCiAgICAgICAgIGlmIHN5cy5wbGF0 Zm9ybSBpbiAoImN5Z3dpbiIpOgogICAgICAgICAgICAgcHNfcHJvY2VzcyA9IHNlbGYucnVuX2Nv bW1hbmQoWydwcycsICctZSddLCBlcnJvcl9oYW5kbGVyPUV4ZWN1dGl2ZS5pZ25vcmVfZXJyb3Ip CiAgICAgICAgICAgICBmb3IgbGluZSBpbiBwc19wcm9jZXNzLnNwbGl0bGluZXMoKToKSW5kZXg6 IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQkocmV2aXNpb24gMTUxMTgzKQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQkod29ya2luZyBjb3B5KQpAQCAtMjI5LDcgKzIy OSw3IEBAIGNsYXNzIFdpblBvcnQoQXBwbGVQb3J0KToKICAgICAgICAgdGltZV9mbiA9IHRpbWVf Zm4gb3IgdGltZS50aW1lCiAgICAgICAgIHNsZWVwX2ZuID0gc2xlZXBfZm4gb3IgdGltZS5zbGVl cAogICAgICAgICBjcmFzaF9sb2cgPSAnJwotICAgICAgICBjcmFzaF9sb2dzID0gQ3Jhc2hMb2dz KHNlbGYuaG9zdCkKKyAgICAgICAgY3Jhc2hfbG9ncyA9IENyYXNoTG9ncyhzZWxmLmhvc3QsIHNl bGYucmVzdWx0c19kaXJlY3RvcnkoKSkKICAgICAgICAgbm93ID0gdGltZV9mbigpCiAgICAgICAg ICMgRklYTUU6IGRlbGV0ZSB0aGlzIGFmdGVyIHdlJ3JlIHN1cmUgdGhpcyBjb2RlIGlzIHdvcmtp bmcgLi4uCiAgICAgICAgIF9sb2cuZGVidWcoJ2xvb2tpbmcgZm9yIGNyYXNoIGxvZyBmb3IgJXM6 JXMnICUgKG5hbWUsIHN0cihwaWQpKSkKQEAgLTIzOSw3ICsyMzksNyBAQCBjbGFzcyBXaW5Qb3J0 KEFwcGxlUG9ydCk6CiAgICAgICAgICAgICBzeXN0ZW1fcGlkID0gc2VsZi5fZXhlY3V0aXZlLnBp ZF90b19zeXN0ZW1fcGlkLmdldChwaWQpCiAgICAgICAgICAgICBpZiBzeXN0ZW1fcGlkID09IE5v bmU6CiAgICAgICAgICAgICAgICAgYnJlYWsgICMgV2UgaGF2ZW4ndCBtYXBwZWQgY3lnd2luIHBp ZC0+d2luIHBpZCB5ZXQKLSAgICAgICAgICAgIGNyYXNoX2xvZyA9IGNyYXNoX2xvZ3MuZmluZF9u ZXdlc3RfbG9nKG5hbWUsIHN5c3RlbV9waWQsIGluY2x1ZGVfZXJyb3JzPVRydWUsIG5ld2VyX3Ro YW49bmV3ZXJfdGhhbiwgcG9ydD1zZWxmKQorICAgICAgICAgICAgY3Jhc2hfbG9nID0gY3Jhc2hf bG9ncy5maW5kX25ld2VzdF9sb2cobmFtZSwgc3lzdGVtX3BpZCwgaW5jbHVkZV9lcnJvcnM9VHJ1 ZSwgbmV3ZXJfdGhhbj1uZXdlcl90aGFuKQogICAgICAgICAgICAgaWYgbm90IHdhaXRfZm9yX2xv ZzoKICAgICAgICAgICAgICAgICBicmVhawogICAgICAgICAgICAgaWYgbm90IGNyYXNoX2xvZyBv ciBub3QgW2xpbmUgZm9yIGxpbmUgaW4gY3Jhc2hfbG9nLnNwbGl0bGluZXMoKSBpZiBsaW5lLnN0 YXJ0c3dpdGgoJ3F1aXQ6JyldOgo=