85419 2012-05-02 14:06:07 -0700 webkitpy: Remove direct sys.platform usage in run_webkit_tests_integrationtest. 2012-05-02 14:54:54 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rakuco rakuco abarth dpranke eric ojan rniwa tony webkit.review.bot oldest_to_newest 614648 0 rakuco 2012-05-02 14:06:07 -0700 webkitpy: Remove direct sys.platform usage in run_webkit_tests_integrationtest. 614654 1 139884 rakuco 2012-05-02 14:09:00 -0700 Created attachment 139884 Patch 614662 2 139884 dpranke 2012-05-02 14:13:26 -0700 Comment on attachment 139884 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139884&action=review > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:268 > + self.SHOULD_TEST_PROCESSES = not self._platform.is_win() I probably wouldn't use upper case for this field, since it's not really a constant (it's not set at import-time like it was before). 614663 3 rakuco 2012-05-02 14:15:23 -0700 Committed r115887: <http://trac.webkit.org/changeset/115887> 614664 4 139884 tony 2012-05-02 14:15:37 -0700 Comment on attachment 139884 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139884&action=review > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:264 > + self._platform = PlatformInfo(sys, platform, Executive()) Nit: If we make sys and platform have defaults values, we wouldn't have to import the modules everywhere that uses PlatformInfo. > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:267 > + # FIXME: remove this when we fix test-webkitpy to work > + # properly on cygwin (bug 63846). Nit: Capitalize Remove. 614668 5 139884 dpranke 2012-05-02 14:28:40 -0700 Comment on attachment 139884 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139884&action=review >> Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:264 >> + self._platform = PlatformInfo(sys, platform, Executive()) > > Nit: If we make sys and platform have defaults values, we wouldn't have to import the modules everywhere that uses PlatformInfo. Good catch. Can you change this to a SystemHost() instead (since that has defaults) and then use self._platform = SystemHost().platform ? (and add a comment as to why this is a real platform and not a mock? 614674 6 rakuco 2012-05-02 14:35:40 -0700 Reopening to attach new patch. 614675 7 139886 rakuco 2012-05-02 14:35:49 -0700 Created attachment 139886 Use a SystemHost instead of PlatformInfo 614676 8 rakuco 2012-05-02 14:36:58 -0700 I've fixed the capitalization issues in <http://trac.webkit.org/changeset/115888>, and sent another patch to implement Tony and Dirk's suggestion of not using a PlatformInfo directly. 614698 9 rakuco 2012-05-02 14:54:54 -0700 Committed r115894: <http://trac.webkit.org/changeset/115894> 139884 2012-05-02 14:09:00 -0700 2012-05-02 14:28:40 -0700 Patch bug-85419-20120502180859.patch text/plain 7404 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1ODgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTA0NGQ1NzFkZWUwNWM4ODg2ODlkZWIzNTg5NzExMDA5 YjdhNTdhYy4uODU3YTYxNmIzZDVkMjM0MTQ4ZjRkZWI5MjgxMWNlZGYwZjg4YmYwZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5 IEBACiAyMDEyLTA1LTAyICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYWt1Y29Ad2Via2l0Lm9y Zz4KIAorICAgICAgICB3ZWJraXRweTogUmVtb3ZlIGRpcmVjdCBzeXMucGxhdGZvcm0gdXNhZ2Ug aW4gcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTQxOQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFub3RoZXIgcGFydCBvZiB0aGUgd29yayB0b3dh cmRzIHJlcGxhY2luZyBkaXJlY3Qgc3lzLnBsYXRmb3JtCisgICAgICAgIHVzYWdlIHdpdGggUGxh dGZvcm1JbmZvLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHk6CisgICAgICAgIChNYWluVGVzdC5zZXRV cCk6IE1vdmUgdGhlIHNldHRpbmcgb2YgU0hPVUxEX1RFU1RfUFJPQ0VTU0VTCisgICAgICAgIGhl cmUuIEV2ZW4gdGhvdWdoIGl0IGlzIGNvc3RsaWVyLCB1bml0dGVzdC5zZXRVcENsYXNzIHdhcwor ICAgICAgICBpbnRyb2R1Y2VkIGluIFB5dGhvbiAyLjcuCisgICAgICAgIChNYWluVGVzdC50ZXN0 X2NoaWxkX3Byb2Nlc3Nlc18yKTogVXNlIHNlbGYuU0hPVUxEX1RFU1RfUFJPQ0VTU0VTLgorICAg ICAgICAoTWFpblRlc3QudGVzdF9jaGlsZF9wcm9jZXNzZXNfbWluKTogRGl0dG8uCisgICAgICAg IChNYWluVGVzdC50ZXN0X2V4Y2VwdGlvbl9yYWlzZWQpOiBEaXR0by4KKyAgICAgICAgKE1haW5U ZXN0LnRlc3Rfa2V5Ym9hcmRfaW50ZXJydXB0KTogRGl0dG8uCisgICAgICAgIChNYWluVGVzdC50 ZXN0X2NyYXNoX2xvZyk6IENoZWNrIGZvciBQbGF0Zm9ybUluZm8uaXNfbWFjKCkuCisgICAgICAg IChNYWluVGVzdC50ZXN0X3dlYl9wcm9jZXNzX2NyYXNoX2xvZyk6IERpdHRvLCBhbmQgcmVtb3Zl IGR1cGxpY2F0ZQorICAgICAgICBjaGVjayBhdCB0aGUgZW5kLgorICAgICAgICAoTWFpblRlc3Qu dGVzdF9ub19odHRwX3Rlc3RzKTogUmVtb3ZlIGNoZWNrIGZvciAoY3lnd2luICYmIFB5dGhvbgor ICAgICAgICAyLjUuMiksIGFzIHdlIG9ubHkgc3VwcG9ydCBQeXRob24gMi42Ky4KKworMjAxMi0w NS0wMiAgUmFwaGFlbCBLdWJvIGRhIENvc3RhICA8cmFrdWNvQHdlYmtpdC5vcmc+CisKICAgICAg ICAgd2Via2l0cHk6IFJlbW92ZSBkaXJlY3Qgc3lzLnBsYXRmb3JtIHVzYWdlIGluIHRoZSBQTkcg Y2hlY2tlci4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTg1NDA3CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkKaW5k ZXggN2M5MTY2Njk1OWIzY2Y1ODM5NDA2ZjE3ZGY4YTBhYTg0Y2RhMDE0YS4uMDJlZmY2MTM4ZTYw YmI3ZjI1NTQ4ZDU4MDc3MTlhZTI5NWY0Mzg2ZSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0 c19pbnRlZ3JhdGlvbnRlc3QucHkKQEAgLTMzLDYgKzMzLDcgQEAgaW1wb3J0IGNvZGVjcwogaW1w b3J0IGl0ZXJ0b29scwogaW1wb3J0IGpzb24KIGltcG9ydCBsb2dnaW5nCitpbXBvcnQgcGxhdGZv cm0KIGltcG9ydCBRdWV1ZQogaW1wb3J0IHJlCiBpbXBvcnQgU3RyaW5nSU8KQEAgLTQyLDE0ICs0 MywxMCBAQCBpbXBvcnQgdGltZQogaW1wb3J0IHRocmVhZGluZwogaW1wb3J0IHVuaXR0ZXN0CiAK LWZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgcGF0aAotCi0jIEZJWE1FOiByZW1v dmUgdGhpcyB3aGVuIHdlIGZpeCB0ZXN0LXdlYmtpdHB5IHRvIHdvcmsgcHJvcGVybHkgb24gY3ln d2luCi0jIChidWcgNjM4NDYpLgotU0hPVUxEX1RFU1RfUFJPQ0VTU0VTID0gc3lzLnBsYXRmb3Jt IG5vdCBpbiAoJ2N5Z3dpbicsICd3aW4zMicpCi0KLWZyb20gd2Via2l0cHkuY29tbW9uLnN5c3Rl bSBpbXBvcnQgb3V0cHV0Y2FwdHVyZQorZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9y dCBvdXRwdXRjYXB0dXJlLCBwYXRoCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uY3Jhc2hs b2dzX3VuaXR0ZXN0IGltcG9ydCBtYWtlX21vY2tfY3Jhc2hfcmVwb3J0X2RhcndpbgorZnJvbSB3 ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgRXhlY3V0aXZlCitmcm9tIHdl YmtpdHB5LmNvbW1vbi5zeXN0ZW0ucGxhdGZvcm1pbmZvIGltcG9ydCBQbGF0Zm9ybUluZm8KIGZy b20gd2Via2l0cHkuY29tbW9uLmhvc3RfbW9jayBpbXBvcnQgTW9ja0hvc3QKIAogZnJvbSB3ZWJr aXRweS5sYXlvdXRfdGVzdHMgaW1wb3J0IHBvcnQKQEAgLTI2Myw2ICsyNjAsMTMgQEAgY2xhc3Mg TGludFRlc3QodW5pdHRlc3QuVGVzdENhc2UsIFN0cmVhbVRlc3RpbmdNaXhpbik6CiAKIAogY2xh c3MgTWFpblRlc3QodW5pdHRlc3QuVGVzdENhc2UsIFN0cmVhbVRlc3RpbmdNaXhpbik6CisgICAg ZGVmIHNldFVwKHNlbGYpOgorICAgICAgICBzZWxmLl9wbGF0Zm9ybSA9IFBsYXRmb3JtSW5mbyhz eXMsIHBsYXRmb3JtLCBFeGVjdXRpdmUoKSkKKworICAgICAgICAjIEZJWE1FOiByZW1vdmUgdGhp cyB3aGVuIHdlIGZpeCB0ZXN0LXdlYmtpdHB5IHRvIHdvcmsKKyAgICAgICAgIyBwcm9wZXJseSBv biBjeWd3aW4gKGJ1ZyA2Mzg0NikuCisgICAgICAgIHNlbGYuU0hPVUxEX1RFU1RfUFJPQ0VTU0VT ID0gbm90IHNlbGYuX3BsYXRmb3JtLmlzX3dpbigpCisKICAgICBkZWYgdGVzdF9hY2NlbGVyYXRl ZF9jb21wb3NpdGluZyhzZWxmKToKICAgICAgICAgIyBUaGlzIGp1c3QgdGVzdHMgdGhhdCB3ZSBy ZWNvZ25pemUgdGhlIGNvbW1hbmQgbGluZSBhcmdzCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShw YXNzaW5nX3J1bihbJy0tYWNjZWxlcmF0ZWQtdmlkZW8nXSkpCkBAIC0yODYsMTYgKzI5MCwxMyBA QCBjbGFzcyBNYWluVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSwgU3RyZWFtVGVzdGluZ01peGluKToK ICAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShsZW4oYmF0Y2gpIDw9IDIsICclcyBoYWQgdG9v IG1hbnkgdGVzdHMnICUgJywgJy5qb2luKGJhdGNoKSkKIAogICAgIGRlZiB0ZXN0X2NoaWxkX3By b2Nlc3Nlc18yKHNlbGYpOgotICAgICAgICAjIFRoaXMgdGVzdCBzZWVtcyB0byBmYWlsIG9uIHdp bjMyLgotICAgICAgICBpZiBzeXMucGxhdGZvcm0gPT0gJ3dpbjMyJzoKLSAgICAgICAgICAgIHJl dHVybgotICAgICAgICBpZiBTSE9VTERfVEVTVF9QUk9DRVNTRVM6CisgICAgICAgIGlmIHNlbGYu U0hPVUxEX1RFU1RfUFJPQ0VTU0VTOgogICAgICAgICAgICAgXywgXywgcmVndWxhcl9vdXRwdXQs IF8gPSBsb2dnaW5nX3J1bigKICAgICAgICAgICAgICAgICBbJy0tcHJpbnQnLCAnY29uZmlnJywg Jy0tY2hpbGQtcHJvY2Vzc2VzJywgJzInXSkKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShh bnkoWydSdW5uaW5nIDIgJyBpbiBsaW5lIGZvciBsaW5lIGluIHJlZ3VsYXJfb3V0cHV0LmJ1Zmxp c3RdKSkKIAogICAgIGRlZiB0ZXN0X2NoaWxkX3Byb2Nlc3Nlc19taW4oc2VsZik6Ci0gICAgICAg IGlmIFNIT1VMRF9URVNUX1BST0NFU1NFUzoKKyAgICAgICAgaWYgc2VsZi5TSE9VTERfVEVTVF9Q Uk9DRVNTRVM6CiAgICAgICAgICAgICBfLCBfLCByZWd1bGFyX291dHB1dCwgXyA9IGxvZ2dpbmdf cnVuKAogICAgICAgICAgICAgICAgIFsnLS1wcmludCcsICdjb25maWcnLCAnLS1jaGlsZC1wcm9j ZXNzZXMnLCAnMicsICdwYXNzZXMnXSwKICAgICAgICAgICAgICAgICB0ZXN0c19pbmNsdWRlZD1U cnVlKQpAQCAtMzIxLDcgKzMyMiw3IEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNl LCBTdHJlYW1UZXN0aW5nTWl4aW4pOgogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhWYWx1ZUVy cm9yLCBsb2dnaW5nX3J1biwKICAgICAgICAgICAgIFsnZmFpbHVyZXMvZXhwZWN0ZWQvZXhjZXB0 aW9uLmh0bWwnLCAnLS1jaGlsZC1wcm9jZXNzZXMnLCAnMSddLCB0ZXN0c19pbmNsdWRlZD1UcnVl KQogCi0gICAgICAgIGlmIFNIT1VMRF9URVNUX1BST0NFU1NFUzoKKyAgICAgICAgaWYgc2VsZi5T SE9VTERfVEVTVF9QUk9DRVNTRVM6CiAgICAgICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhydW5f d2Via2l0X3Rlc3RzLldvcmtlckV4Y2VwdGlvbiwgbG9nZ2luZ19ydW4sCiAgICAgICAgICAgICAg ICAgWyctLWNoaWxkLXByb2Nlc3NlcycsICcyJywgJy0tZm9yY2UnLCAnZmFpbHVyZXMvZXhwZWN0 ZWQvZXhjZXB0aW9uLmh0bWwnLCAncGFzc2VzL3RleHQuaHRtbCddLCB0ZXN0c19pbmNsdWRlZD1U cnVlKQogCkBAIC0zNTEsNyArMzUyLDcgQEAgY2xhc3MgTWFpblRlc3QodW5pdHRlc3QuVGVzdENh c2UsIFN0cmVhbVRlc3RpbmdNaXhpbik6CiAgICAgICAgICAgICBbJ2ZhaWx1cmVzL2V4cGVjdGVk L2tleWJvYXJkLmh0bWwnLCAnLS1jaGlsZC1wcm9jZXNzZXMnLCAnMSddLAogICAgICAgICAgICAg dGVzdHNfaW5jbHVkZWQ9VHJ1ZSkKIAotICAgICAgICBpZiBTSE9VTERfVEVTVF9QUk9DRVNTRVM6 CisgICAgICAgIGlmIHNlbGYuU0hPVUxEX1RFU1RfUFJPQ0VTU0VTOgogICAgICAgICAgICAgc2Vs Zi5hc3NlcnRSYWlzZXMoS2V5Ym9hcmRJbnRlcnJ1cHQsIGxvZ2dpbmdfcnVuLAogICAgICAgICAg ICAgICAgIFsnZmFpbHVyZXMvZXhwZWN0ZWQva2V5Ym9hcmQuaHRtbCcsICdwYXNzZXMvdGV4dC5o dG1sJywgJy0tY2hpbGQtcHJvY2Vzc2VzJywgJzInLCAnLS1mb3JjZSddLCB0ZXN0c19pbmNsdWRl ZD1UcnVlKQogCkBAIC01NzgsNyArNTc5LDcgQEAgY2xhc3MgTWFpblRlc3QodW5pdHRlc3QuVGVz dENhc2UsIFN0cmVhbVRlc3RpbmdNaXhpbik6CiAgICAgZGVmIHRlc3RfY3Jhc2hfbG9nKHNlbGYp OgogICAgICAgICAjIEZJWE1FOiBOZWVkIHRvIHJld3JpdGUgdGhlc2UgdGVzdHMgdG8gbm90IGJl IG1hYy1zcGVjaWZpYywgb3IgbW92ZSB0aGVtIGVsc2V3aGVyZS4KICAgICAgICAgIyBDdXJyZW50 bHkgQ3Jhc2hMb2cgdXBsb2FkaW5nIG9ubHkgd29ya3Mgb24gRGFyd2luLgotICAgICAgICBpZiBz eXMucGxhdGZvcm0gIT0gImRhcndpbiI6CisgICAgICAgIGlmIG5vdCBzZWxmLl9wbGF0Zm9ybS5p c19tYWMoKToKICAgICAgICAgICAgIHJldHVybgogICAgICAgICBtb2NrX2NyYXNoX3JlcG9ydCA9 IG1ha2VfbW9ja19jcmFzaF9yZXBvcnRfZGFyd2luKCdEdW1wUmVuZGVyVHJlZScsIDEyMzQ1KQog ICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQpAQCAtNTk1LDcgKzU5Niw3IEBAIGNsYXNzIE1haW5U ZXN0KHVuaXR0ZXN0LlRlc3RDYXNlLCBTdHJlYW1UZXN0aW5nTWl4aW4pOgogICAgIGRlZiB0ZXN0 X3dlYl9wcm9jZXNzX2NyYXNoX2xvZyhzZWxmKToKICAgICAgICAgIyBGSVhNRTogTmVlZCB0byBy ZXdyaXRlIHRoZXNlIHRlc3RzIHRvIG5vdCBiZSBtYWMtc3BlY2lmaWMsIG9yIG1vdmUgdGhlbSBl bHNld2hlcmUuCiAgICAgICAgICMgQ3VycmVudGx5IENyYXNoTG9nIHVwbG9hZGluZyBvbmx5IHdv cmtzIG9uIERhcndpbi4KLSAgICAgICAgaWYgc3lzLnBsYXRmb3JtICE9ICJkYXJ3aW4iOgorICAg ICAgICBpZiBub3Qgc2VsZi5fcGxhdGZvcm0uaXNfbWFjKCk6CiAgICAgICAgICAgICByZXR1cm4K ICAgICAgICAgbW9ja19jcmFzaF9yZXBvcnQgPSBtYWtlX21vY2tfY3Jhc2hfcmVwb3J0X2Rhcndp bignV2ViUHJvY2VzcycsIDEyMzQ1KQogICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQpAQCAtNjA2 LDExICs2MDcsNyBAQCBjbGFzcyBNYWluVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSwgU3RyZWFtVGVz dGluZ01peGluKToKICAgICAgICAgICAgIHRlc3RzX2luY2x1ZGVkPVRydWUsCiAgICAgICAgICAg ICByZWNvcmRfcmVzdWx0cz1UcnVlLAogICAgICAgICAgICAgaG9zdD1ob3N0KQotICAgICAgICBl eHBlY3RlZF9jcmFzaF9sb2cgPSBtb2NrX2NyYXNoX3JlcG9ydAotICAgICAgICAjIEN1cnJlbnRs eSBDcmFzaExvZyB1cGxvYWRpbmcgb25seSB3b3JrcyBvbiBEYXJ3aW4uCi0gICAgICAgIGlmIHN5 cy5wbGF0Zm9ybSAhPSAiZGFyd2luIjoKLSAgICAgICAgICAgIGV4cGVjdGVkX2NyYXNoX2xvZyA9 ICIiCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGhvc3QuZmlsZXN5c3RlbS5yZWFkX3RleHRf ZmlsZSgnL3RtcC9sYXlvdXQtdGVzdC1yZXN1bHRzL2ZhaWx1cmVzL3VuZXhwZWN0ZWQvd2ViLXBy b2Nlc3MtY3Jhc2gtd2l0aC1zdGRlcnItY3Jhc2gtbG9nLnR4dCcpLCBleHBlY3RlZF9jcmFzaF9s b2cpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGhvc3QuZmlsZXN5c3RlbS5yZWFkX3RleHRf ZmlsZSgnL3RtcC9sYXlvdXQtdGVzdC1yZXN1bHRzL2ZhaWx1cmVzL3VuZXhwZWN0ZWQvd2ViLXBy b2Nlc3MtY3Jhc2gtd2l0aC1zdGRlcnItY3Jhc2gtbG9nLnR4dCcpLCBtb2NrX2NyYXNoX3JlcG9y dCkKIAogICAgIGRlZiB0ZXN0X2V4aXRfYWZ0ZXJfbl9mYWlsdXJlc191cGxvYWQoc2VsZik6CiAg ICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCkBAIC04NDEsOCArODM4LDYgQEAgY2xhc3MgTWFpblRl c3QodW5pdHRlc3QuVGVzdENhc2UsIFN0cmVhbVRlc3RpbmdNaXhpbik6CiAgICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShNYWluVGVzdC5oYXNfdGVzdF9vZl90eXBlKGJhdGNoX3Rlc3RzX3J1bl9odHRw LCAnaHR0cCcpKQogICAgICAgICBzZWxmLmFzc2VydFRydWUoTWFpblRlc3QuaGFzX3Rlc3Rfb2Zf dHlwZShiYXRjaF90ZXN0c19ydW5faHR0cCwgJ3dlYnNvY2tldCcpKQogCi1NYWluVGVzdCA9IHNr aXBfaWYoTWFpblRlc3QsIHN5cy5wbGF0Zm9ybSA9PSAnY3lnd2luJyBhbmQgc3lzLnZlcnNpb24g PCAnMi42JywgJ25ldy1ydW4td2Via2l0LXRlc3RzIHRlc3RzIGhhbmcgb24gQ3lnd2luIFB5dGhv biAyLjUuMicpCi0KIAogY2xhc3MgRW5kVG9FbmRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICBkZWYgcGFyc2VfZnVsbF9yZXN1bHRzKHNlbGYsIGZ1bGxfcmVzdWx0c190ZXh0KToK 139886 2012-05-02 14:35:49 -0700 2012-05-02 14:38:39 -0700 Use a SystemHost instead of PlatformInfo bug-85419-20120502183549.patch text/plain 2518 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1ODg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGZhOWY1ZGQzMWJiMWNlYzhjYzQ5M2ZhMDMyN2ZhYTIz YWQyMzNhYy4uN2I2ZTA4ZmMyM2NmZTMzZDcwYWQ1ZTY0ZGY3MmJhODY1MmM4MjlkOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMyw2ICszLDIw IEBACiAgICAgICAgIHdlYmtpdHB5OiBSZW1vdmUgZGlyZWN0IHN5cy5wbGF0Zm9ybSB1c2FnZSBp biBydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC4KICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1NDE5CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXMgcG9pbnRlZCBvdXQgYnkgRGlyayBQcmFua2Us IGEgUGxhdGZvcm1JbmZvIGlzIG5vdCBzdXBwb3NlZCB0bworICAgICAgICBiZSBjcmVhdGVkIGRp cmVjdGx5LCB3ZSBzaG91bGQgc2hvdWxkIGEgU3lzdGVtSG9zdCBpbnN0ZWFkLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3Jh dGlvbnRlc3QucHk6CisgICAgICAgIChNYWluVGVzdC5zZXRVcCk6IENyZWF0ZSBhIFN5c3RlbUhv c3QgYW5kIG9idGFpbiB0aGUgUGxhdGZvcm1JbmZvCisgICAgICAgIG9iamVjdCBmcm9tIGl0IGlu c3RlYWQgb2YgY3JlYXRpbmcgUGxhdGZvcm1JbmZvIGRpcmVjdGx5LgorCisyMDEyLTA1LTAyICBS YXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYWt1Y29Ad2Via2l0Lm9yZz4KKworICAgICAgICB3ZWJr aXRweTogUmVtb3ZlIGRpcmVjdCBzeXMucGxhdGZvcm0gdXNhZ2UgaW4gcnVuX3dlYmtpdF90ZXN0 c19pbnRlZ3JhdGlvbnRlc3QuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04NTQxOQorCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IERpcmsgUHJhbmtl LgogCiAgICAgICAgIEZvbGxvdy11cCBwYXRjaCB0byByMTE1ODg3IHdoaWNoIGZpeGVzIHNvbWUg Y2FwaXRhbGl6YXRpb24gcHJvYmxlbXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3Jh dGlvbnRlc3QucHkKaW5kZXggNjAxNWUyNTNlZTYxNzE4NDhiNDFiNGJiNTA3MmJhNmQ1ZTU3OTdm NC4uZWUzNTY5N2Q2ODRhNTI0MjNjM2Q0OTY5ZWE1NGQyMGZmNmFiM2E4MCAxMDA3NTUKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRl Z3JhdGlvbnRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkKQEAgLTQ1LDggKzQ1LDcgQEAgaW1w b3J0IHVuaXR0ZXN0CiAKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgb3V0cHV0 Y2FwdHVyZSwgcGF0aAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmNyYXNobG9nc191bml0 dGVzdCBpbXBvcnQgbWFrZV9tb2NrX2NyYXNoX3JlcG9ydF9kYXJ3aW4KLWZyb20gd2Via2l0cHku Y29tbW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IEV4ZWN1dGl2ZQotZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLnBsYXRmb3JtaW5mbyBpbXBvcnQgUGxhdGZvcm1JbmZvCitmcm9tIHdlYmtp dHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9zdCBpbXBvcnQgU3lzdGVtSG9zdAogZnJvbSB3ZWJr aXRweS5jb21tb24uaG9zdF9tb2NrIGltcG9ydCBNb2NrSG9zdAogCiBmcm9tIHdlYmtpdHB5Lmxh eW91dF90ZXN0cyBpbXBvcnQgcG9ydApAQCAtMjYxLDcgKzI2MCwxMCBAQCBjbGFzcyBMaW50VGVz dCh1bml0dGVzdC5UZXN0Q2FzZSwgU3RyZWFtVGVzdGluZ01peGluKToKIAogY2xhc3MgTWFpblRl c3QodW5pdHRlc3QuVGVzdENhc2UsIFN0cmVhbVRlc3RpbmdNaXhpbik6CiAgICAgZGVmIHNldFVw KHNlbGYpOgotICAgICAgICBzZWxmLl9wbGF0Zm9ybSA9IFBsYXRmb3JtSW5mbyhzeXMsIHBsYXRm b3JtLCBFeGVjdXRpdmUoKSkKKyAgICAgICAgIyBBIHJlYWwgUGxhdGZvcm1JbmZvIG9iamVjdCBp cyB1c2VkIGhlcmUgaW5zdGVhZCBvZiBhCisgICAgICAgICMgTW9ja1BsYXRmb3JtSW5mbyBiZWNh dXNlIHdlIG5lZWQgdG8gYWN0dWFsbHkgY2hlY2sgZm9yCisgICAgICAgICMgV2luZG93cyBhbmQg TWFjIHRvIHNraXAgc29tZSB0ZXN0cy4KKyAgICAgICAgc2VsZi5fcGxhdGZvcm0gPSBTeXN0ZW1I b3N0KCkucGxhdGZvcm0KIAogICAgICAgICAjIEZJWE1FOiBSZW1vdmUgdGhpcyB3aGVuIHdlIGZp eCB0ZXN0LXdlYmtpdHB5IHRvIHdvcmsKICAgICAgICAgIyBwcm9wZXJseSBvbiBjeWd3aW4gKGJ1 ZyA2Mzg0NikuCg==