58489 2011-04-13 15:30:28 -0700 [NRWT] Rename --baseline-search-patch to --additional-platform-directory to match ORWT 2011-04-13 16:04:14 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mihaip mihaip aroben dpranke tony oldest_to_newest 385307 0 mihaip 2011-04-13 15:30:28 -0700 [NRWT] Rename --baseline-search-patch to --additional-platform-directory to match ORWT 385308 1 89480 mihaip 2011-04-13 15:32:32 -0700 Created attachment 89480 Patch 385316 2 89480 dpranke 2011-04-13 15:39:25 -0700 Comment on attachment 89480 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89480&action=review > Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py:257 > + # Multiple additional paltform directories Nit: typo "paltform" 385317 3 dpranke 2011-04-13 15:39:38 -0700 Looks fine otherwise. 385328 4 89484 mihaip 2011-04-13 15:57:00 -0700 Created attachment 89484 Patch 385329 5 mihaip 2011-04-13 15:57:14 -0700 (In reply to comment #2) > Nit: typo "paltform" Fixed. 385332 6 89484 eric 2011-04-13 16:01:41 -0700 Comment on attachment 89484 Patch OK. How many chromium bots will this break? :) 385333 7 mihaip 2011-04-13 16:02:16 -0700 (In reply to comment #6) > (From update of attachment 89484 [details]) > OK. How many chromium bots will this break? :) 0, since no bots use it yet :) 385335 8 mihaip 2011-04-13 16:04:14 -0700 Committed r83783: <http://trac.webkit.org/changeset/83783> 89480 2011-04-13 15:32:32 -0700 2011-04-13 15:56:58 -0700 Patch bug-58489-20110413153231.patch text/plain 7564 mihaip U3VidmVyc2lvbiBSZXZpc2lvbjogODM3NzEKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNWY1ZWU0ZTk4OTNjYWVlMjU1NGMyYjU0MjBmZmNlNWY3 YjIxNmJmLi5kMjUyOTk5YzczNGQ3NzliOGE5MWIzZWMwZmRiNzJjYmYzZGE0YmJiIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDQtMTMgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW05SV1RdIFJl bmFtZSAtLWJhc2VsaW5lLXNlYXJjaC1wYXRjaCB0byAtLWFkZGl0aW9uYWwtcGxhdGZvcm0tZGly ZWN0b3J5IHRvIG1hdGNoIE9SV1QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU4NDg5CisgICAgICAgIAorICAgICAgICByODM3NDMgYWRkZWQgLS1hZGRp dGlvbmFsLXBsYXRmb3JtLWRpcmVjdG9yeSB0byBvbGQtcnVuLXdlYmtpdC10ZXN0cywKKyAgICAg ICAgcmVuYW1lIHRoZSBlcXVpdmFsZW50IGZsYWcgaW4gbmV3LXJ1bi13ZWJraXQtdGVzdHMgdG8g YmUgY29uc2lzdGVudC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvYmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Jhc2VfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5OgorCiAyMDExLTA0LTEzICBE aXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IE1paGFpIFBhcnBhcml0YS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvYmFzZS5weQppbmRleCBlZjYzYzAxNDExM2FmNWM5NjU3NDcwNGMzMjVlOTg5NjI2 ZWZjZTdiLi45YWFkYjBlYmUyOTEyMTMyMzc5YWUxMDk0YjUwYTg1ZTQ5MzY4MjMyIDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0y ODUsNyArMjg1LDcgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogCiAgICAgICAgIGJhc2VsaW5lX2Zp bGVuYW1lID0gdGVzdG5hbWUgKyAnLWV4cGVjdGVkJyArIHN1ZmZpeAogCi0gICAgICAgIGJhc2Vs aW5lX3NlYXJjaF9wYXRoID0gc2VsZi5nZXRfb3B0aW9uKCdiYXNlbGluZV9zZWFyY2hfcGF0aCcs IFtdKSArIHNlbGYuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKQorICAgICAgICBiYXNlbGluZV9zZWFy Y2hfcGF0aCA9IHNlbGYuZ2V0X29wdGlvbignYWRkaXRpb25hbF9wbGF0Zm9ybV9kaXJlY3Rvcnkn LCBbXSkgKyBzZWxmLmJhc2VsaW5lX3NlYXJjaF9wYXRoKCkKIAogICAgICAgICBiYXNlbGluZXMg PSBbXQogICAgICAgICBmb3IgcGxhdGZvcm1fZGlyIGluIGJhc2VsaW5lX3NlYXJjaF9wYXRoOgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNl X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9i YXNlX3VuaXR0ZXN0LnB5CmluZGV4IDg1ODU2YmQwNDk5ZjNhNmI2MzUwNzFhODg2MmUxYTcyZWQ0 ODBlODQuLmNlMmUzNWI1OGVmOTMzZTI1MzAyYzVhMDQ3NjhjZjM5NDFiNDU2YTIgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVz dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2Vf dW5pdHRlc3QucHkKQEAgLTIzMiw3ICsyMzIsNyBAQCBjbGFzcyBQb3J0VGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgIHBvcnQgPSBiYXNlLlBvcnQocG9ydF9uYW1lPSdmb28nKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQubmFtZSgpLCAnZm9vJykKIAotICAgIGRlZiB0ZXN0 X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgorICAgIGRlZiB0ZXN0X2FkZGl0aW9uYWxfcGxh dGZvcm1fZGlyZWN0b3J5KHNlbGYpOgogICAgICAgICBmaWxlc3lzdGVtID0gTW9ja0ZpbGVTeXN0 ZW0oKQogICAgICAgICBvcHRpb25zLCBhcmdzID0gb3B0cGFyc2UuT3B0aW9uUGFyc2VyKCkucGFy c2VfYXJncyhbXSkKICAgICAgICAgcG9ydCA9IGJhc2UuUG9ydChwb3J0X25hbWU9J2ZvbycsIGZp bGVzeXN0ZW09ZmlsZXN5c3RlbSwgb3B0aW9ucz1vcHRpb25zKQpAQCAtMjQwLDEzICsyNDAsMTMg QEAgY2xhc3MgUG9ydFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBsYXlvdXRfdGVz dF9kaXIgPSBwb3J0LmxheW91dF90ZXN0c19kaXIoKQogICAgICAgICB0ZXN0X2ZpbGUgPSBmaWxl c3lzdGVtLmpvaW4obGF5b3V0X3Rlc3RfZGlyLCAnZmFzdCcsICd0ZXN0Lmh0bWwnKQogCi0gICAg ICAgICMgTm8gYmFzZWxpbmUgc2VhcmNoIHBhdGgKKyAgICAgICAgIyBObyBhZGRpdGlvbmFsIHBs YXRmb3JtIGRpcmVjdG9yeQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAogICAgICAgICAgICAg cG9ydC5leHBlY3RlZF9iYXNlbGluZXModGVzdF9maWxlLCAnLnR4dCcpLAogICAgICAgICAgICAg WyhOb25lLCAnZmFzdC90ZXN0LWV4cGVjdGVkLnR4dCcpXSkKIAotICAgICAgICAjIFNpbXBsZSBz ZWFyY2ggcGF0aAotICAgICAgICBvcHRpb25zLmJhc2VsaW5lX3NlYXJjaF9wYXRoID0gWycvdG1w L2xvY2FsLWJhc2VsaW5lcyddCisgICAgICAgICMgU2ltcGxlIGFkZGl0aW9uYWwgcGxhdGZvcm0g ZGlyZWN0b3J5CisgICAgICAgIG9wdGlvbnMuYWRkaXRpb25hbF9wbGF0Zm9ybV9kaXJlY3Rvcnkg PSBbJy90bXAvbG9jYWwtYmFzZWxpbmVzJ10KICAgICAgICAgZmlsZXN5c3RlbS5maWxlcyA9IHsK ICAgICAgICAgICAgICcvdG1wL2xvY2FsLWJhc2VsaW5lcy9mYXN0L3Rlc3QtZXhwZWN0ZWQudHh0 JzogJ2ZvbycsCiAgICAgICAgIH0KQEAgLTI1NCw4ICsyNTQsOCBAQCBjbGFzcyBQb3J0VGVzdCh1 bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICBwb3J0LmV4cGVjdGVkX2Jhc2VsaW5lcyh0 ZXN0X2ZpbGUsICcudHh0JyksCiAgICAgICAgICAgICBbKCcvdG1wL2xvY2FsLWJhc2VsaW5lcycs ICdmYXN0L3Rlc3QtZXhwZWN0ZWQudHh0JyldKQogCi0gICAgICAgICMgTXVsdGlwbGUgZW50cmll cyBpbiBzZWFyY2ggcGF0aAotICAgICAgICBvcHRpb25zLmJhc2VsaW5lX3NlYXJjaF9wYXRoID0g WycvZm9vJywgJy90bXAvbG9jYWwtYmFzZWxpbmVzJ10KKyAgICAgICAgIyBNdWx0aXBsZSBhZGRp dGlvbmFsIHBhbHRmb3JtIGRpcmVjdG9yaWVzCisgICAgICAgIG9wdGlvbnMuYWRkaXRpb25hbF9w bGF0Zm9ybV9kaXJlY3RvcnkgPSBbJy9mb28nLCAnL3RtcC9sb2NhbC1iYXNlbGluZXMnXQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKAogICAgICAgICAgICAgcG9ydC5leHBlY3RlZF9iYXNlbGlu ZXModGVzdF9maWxlLCAnLnR4dCcpLAogICAgICAgICAgICAgWygnL3RtcC9sb2NhbC1iYXNlbGlu ZXMnLCAnZmFzdC90ZXN0LWV4cGVjdGVkLnR4dCcpXSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDY3NDQ4 OTJiODhjNmEzZDcyNGY3ZGVmMmE2OTI4MzViMDg0ZGM1YjQuLmVhNDJjYzM2OGE1ZTBlZTAzNmIx MjczOTZlNGUxZGJkMjUzMmVkYWEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMTYwLDE0ICsxNjAsMTQg QEAgZGVmIF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKHBvcnRfb2JqLCBvcHRpb25zKToKIAogICAg IG9wdGlvbnMuc2xvd190aW1lX291dF9tcyA9IHN0cig1ICogaW50KG9wdGlvbnMudGltZV9vdXRf bXMpKQogCi0gICAgaWYgb3B0aW9ucy5iYXNlbGluZV9zZWFyY2hfcGF0aDoKLSAgICAgICAgbm9y bWFsaXplZF9zZWFyY2hfcGF0aHMgPSBbXQotICAgICAgICBmb3IgcGF0aCBpbiBvcHRpb25zLmJh c2VsaW5lX3NlYXJjaF9wYXRoOgorICAgIGlmIG9wdGlvbnMuYWRkaXRpb25hbF9wbGF0Zm9ybV9k aXJlY3Rvcnk6CisgICAgICAgIG5vcm1hbGl6ZWRfcGxhdGZvcm1fZGlyZWN0b3JpZXMgPSBbXQor ICAgICAgICBmb3IgcGF0aCBpbiBvcHRpb25zLmFkZGl0aW9uYWxfcGxhdGZvcm1fZGlyZWN0b3J5 OgogICAgICAgICAgICAgaWYgbm90IHBvcnRfb2JqLl9maWxlc3lzdGVtLmlzYWJzKHBhdGgpOgot ICAgICAgICAgICAgICAgIHdhcm5pbmdzLmFwcGVuZCgiLS1iYXNlbGluZS1zZWFyY2gtcGF0aD0l cyBpcyBpZ25vcmVkIHNpbmNlIGl0IGlzIG5vdCBhYnNvbHV0ZSIgJSBwYXRoKQorICAgICAgICAg ICAgICAgIHdhcm5pbmdzLmFwcGVuZCgiLS1hZGRpdGlvbmFsLXBsYXRmb3JtLWRpcmVjdG9yeT0l cyBpcyBpZ25vcmVkIHNpbmNlIGl0IGlzIG5vdCBhYnNvbHV0ZSIgJSBwYXRoKQogICAgICAgICAg ICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICBub3JtYWxpemVkX3NlYXJjaF9wYXRocy5hcHBl bmQocG9ydF9vYmouX2ZpbGVzeXN0ZW0ubm9ybXBhdGgocGF0aCkpCi0gICAgICAgIG9wdGlvbnMu YmFzZWxpbmVfc2VhcmNoX3BhdGggPSBub3JtYWxpemVkX3NlYXJjaF9wYXRocworICAgICAgICAg ICAgbm9ybWFsaXplZF9wbGF0Zm9ybV9kaXJlY3Rvcmllcy5hcHBlbmQocG9ydF9vYmouX2ZpbGVz eXN0ZW0ubm9ybXBhdGgocGF0aCkpCisgICAgICAgIG9wdGlvbnMuYWRkaXRpb25hbF9wbGF0Zm9y bV9kaXJlY3RvcnkgPSBub3JtYWxpemVkX3BsYXRmb3JtX2RpcmVjdG9yaWVzCiAKICAgICByZXR1 cm4gd2FybmluZ3MKIApAQCAtMjkyLDcgKzI5Miw3IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3M9Tm9u ZSk6CiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLXJlc2V0LXJlc3VsdHMiLCBhY3Rp b249InN0b3JlX3RydWUiLAogICAgICAgICAgICAgZGVmYXVsdD1GYWxzZSwgaGVscD0iUmVzZXQg YW55IGV4aXN0aW5nIGJhc2VsaW5lcyB0byB0aGUgIgogICAgICAgICAgICAgICAgICAiZ2VuZXJh dGVkIHJlc3VsdHMiKSwKLSAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tYmFzZWxpbmUt c2VhcmNoLXBhdGgiLCBhY3Rpb249ImFwcGVuZCIsCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0 aW9uKCItLWFkZGl0aW9uYWwtcGxhdGZvcm0tZGlyZWN0b3J5IiwgYWN0aW9uPSJhcHBlbmQiLAog ICAgICAgICAgICAgZGVmYXVsdD1bXSwgaGVscD0iQWRkaXRpb25hbCBkaXJlY3Rvcnkgd2hlcmUg dG8gbG9vayBmb3IgdGVzdCAiCiAgICAgICAgICAgICAgICAgICJiYXNlbGluZXMgKHdpbGwgdGFr ZSBwcmVjZW5kZW5jZSBvdmVyIHBsYXRmb3JtIGJhc2VsaW5lcykuICIKICAgICAgICAgICAgICAg ICAgIlNwZWNpZnkgbXVsdGlwbGUgdGltZXMgdG8gYWRkIG11bHRpcGxlIHNlYXJjaCBwYXRoIGVu dHJpZXMuIiksCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQppbmRleCBhNjQ5MWU5NmFj NDRkMWExMzZlMGY3NzVmMzg3MDk0NDFhZTczYTZjLi5jYTFmOTIzMmUzNTNiZmZiZGIzZDFiYjdk YTkxMDQ2MmViYTRhNzhjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKQEAgLTU3 NSwxNSArNTc1LDE1IEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmNsdWRlX3JlZmVyZW5jZV9odG1sPVRydWUp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFsncGFzc2VzL21pc21hdGNoLmh0bWwnLCAncGFz c2VzL21pc21hdGNoLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwnXSwgdGVzdHNfcnVuKQogCi0gICAg ZGVmIHRlc3RfYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0 VHJ1ZShwYXNzaW5nX3J1bihbJy0tYmFzZWxpbmUtc2VhcmNoLXBhdGgnLCAnL3RtcC9mb28nXSkp Ci0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihbJy0tYmFzZWxpbmUtc2VhcmNo LXBhdGgnLCAnL3RtcC8uLi9mb28nXSkpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5n X3J1bihbJy0tYmFzZWxpbmUtc2VhcmNoLXBhdGgnLCAnL3RtcC9mb28nLAotICAgICAgICAgICAg Jy0tYmFzZWxpbmUtc2VhcmNoLXBhdGgnLCAnL3RtcC9iYXInXSkpCisgICAgZGVmIHRlc3RfYWRk aXRpb25hbF9wbGF0Zm9ybV9kaXJlY3Rvcnkoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1 ZShwYXNzaW5nX3J1bihbJy0tYWRkaXRpb25hbC1wbGF0Zm9ybS1kaXJlY3RvcnknLCAnL3RtcC9m b28nXSkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihbJy0tYWRkaXRpb25h bC1wbGF0Zm9ybS1kaXJlY3RvcnknLCAnL3RtcC8uLi9mb28nXSkpCisgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZShwYXNzaW5nX3J1bihbJy0tYWRkaXRpb25hbC1wbGF0Zm9ybS1kaXJlY3RvcnknLCAn L3RtcC9mb28nLAorICAgICAgICAgICAgJy0tYWRkaXRpb25hbC1wbGF0Zm9ybS1kaXJlY3Rvcnkn LCAnL3RtcC9iYXInXSkpCiAKICAgICAgICAgcmVzLCBidWlsZGJvdF9vdXRwdXQsIHJlZ3VsYXJf b3V0cHV0LCB1c2VyID0gbG9nZ2luZ19ydW4oCi0gICAgICAgICAgICAgWyctLWJhc2VsaW5lLXNl YXJjaC1wYXRoJywgJ2ZvbyddKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoJy0tYmFzZWxpbmUt c2VhcmNoLXBhdGg9Zm9vIGlzIGlnbm9yZWQgc2luY2UgaXQgaXMgbm90IGFic29sdXRlXG4nCisg ICAgICAgICAgICAgWyctLWFkZGl0aW9uYWwtcGxhdGZvcm0tZGlyZWN0b3J5JywgJ2ZvbyddKQor ICAgICAgICBzZWxmLmFzc2VydFRydWUoJy0tYWRkaXRpb25hbC1wbGF0Zm9ybS1kaXJlY3Rvcnk9 Zm9vIGlzIGlnbm9yZWQgc2luY2UgaXQgaXMgbm90IGFic29sdXRlXG4nCiAgICAgICAgICAgICAg ICAgICAgICAgICBpbiByZWd1bGFyX291dHB1dC5nZXQoKSkKIAogCg== 89484 2011-04-13 15:57:00 -0700 2011-04-13 16:01:41 -0700 Patch bug-58489-20110413155659.patch text/plain 7564 mihaip U3VidmVyc2lvbiBSZXZpc2lvbjogODM3NzEKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNWY1ZWU0ZTk4OTNjYWVlMjU1NGMyYjU0MjBmZmNlNWY3 YjIxNmJmLi5kMjUyOTk5YzczNGQ3NzliOGE5MWIzZWMwZmRiNzJjYmYzZGE0YmJiIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDQtMTMgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW05SV1RdIFJl bmFtZSAtLWJhc2VsaW5lLXNlYXJjaC1wYXRjaCB0byAtLWFkZGl0aW9uYWwtcGxhdGZvcm0tZGly ZWN0b3J5IHRvIG1hdGNoIE9SV1QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU4NDg5CisgICAgICAgIAorICAgICAgICByODM3NDMgYWRkZWQgLS1hZGRp dGlvbmFsLXBsYXRmb3JtLWRpcmVjdG9yeSB0byBvbGQtcnVuLXdlYmtpdC10ZXN0cywKKyAgICAg ICAgcmVuYW1lIHRoZSBlcXVpdmFsZW50IGZsYWcgaW4gbmV3LXJ1bi13ZWJraXQtdGVzdHMgdG8g YmUgY29uc2lzdGVudC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvYmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Jhc2VfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5OgorCiAyMDExLTA0LTEzICBE aXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IE1paGFpIFBhcnBhcml0YS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvYmFzZS5weQppbmRleCBlZjYzYzAxNDExM2FmNWM5NjU3NDcwNGMzMjVlOTg5NjI2 ZWZjZTdiLi45YWFkYjBlYmUyOTEyMTMyMzc5YWUxMDk0YjUwYTg1ZTQ5MzY4MjMyIDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0y ODUsNyArMjg1LDcgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogCiAgICAgICAgIGJhc2VsaW5lX2Zp bGVuYW1lID0gdGVzdG5hbWUgKyAnLWV4cGVjdGVkJyArIHN1ZmZpeAogCi0gICAgICAgIGJhc2Vs aW5lX3NlYXJjaF9wYXRoID0gc2VsZi5nZXRfb3B0aW9uKCdiYXNlbGluZV9zZWFyY2hfcGF0aCcs IFtdKSArIHNlbGYuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKQorICAgICAgICBiYXNlbGluZV9zZWFy Y2hfcGF0aCA9IHNlbGYuZ2V0X29wdGlvbignYWRkaXRpb25hbF9wbGF0Zm9ybV9kaXJlY3Rvcnkn LCBbXSkgKyBzZWxmLmJhc2VsaW5lX3NlYXJjaF9wYXRoKCkKIAogICAgICAgICBiYXNlbGluZXMg PSBbXQogICAgICAgICBmb3IgcGxhdGZvcm1fZGlyIGluIGJhc2VsaW5lX3NlYXJjaF9wYXRoOgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNl X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9i YXNlX3VuaXR0ZXN0LnB5CmluZGV4IDg1ODU2YmQwNDk5ZjNhNmI2MzUwNzFhODg2MmUxYTcyZWQ0 ODBlODQuLmI0NzU4ZmNiZDZmM2I1ZWZhYzZiZGI0ZGIzYTI5ODNmZTg1OTI4MDUgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVz dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2Vf dW5pdHRlc3QucHkKQEAgLTIzMiw3ICsyMzIsNyBAQCBjbGFzcyBQb3J0VGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgIHBvcnQgPSBiYXNlLlBvcnQocG9ydF9uYW1lPSdmb28nKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQubmFtZSgpLCAnZm9vJykKIAotICAgIGRlZiB0ZXN0 X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgorICAgIGRlZiB0ZXN0X2FkZGl0aW9uYWxfcGxh dGZvcm1fZGlyZWN0b3J5KHNlbGYpOgogICAgICAgICBmaWxlc3lzdGVtID0gTW9ja0ZpbGVTeXN0 ZW0oKQogICAgICAgICBvcHRpb25zLCBhcmdzID0gb3B0cGFyc2UuT3B0aW9uUGFyc2VyKCkucGFy c2VfYXJncyhbXSkKICAgICAgICAgcG9ydCA9IGJhc2UuUG9ydChwb3J0X25hbWU9J2ZvbycsIGZp bGVzeXN0ZW09ZmlsZXN5c3RlbSwgb3B0aW9ucz1vcHRpb25zKQpAQCAtMjQwLDEzICsyNDAsMTMg QEAgY2xhc3MgUG9ydFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBsYXlvdXRfdGVz dF9kaXIgPSBwb3J0LmxheW91dF90ZXN0c19kaXIoKQogICAgICAgICB0ZXN0X2ZpbGUgPSBmaWxl c3lzdGVtLmpvaW4obGF5b3V0X3Rlc3RfZGlyLCAnZmFzdCcsICd0ZXN0Lmh0bWwnKQogCi0gICAg ICAgICMgTm8gYmFzZWxpbmUgc2VhcmNoIHBhdGgKKyAgICAgICAgIyBObyBhZGRpdGlvbmFsIHBs YXRmb3JtIGRpcmVjdG9yeQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAogICAgICAgICAgICAg cG9ydC5leHBlY3RlZF9iYXNlbGluZXModGVzdF9maWxlLCAnLnR4dCcpLAogICAgICAgICAgICAg WyhOb25lLCAnZmFzdC90ZXN0LWV4cGVjdGVkLnR4dCcpXSkKIAotICAgICAgICAjIFNpbXBsZSBz ZWFyY2ggcGF0aAotICAgICAgICBvcHRpb25zLmJhc2VsaW5lX3NlYXJjaF9wYXRoID0gWycvdG1w L2xvY2FsLWJhc2VsaW5lcyddCisgICAgICAgICMgU2ltcGxlIGFkZGl0aW9uYWwgcGxhdGZvcm0g ZGlyZWN0b3J5CisgICAgICAgIG9wdGlvbnMuYWRkaXRpb25hbF9wbGF0Zm9ybV9kaXJlY3Rvcnkg PSBbJy90bXAvbG9jYWwtYmFzZWxpbmVzJ10KICAgICAgICAgZmlsZXN5c3RlbS5maWxlcyA9IHsK ICAgICAgICAgICAgICcvdG1wL2xvY2FsLWJhc2VsaW5lcy9mYXN0L3Rlc3QtZXhwZWN0ZWQudHh0 JzogJ2ZvbycsCiAgICAgICAgIH0KQEAgLTI1NCw4ICsyNTQsOCBAQCBjbGFzcyBQb3J0VGVzdCh1 bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICBwb3J0LmV4cGVjdGVkX2Jhc2VsaW5lcyh0 ZXN0X2ZpbGUsICcudHh0JyksCiAgICAgICAgICAgICBbKCcvdG1wL2xvY2FsLWJhc2VsaW5lcycs ICdmYXN0L3Rlc3QtZXhwZWN0ZWQudHh0JyldKQogCi0gICAgICAgICMgTXVsdGlwbGUgZW50cmll cyBpbiBzZWFyY2ggcGF0aAotICAgICAgICBvcHRpb25zLmJhc2VsaW5lX3NlYXJjaF9wYXRoID0g WycvZm9vJywgJy90bXAvbG9jYWwtYmFzZWxpbmVzJ10KKyAgICAgICAgIyBNdWx0aXBsZSBhZGRp dGlvbmFsIHBsYXRmb3JtIGRpcmVjdG9yaWVzCisgICAgICAgIG9wdGlvbnMuYWRkaXRpb25hbF9w bGF0Zm9ybV9kaXJlY3RvcnkgPSBbJy9mb28nLCAnL3RtcC9sb2NhbC1iYXNlbGluZXMnXQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKAogICAgICAgICAgICAgcG9ydC5leHBlY3RlZF9iYXNlbGlu ZXModGVzdF9maWxlLCAnLnR4dCcpLAogICAgICAgICAgICAgWygnL3RtcC9sb2NhbC1iYXNlbGlu ZXMnLCAnZmFzdC90ZXN0LWV4cGVjdGVkLnR4dCcpXSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDY3NDQ4 OTJiODhjNmEzZDcyNGY3ZGVmMmE2OTI4MzViMDg0ZGM1YjQuLmVhNDJjYzM2OGE1ZTBlZTAzNmIx MjczOTZlNGUxZGJkMjUzMmVkYWEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMTYwLDE0ICsxNjAsMTQg QEAgZGVmIF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKHBvcnRfb2JqLCBvcHRpb25zKToKIAogICAg IG9wdGlvbnMuc2xvd190aW1lX291dF9tcyA9IHN0cig1ICogaW50KG9wdGlvbnMudGltZV9vdXRf bXMpKQogCi0gICAgaWYgb3B0aW9ucy5iYXNlbGluZV9zZWFyY2hfcGF0aDoKLSAgICAgICAgbm9y bWFsaXplZF9zZWFyY2hfcGF0aHMgPSBbXQotICAgICAgICBmb3IgcGF0aCBpbiBvcHRpb25zLmJh c2VsaW5lX3NlYXJjaF9wYXRoOgorICAgIGlmIG9wdGlvbnMuYWRkaXRpb25hbF9wbGF0Zm9ybV9k aXJlY3Rvcnk6CisgICAgICAgIG5vcm1hbGl6ZWRfcGxhdGZvcm1fZGlyZWN0b3JpZXMgPSBbXQor ICAgICAgICBmb3IgcGF0aCBpbiBvcHRpb25zLmFkZGl0aW9uYWxfcGxhdGZvcm1fZGlyZWN0b3J5 OgogICAgICAgICAgICAgaWYgbm90IHBvcnRfb2JqLl9maWxlc3lzdGVtLmlzYWJzKHBhdGgpOgot ICAgICAgICAgICAgICAgIHdhcm5pbmdzLmFwcGVuZCgiLS1iYXNlbGluZS1zZWFyY2gtcGF0aD0l cyBpcyBpZ25vcmVkIHNpbmNlIGl0IGlzIG5vdCBhYnNvbHV0ZSIgJSBwYXRoKQorICAgICAgICAg ICAgICAgIHdhcm5pbmdzLmFwcGVuZCgiLS1hZGRpdGlvbmFsLXBsYXRmb3JtLWRpcmVjdG9yeT0l cyBpcyBpZ25vcmVkIHNpbmNlIGl0IGlzIG5vdCBhYnNvbHV0ZSIgJSBwYXRoKQogICAgICAgICAg ICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICBub3JtYWxpemVkX3NlYXJjaF9wYXRocy5hcHBl bmQocG9ydF9vYmouX2ZpbGVzeXN0ZW0ubm9ybXBhdGgocGF0aCkpCi0gICAgICAgIG9wdGlvbnMu YmFzZWxpbmVfc2VhcmNoX3BhdGggPSBub3JtYWxpemVkX3NlYXJjaF9wYXRocworICAgICAgICAg ICAgbm9ybWFsaXplZF9wbGF0Zm9ybV9kaXJlY3Rvcmllcy5hcHBlbmQocG9ydF9vYmouX2ZpbGVz eXN0ZW0ubm9ybXBhdGgocGF0aCkpCisgICAgICAgIG9wdGlvbnMuYWRkaXRpb25hbF9wbGF0Zm9y bV9kaXJlY3RvcnkgPSBub3JtYWxpemVkX3BsYXRmb3JtX2RpcmVjdG9yaWVzCiAKICAgICByZXR1 cm4gd2FybmluZ3MKIApAQCAtMjkyLDcgKzI5Miw3IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3M9Tm9u ZSk6CiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLXJlc2V0LXJlc3VsdHMiLCBhY3Rp b249InN0b3JlX3RydWUiLAogICAgICAgICAgICAgZGVmYXVsdD1GYWxzZSwgaGVscD0iUmVzZXQg YW55IGV4aXN0aW5nIGJhc2VsaW5lcyB0byB0aGUgIgogICAgICAgICAgICAgICAgICAiZ2VuZXJh dGVkIHJlc3VsdHMiKSwKLSAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tYmFzZWxpbmUt c2VhcmNoLXBhdGgiLCBhY3Rpb249ImFwcGVuZCIsCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0 aW9uKCItLWFkZGl0aW9uYWwtcGxhdGZvcm0tZGlyZWN0b3J5IiwgYWN0aW9uPSJhcHBlbmQiLAog ICAgICAgICAgICAgZGVmYXVsdD1bXSwgaGVscD0iQWRkaXRpb25hbCBkaXJlY3Rvcnkgd2hlcmUg dG8gbG9vayBmb3IgdGVzdCAiCiAgICAgICAgICAgICAgICAgICJiYXNlbGluZXMgKHdpbGwgdGFr ZSBwcmVjZW5kZW5jZSBvdmVyIHBsYXRmb3JtIGJhc2VsaW5lcykuICIKICAgICAgICAgICAgICAg ICAgIlNwZWNpZnkgbXVsdGlwbGUgdGltZXMgdG8gYWRkIG11bHRpcGxlIHNlYXJjaCBwYXRoIGVu dHJpZXMuIiksCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQppbmRleCBhNjQ5MWU5NmFj NDRkMWExMzZlMGY3NzVmMzg3MDk0NDFhZTczYTZjLi5jYTFmOTIzMmUzNTNiZmZiZGIzZDFiYjdk YTkxMDQ2MmViYTRhNzhjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKQEAgLTU3 NSwxNSArNTc1LDE1IEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmNsdWRlX3JlZmVyZW5jZV9odG1sPVRydWUp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFsncGFzc2VzL21pc21hdGNoLmh0bWwnLCAncGFz c2VzL21pc21hdGNoLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwnXSwgdGVzdHNfcnVuKQogCi0gICAg ZGVmIHRlc3RfYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0 VHJ1ZShwYXNzaW5nX3J1bihbJy0tYmFzZWxpbmUtc2VhcmNoLXBhdGgnLCAnL3RtcC9mb28nXSkp Ci0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihbJy0tYmFzZWxpbmUtc2VhcmNo LXBhdGgnLCAnL3RtcC8uLi9mb28nXSkpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5n X3J1bihbJy0tYmFzZWxpbmUtc2VhcmNoLXBhdGgnLCAnL3RtcC9mb28nLAotICAgICAgICAgICAg Jy0tYmFzZWxpbmUtc2VhcmNoLXBhdGgnLCAnL3RtcC9iYXInXSkpCisgICAgZGVmIHRlc3RfYWRk aXRpb25hbF9wbGF0Zm9ybV9kaXJlY3Rvcnkoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1 ZShwYXNzaW5nX3J1bihbJy0tYWRkaXRpb25hbC1wbGF0Zm9ybS1kaXJlY3RvcnknLCAnL3RtcC9m b28nXSkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihbJy0tYWRkaXRpb25h bC1wbGF0Zm9ybS1kaXJlY3RvcnknLCAnL3RtcC8uLi9mb28nXSkpCisgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZShwYXNzaW5nX3J1bihbJy0tYWRkaXRpb25hbC1wbGF0Zm9ybS1kaXJlY3RvcnknLCAn L3RtcC9mb28nLAorICAgICAgICAgICAgJy0tYWRkaXRpb25hbC1wbGF0Zm9ybS1kaXJlY3Rvcnkn LCAnL3RtcC9iYXInXSkpCiAKICAgICAgICAgcmVzLCBidWlsZGJvdF9vdXRwdXQsIHJlZ3VsYXJf b3V0cHV0LCB1c2VyID0gbG9nZ2luZ19ydW4oCi0gICAgICAgICAgICAgWyctLWJhc2VsaW5lLXNl YXJjaC1wYXRoJywgJ2ZvbyddKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoJy0tYmFzZWxpbmUt c2VhcmNoLXBhdGg9Zm9vIGlzIGlnbm9yZWQgc2luY2UgaXQgaXMgbm90IGFic29sdXRlXG4nCisg ICAgICAgICAgICAgWyctLWFkZGl0aW9uYWwtcGxhdGZvcm0tZGlyZWN0b3J5JywgJ2ZvbyddKQor ICAgICAgICBzZWxmLmFzc2VydFRydWUoJy0tYWRkaXRpb25hbC1wbGF0Zm9ybS1kaXJlY3Rvcnk9 Zm9vIGlzIGlnbm9yZWQgc2luY2UgaXQgaXMgbm90IGFic29sdXRlXG4nCiAgICAgICAgICAgICAg ICAgICAgICAgICBpbiByZWd1bGFyX291dHB1dC5nZXQoKSkKIAogCg==