37845 2010-04-20 01:56:30 -0700 [chromium] new-run-webkit-tests --use-drt should run on Linux 2010-05-18 22:12:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tony webkit-unassigned tkent oldest_to_newest 214533 0 tony 2010-04-20 01:56:30 -0700 [chromium] new-run-webkit-tests --use-drt should run on Linux 214534 1 53783 tony 2010-04-20 01:56:50 -0700 Created attachment 53783 Patch 214541 2 53788 tony 2010-04-20 02:16:31 -0700 Created attachment 53788 Patch 214543 3 tony 2010-04-20 02:17:06 -0700 (In reply to comment #2) > Created an attachment (id=53788) [details] > Patch Updated to fix the output directory of the tests. It was writing the test results into xcodebuild. 216031 4 53788 abarth 2010-04-22 12:51:17 -0700 Comment on attachment 53788 Patch WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_mac.py:91 + def results_directory(self): Why is this code copy/pasted twice? It seems better to have it in the base class if its used by more than one subclass. WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_mac.py:167 + def _path_to_image_diff(self): This code looks copy/pasted too. WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win.py:101 + def results_directory(self): Here the code is again. We don't want any copy/paste code. 216194 5 54115 tony 2010-04-22 17:57:35 -0700 Created attachment 54115 Patch 216195 6 tony 2010-04-22 17:58:36 -0700 (In reply to comment #4) > (From update of attachment 53788 [details]) > WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_mac.py:91 > + def results_directory(self): > Why is this code copy/pasted twice? It seems better to have it in the base > class if its used by more than one subclass. I copied the functions because they call _build_path() which is only defined in the implementation classes. But I see other methods doing this, so I guess that's ok. 222985 7 54115 eric 2010-05-08 23:26:40 -0700 Comment on attachment 54115 Patch Looks sane, but where are the tests? 223150 8 55519 tony 2010-05-09 22:19:12 -0700 Created attachment 55519 Patch 223151 9 tony 2010-05-09 22:20:44 -0700 (In reply to comment #7) > (From update of attachment 54115 [details]) > Looks sane, but where are the tests? Good point, added some tests. 227154 10 tony 2010-05-17 23:40:07 -0700 Maybe Kent-san can review this now. Eric just wanted some tests added earlier. 227157 11 55519 tkent 2010-05-17 23:50:47 -0700 Comment on attachment 55519 Patch This looks OK. I'll set r+ tomorrow if no one adds review comments. 227665 12 tony 2010-05-18 22:12:28 -0700 Committed r59743: <http://trac.webkit.org/changeset/59743> 53783 2010-04-20 01:56:50 -0700 2010-04-20 02:16:28 -0700 Patch bug-37845-20100420015649.patch text/plain 3485 tony ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhMWIwYmMxLi4xZWUzZTJmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDQt MjAgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIG5ldy1ydW4td2Via2l0LXRl c3RzIC0tdXNlLWRydCBzaG91bGQgcnVuIG9uIExpbnV4CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzg0NQorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weToKKwogMjAxMC0w NC0yMCAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgU2hpbmljaGlybyBIYW1hamkuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5IGIvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weQpp bmRleCA5YTU5NWYyLi5kNGU1MGNkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5CisrKyBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkK QEAgLTg2LDExICs4NiwxNSBAQCBjbGFzcyBDaHJvbWl1bUxpbnV4UG9ydChjaHJvbWl1bS5DaHJv bWl1bVBvcnQpOgogICAgICMKIAogICAgIGRlZiBfYnVpbGRfcGF0aChzZWxmLCAqY29tcHMpOgot ICAgICAgICBiYXNlID0gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgpCisgICAgICAgIGlm IHNlbGYuX29wdGlvbnMudXNlX2RydDoKKyAgICAgICAgICAgIGJhc2UgPSBvcy5wYXRoLmpvaW4o c2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoKSwgJ1dlYktpdCcsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICdjaHJvbWl1bScpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBi YXNlID0gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgpCiAgICAgICAgIGlmIG9zLnBhdGgu ZXhpc3RzKG9zLnBhdGguam9pbihiYXNlLCAnc2NvbnNidWlsZCcpKToKLSAgICAgICAgICAgIHJl dHVybiBzZWxmLnBhdGhfZnJvbV9jaHJvbWl1bV9iYXNlKCdzY29uc2J1aWxkJywgKmNvbXBzKQor ICAgICAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbihiYXNlLCAnc2NvbnNidWlsZCcsICpjb21w cykKICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHJldHVybiBzZWxmLnBhdGhfZnJvbV9jaHJv bWl1bV9iYXNlKCdvdXQnLCAqY29tcHMpCisgICAgICAgICAgICByZXR1cm4gb3MucGF0aC5qb2lu KGJhc2UsICdvdXQnLCAqY29tcHMpCiAKICAgICBkZWYgX2NoZWNrX2FwYWNoZV9pbnN0YWxsKHNl bGYpOgogICAgICAgICByZXN1bHQgPSBjaHJvbWl1bS5jaGVja19maWxlX2V4aXN0cyhzZWxmLl9w YXRoX3RvX2FwYWNoZSgpLApAQCAtMTU4LDEzICsxNjIsMTkgQEAgY2xhc3MgQ2hyb21pdW1MaW51 eFBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICBkZWYgX3BhdGhfdG9fZHJpdmVyKHNl bGYsIGNvbmZpZ3VyYXRpb249Tm9uZSk6CiAgICAgICAgIGlmIG5vdCBjb25maWd1cmF0aW9uOgog ICAgICAgICAgICAgY29uZmlndXJhdGlvbiA9IHNlbGYuX29wdGlvbnMuY29uZmlndXJhdGlvbgot ICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChjb25maWd1cmF0aW9uLCAndGVzdF9zaGVs bCcpCisgICAgICAgIGJpbmFyeV9uYW1lID0gJ3Rlc3Rfc2hlbGwnCisgICAgICAgIGlmIHNlbGYu X29wdGlvbnMudXNlX2RydDoKKyAgICAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0R1bXBSZW5kZXJU cmVlJworICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChjb25maWd1cmF0aW9uLCBiaW5h cnlfbmFtZSkKIAogICAgIGRlZiBfcGF0aF90b19oZWxwZXIoc2VsZik6CiAgICAgICAgIHJldHVy biBOb25lCiAKICAgICBkZWYgX3BhdGhfdG9faW1hZ2VfZGlmZihzZWxmKToKLSAgICAgICAgcmV0 dXJuIHNlbGYuX2J1aWxkX3BhdGgoc2VsZi5fb3B0aW9ucy5jb25maWd1cmF0aW9uLCAnaW1hZ2Vf ZGlmZicpCisgICAgICAgIGJpbmFyeV9uYW1lID0gJ2ltYWdlX2RpZmYnCisgICAgICAgIGlmIHNl bGYuX29wdGlvbnMudXNlX2RydDoKKyAgICAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0ltYWdlRGlm ZicKKyAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoc2VsZi5fb3B0aW9ucy5jb25maWd1 cmF0aW9uLCBiaW5hcnlfbmFtZSkKIAogICAgIGRlZiBfcGF0aF90b193ZGlmZihzZWxmKToKICAg ICAgICAgaWYgc2VsZi5faXNfcmVkaGF0X2Jhc2VkKCk6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFj LnB5CmluZGV4IDU3MGViMWMuLmQ1ZTE3NTcgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CisrKyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5 CkBAIC0xNTcsMTAgKzE1NywxMCBAQCBjbGFzcyBDaHJvbWl1bU1hY1BvcnQoY2hyb21pdW0uQ2hy b21pdW1Qb3J0KToKICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoc2VsZi5fb3B0aW9u cy5jb25maWd1cmF0aW9uLCBiaW5hcnlfbmFtZSkKIAogICAgIGRlZiBfcGF0aF90b19pbWFnZV9k aWZmKHNlbGYpOgorICAgICAgICBiaW5hcnlfbmFtZSA9ICdpbWFnZV9kaWZmJwogICAgICAgICBp ZiBzZWxmLl9vcHRpb25zLnVzZV9kcnQ6Ci0gICAgICAgICAgICAjIEZJWE1FKHRvbnkpOiBUaGlz IHNob3VsZCB1c2UgSW1hZ2VEaWZmLgotICAgICAgICAgICAgcmV0dXJuICcnCi0gICAgICAgIHJl dHVybiBzZWxmLl9idWlsZF9wYXRoKHNlbGYuX29wdGlvbnMuY29uZmlndXJhdGlvbiwgJ2ltYWdl X2RpZmYnKQorICAgICAgICAgICAgYmluYXJ5X25hbWUgPSAnSW1hZ2VEaWZmJworICAgICAgICBy ZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChzZWxmLl9vcHRpb25zLmNvbmZpZ3VyYXRpb24sIGJpbmFy eV9uYW1lKQogCiAgICAgZGVmIF9wYXRoX3RvX3dkaWZmKHNlbGYpOgogICAgICAgICByZXR1cm4g J3dkaWZmJwo= 53788 2010-04-20 02:16:31 -0700 2010-04-22 17:57:29 -0700 Patch bug-37845-20100420021630.patch text/plain 6602 tony ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhMWIwYmMxLi45MzRmZTEwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDQt MjAgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIG5ldy1ydW4td2Via2l0LXRl c3RzIC0tdXNlLWRydCBzaG91bGQgcnVuIG9uIExpbnV4CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzg0NQorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weToKKyAgICAgICAgICAgIE1vdmUgcmVz dWx0c19kaXJlY3RvcnkoKSB0byB0aGUgcGxhdGZvcm0gZmlsZXMuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weToKKyAgICAgICAg ICAgIEZpeCB1cCBhIGZldyByZWZlcmVuY2VzIHRvIHBhdGhfZnJvbV9jaHJvbWl1bS4KKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weToK KyAgICAgICAgICAgIENsZWFuIHVwIEltYWdlRGlmZiB3aGlsZSB3ZSdyZSBoZXJlLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5Ogor CiAyMDEwLTA0LTIwICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTaGluaWNoaXJvIEhhbWFqaS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CmluZGV4 IGU4OTgzOWMuLjYwYmQ0YmIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQpAQCAtMTQ5LDE1ICsxNDks NiBAQCBjbGFzcyBDaHJvbWl1bVBvcnQoYmFzZS5Qb3J0KToKICAgICAgICAgcmV0dXJuIHNlbGYu cGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdMYXlvdXRUZXN0cycsICdwbGF0Zm9ybScsCiAgICAgICAg ICAgICAnY2hyb21pdW0nLCAndGVzdF9leHBlY3RhdGlvbnMudHh0JykKIAotICAgIGRlZiByZXN1 bHRzX2RpcmVjdG9yeShzZWxmKToKLSAgICAgICAgdHJ5OgotICAgICAgICAgICAgcmV0dXJuIHNl bGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ3dlYmtpdCcsCi0gICAgICAgICAgICAgICAgc2Vs Zi5fb3B0aW9ucy5jb25maWd1cmF0aW9uLCBzZWxmLl9vcHRpb25zLnJlc3VsdHNfZGlyZWN0b3J5 KQotICAgICAgICBleGNlcHQgQXNzZXJ0aW9uRXJyb3I6Ci0gICAgICAgICAgICByZXR1cm4gc2Vs Zi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoJ1dlYktpdCcsICdjaHJvbWl1bScsCi0gICAgICAgICAg ICAgICAgJ3hjb2RlYnVpbGQnLCBzZWxmLl9vcHRpb25zLmNvbmZpZ3VyYXRpb24sCi0gICAgICAg ICAgICAgICAgc2VsZi5fb3B0aW9ucy5yZXN1bHRzX2RpcmVjdG9yeSkKLQogICAgIGRlZiBzZXR1 cF90ZXN0X3J1bihzZWxmKToKICAgICAgICAgIyBEZWxldGUgdGhlIGRpc2sgY2FjaGUgaWYgYW55 IHRvIGVuc3VyZSBhIGNsZWFuIHRlc3QgcnVuLgogICAgICAgICBkdW1wX3JlbmRlcl90cmVlX2Jp bmFyeV9wYXRoID0gc2VsZi5fcGF0aF90b19kcml2ZXIoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1f bGludXgucHkKaW5kZXggOWE1OTVmMi4uMTY5ZGFkYyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weQorKysg Yi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVt X2xpbnV4LnB5CkBAIC04MSwxNiArODEsMjggQEAgY2xhc3MgQ2hyb21pdW1MaW51eFBvcnQoY2hy b21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAgICAgIyBXZSBkb24ndCBoYXZlIGRpZmZlcmVudCB2 ZXJzaW9ucyBvbiBsaW51eC4KICAgICAgICAgcmV0dXJuICcnCiAKKyAgICBkZWYgcmVzdWx0c19k aXJlY3Rvcnkoc2VsZik6CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLnBh dGhfZnJvbV9jaHJvbWl1bV9iYXNlKCd3ZWJraXQnLAorICAgICAgICAgICAgICAgIHNlbGYuX29w dGlvbnMuY29uZmlndXJhdGlvbiwgc2VsZi5fb3B0aW9ucy5yZXN1bHRzX2RpcmVjdG9yeSkKKyAg ICAgICAgZXhjZXB0IEFzc2VydGlvbkVycm9yOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2J1 aWxkX3BhdGgoc2VsZi5fb3B0aW9ucy5jb25maWd1cmF0aW9uLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy5yZXN1bHRzX2RpcmVjdG9yeSkKKwogICAg ICMKICAgICAjIFBST1RFQ1RFRCBNRVRIT0RTCiAgICAgIwogCiAgICAgZGVmIF9idWlsZF9wYXRo KHNlbGYsICpjb21wcyk6Ci0gICAgICAgIGJhc2UgPSBzZWxmLnBhdGhfZnJvbV9jaHJvbWl1bV9i YXNlKCkKKyAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy51c2VfZHJ0OgorICAgICAgICAgICAgYmFz ZSA9IG9zLnBhdGguam9pbihzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpLCAnV2ViS2l0JywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2Nocm9taXVtJykKKyAgICAgICAgZWxz ZToKKyAgICAgICAgICAgIGJhc2UgPSBzZWxmLnBhdGhfZnJvbV9jaHJvbWl1bV9iYXNlKCkKICAg ICAgICAgaWYgb3MucGF0aC5leGlzdHMob3MucGF0aC5qb2luKGJhc2UsICdzY29uc2J1aWxkJykp OgotICAgICAgICAgICAgcmV0dXJuIHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ3Njb25z YnVpbGQnLCAqY29tcHMpCisgICAgICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKGJhc2UsICdz Y29uc2J1aWxkJywgKmNvbXBzKQogICAgICAgICBlbHNlOgotICAgICAgICAgICAgcmV0dXJuIHNl bGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ291dCcsICpjb21wcykKKyAgICAgICAgICAgIHJl dHVybiBvcy5wYXRoLmpvaW4oYmFzZSwgJ291dCcsICpjb21wcykKIAogICAgIGRlZiBfY2hlY2tf YXBhY2hlX2luc3RhbGwoc2VsZik6CiAgICAgICAgIHJlc3VsdCA9IGNocm9taXVtLmNoZWNrX2Zp bGVfZXhpc3RzKHNlbGYuX3BhdGhfdG9fYXBhY2hlKCksCkBAIC0xNTgsMTMgKzE3MCwxOSBAQCBj bGFzcyBDaHJvbWl1bUxpbnV4UG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgIGRlZiBf cGF0aF90b19kcml2ZXIoc2VsZiwgY29uZmlndXJhdGlvbj1Ob25lKToKICAgICAgICAgaWYgbm90 IGNvbmZpZ3VyYXRpb246CiAgICAgICAgICAgICBjb25maWd1cmF0aW9uID0gc2VsZi5fb3B0aW9u cy5jb25maWd1cmF0aW9uCi0gICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKGNvbmZpZ3Vy YXRpb24sICd0ZXN0X3NoZWxsJykKKyAgICAgICAgYmluYXJ5X25hbWUgPSAndGVzdF9zaGVsbCcK KyAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy51c2VfZHJ0OgorICAgICAgICAgICAgYmluYXJ5X25h bWUgPSAnRHVtcFJlbmRlclRyZWUnCisgICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKGNv bmZpZ3VyYXRpb24sIGJpbmFyeV9uYW1lKQogCiAgICAgZGVmIF9wYXRoX3RvX2hlbHBlcihzZWxm KToKICAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgIGRlZiBfcGF0aF90b19pbWFnZV9kaWZmKHNl bGYpOgotICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChzZWxmLl9vcHRpb25zLmNvbmZp Z3VyYXRpb24sICdpbWFnZV9kaWZmJykKKyAgICAgICAgYmluYXJ5X25hbWUgPSAnaW1hZ2VfZGlm ZicKKyAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy51c2VfZHJ0OgorICAgICAgICAgICAgYmluYXJ5 X25hbWUgPSAnSW1hZ2VEaWZmJworICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChzZWxm Ll9vcHRpb25zLmNvbmZpZ3VyYXRpb24sIGJpbmFyeV9uYW1lKQogCiAgICAgZGVmIF9wYXRoX3Rv X3dkaWZmKHNlbGYpOgogICAgICAgICBpZiBzZWxmLl9pc19yZWRoYXRfYmFzZWQoKToKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fbWFjLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bV9tYWMucHkKaW5kZXggNTcwZWIxYy4uNjljMmQzNyAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9t YWMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV9tYWMucHkKQEAgLTg4LDYgKzg4LDE0IEBAIGNsYXNzIENocm9taXVtTWFjUG9y dChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICAgICAgICAgcmV0dXJuICctc25vd2xlb3Bh cmQnCiAgICAgICAgIHJldHVybiAnJwogCisgICAgZGVmIHJlc3VsdHNfZGlyZWN0b3J5KHNlbGYp OgorICAgICAgICB0cnk6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5wYXRoX2Zyb21fY2hyb21p dW1fYmFzZSgnd2Via2l0JywKKyAgICAgICAgICAgICAgICBzZWxmLl9vcHRpb25zLmNvbmZpZ3Vy YXRpb24sIHNlbGYuX29wdGlvbnMucmVzdWx0c19kaXJlY3RvcnkpCisgICAgICAgIGV4Y2VwdCBB c3NlcnRpb25FcnJvcjoKKyAgICAgICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKHNlbGYu X29wdGlvbnMuY29uZmlndXJhdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHNlbGYuX29wdGlvbnMucmVzdWx0c19kaXJlY3RvcnkpCisKICAgICAjCiAgICAgIyBQUk9U RUNURUQgTUVUSE9EUwogICAgICMKQEAgLTE1NywxMCArMTY1LDEwIEBAIGNsYXNzIENocm9taXVt TWFjUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICAgICByZXR1cm4gc2VsZi5fYnVp bGRfcGF0aChzZWxmLl9vcHRpb25zLmNvbmZpZ3VyYXRpb24sIGJpbmFyeV9uYW1lKQogCiAgICAg ZGVmIF9wYXRoX3RvX2ltYWdlX2RpZmYoc2VsZik6CisgICAgICAgIGJpbmFyeV9uYW1lID0gJ2lt YWdlX2RpZmYnCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMudXNlX2RydDoKLSAgICAgICAgICAg ICMgRklYTUUodG9ueSk6IFRoaXMgc2hvdWxkIHVzZSBJbWFnZURpZmYuCi0gICAgICAgICAgICBy ZXR1cm4gJycKLSAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoc2VsZi5fb3B0aW9ucy5j b25maWd1cmF0aW9uLCAnaW1hZ2VfZGlmZicpCisgICAgICAgICAgICBiaW5hcnlfbmFtZSA9ICdJ bWFnZURpZmYnCisgICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKHNlbGYuX29wdGlvbnMu Y29uZmlndXJhdGlvbiwgYmluYXJ5X25hbWUpCiAKICAgICBkZWYgX3BhdGhfdG9fd2RpZmYoc2Vs Zik6CiAgICAgICAgIHJldHVybiAnd2RpZmYnCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbi5weSBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5Cmlu ZGV4IDJlM2RlODUuLjRjY2Q3NmIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5CisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5CkBAIC05 OCw2ICs5OCwxNCBAQCBjbGFzcyBDaHJvbWl1bVdpblBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0 KToKICAgICAgICAgICAgIHJldHVybiAnLXhwJwogICAgICAgICByZXR1cm4gJycKIAorICAgIGRl ZiByZXN1bHRzX2RpcmVjdG9yeShzZWxmKToKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgcmV0 dXJuIHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ3dlYmtpdCcsCisgICAgICAgICAgICAg ICAgc2VsZi5fb3B0aW9ucy5jb25maWd1cmF0aW9uLCBzZWxmLl9vcHRpb25zLnJlc3VsdHNfZGly ZWN0b3J5KQorICAgICAgICBleGNlcHQgQXNzZXJ0aW9uRXJyb3I6CisgICAgICAgICAgICByZXR1 cm4gc2VsZi5fYnVpbGRfcGF0aChzZWxmLl9vcHRpb25zLmNvbmZpZ3VyYXRpb24sCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9vcHRpb25zLnJlc3VsdHNfZGlyZWN0 b3J5KQorCiAgICAgIwogICAgICMgUFJPVEVDVEVEIFJPVVRJTkVTCiAgICAgIwo= 54115 2010-04-22 17:57:35 -0700 2010-05-09 22:19:09 -0700 Patch bug-37845-20100423095733.patch text/plain 4687 tony ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxMzY1ZGMzLi40NTE3NDdmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQt MjIgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIG5ldy1ydW4td2Via2l0LXRl c3RzIC0tdXNlLWRydCBzaG91bGQgcnVuIG9uIExpbnV4CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzg0NQorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5OgorCiAyMDEw LTA0LTIyICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKaW5kZXggNTM2ZmIyZS4uZmI2MDAw MyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC0xNTgsOSArMTU4LDggQEAgY2xhc3MgQ2hyb21p dW1Qb3J0KGJhc2UuUG9ydCk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5wYXRoX2Zyb21fY2hy b21pdW1fYmFzZSgnd2Via2l0JywKICAgICAgICAgICAgICAgICBzZWxmLl9vcHRpb25zLmNvbmZp Z3VyYXRpb24sIHNlbGYuX29wdGlvbnMucmVzdWx0c19kaXJlY3RvcnkpCiAgICAgICAgIGV4Y2Vw dCBBc3NlcnRpb25FcnJvcjoKLSAgICAgICAgICAgIHJldHVybiBzZWxmLnBhdGhfZnJvbV93ZWJr aXRfYmFzZSgnV2ViS2l0JywgJ2Nocm9taXVtJywKLSAgICAgICAgICAgICAgICAneGNvZGVidWls ZCcsIHNlbGYuX29wdGlvbnMuY29uZmlndXJhdGlvbiwKLSAgICAgICAgICAgICAgICBzZWxmLl9v cHRpb25zLnJlc3VsdHNfZGlyZWN0b3J5KQorICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxk X3BhdGgoc2VsZi5fb3B0aW9ucy5jb25maWd1cmF0aW9uLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy5yZXN1bHRzX2RpcmVjdG9yeSkKIAogICAgIGRl ZiBzZXR1cF90ZXN0X3J1bihzZWxmKToKICAgICAgICAgIyBEZWxldGUgdGhlIGRpc2sgY2FjaGUg aWYgYW55IHRvIGVuc3VyZSBhIGNsZWFuIHRlc3QgcnVuLgpAQCAtMjY4LDYgKzI2NywxMiBAQCBj bGFzcyBDaHJvbWl1bVBvcnQoYmFzZS5Qb3J0KToKICAgICAgICAgICAgIHBsYXRmb3JtID0gc2Vs Zi5uYW1lKCkKICAgICAgICAgcmV0dXJuIHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdMYXlv dXRUZXN0cycsICdwbGF0Zm9ybScsIHBsYXRmb3JtKQogCisgICAgZGVmIF9wYXRoX3RvX2ltYWdl X2RpZmYoc2VsZik6CisgICAgICAgIGJpbmFyeV9uYW1lID0gJ2ltYWdlX2RpZmYnCisgICAgICAg IGlmIHNlbGYuX29wdGlvbnMudXNlX2RydDoKKyAgICAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0lt YWdlRGlmZicKKyAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoc2VsZi5fb3B0aW9ucy5j b25maWd1cmF0aW9uLCBiaW5hcnlfbmFtZSkKKwogCiBjbGFzcyBDaHJvbWl1bURyaXZlcihiYXNl LkRyaXZlcik6CiAgICAgIiIiQWJzdHJhY3QgaW50ZXJmYWNlIGZvciB0ZXN0X3NoZWxsLiIiIgpk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV9saW51eC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkKaW5kZXggMTUwM2EwMy4uYTk0OTAzNSAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9saW51eC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5CkBAIC04NiwxMSArODYsMTUgQEAgY2xhc3Mg Q2hyb21pdW1MaW51eFBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAjCiAKICAgICBk ZWYgX2J1aWxkX3BhdGgoc2VsZiwgKmNvbXBzKToKLSAgICAgICAgYmFzZSA9IHNlbGYucGF0aF9m cm9tX2Nocm9taXVtX2Jhc2UoKQorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnVzZV9kcnQ6Cisg ICAgICAgICAgICBiYXNlID0gb3MucGF0aC5qb2luKHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNl KCksICdXZWJLaXQnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnY2hyb21pdW0n KQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgYmFzZSA9IHNlbGYucGF0aF9mcm9tX2Nocm9t aXVtX2Jhc2UoKQogICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oYmFzZSwg J3Njb25zYnVpbGQnKSk6Ci0gICAgICAgICAgICByZXR1cm4gc2VsZi5wYXRoX2Zyb21fY2hyb21p dW1fYmFzZSgnc2NvbnNidWlsZCcsICpjb21wcykKKyAgICAgICAgICAgIHJldHVybiBvcy5wYXRo LmpvaW4oYmFzZSwgJ3Njb25zYnVpbGQnLCAqY29tcHMpCiAgICAgICAgIGVsc2U6Ci0gICAgICAg ICAgICByZXR1cm4gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgnb3V0JywgKmNvbXBzKQor ICAgICAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbihiYXNlLCAnb3V0JywgKmNvbXBzKQogCiAg ICAgZGVmIF9jaGVja19hcGFjaGVfaW5zdGFsbChzZWxmKToKICAgICAgICAgcmVzdWx0ID0gY2hy b21pdW0uY2hlY2tfZmlsZV9leGlzdHMoc2VsZi5fcGF0aF90b19hcGFjaGUoKSwKQEAgLTE1OSwx NCArMTYzLDE0IEBAIGNsYXNzIENocm9taXVtTGludXhQb3J0KGNocm9taXVtLkNocm9taXVtUG9y dCk6CiAgICAgZGVmIF9wYXRoX3RvX2RyaXZlcihzZWxmLCBjb25maWd1cmF0aW9uPU5vbmUpOgog ICAgICAgICBpZiBub3QgY29uZmlndXJhdGlvbjoKICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb24g PSBzZWxmLl9vcHRpb25zLmNvbmZpZ3VyYXRpb24KLSAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxk X3BhdGgoY29uZmlndXJhdGlvbiwgJ3Rlc3Rfc2hlbGwnKQorICAgICAgICBiaW5hcnlfbmFtZSA9 ICd0ZXN0X3NoZWxsJworICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnVzZV9kcnQ6CisgICAgICAg ICAgICBiaW5hcnlfbmFtZSA9ICdEdW1wUmVuZGVyVHJlZScKKyAgICAgICAgcmV0dXJuIHNlbGYu X2J1aWxkX3BhdGgoY29uZmlndXJhdGlvbiwgYmluYXJ5X25hbWUpCiAKICAgICBkZWYgX3BhdGhf dG9faGVscGVyKHNlbGYpOgogICAgICAgICByZXR1cm4gTm9uZQogCi0gICAgZGVmIF9wYXRoX3Rv X2ltYWdlX2RpZmYoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKHNlbGYu X29wdGlvbnMuY29uZmlndXJhdGlvbiwgJ2ltYWdlX2RpZmYnKQotCiAgICAgZGVmIF9wYXRoX3Rv X3dkaWZmKHNlbGYpOgogICAgICAgICBpZiBzZWxmLl9pc19yZWRoYXRfYmFzZWQoKToKICAgICAg ICAgICAgIHJldHVybiAnL3Vzci9iaW4vZHdkaWZmJwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5w eQppbmRleCAwYmYzOGI1Li5kN2IyN2QzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQorKysgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQpA QCAtMTU4LDEyICsxNTgsNiBAQCBjbGFzcyBDaHJvbWl1bU1hY1BvcnQoY2hyb21pdW0uQ2hyb21p dW1Qb3J0KToKICAgICAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0xheW91dFRlc3RIZWxwZXInCiAg ICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKHNlbGYuX29wdGlvbnMuY29uZmlndXJhdGlv biwgYmluYXJ5X25hbWUpCiAKLSAgICBkZWYgX3BhdGhfdG9faW1hZ2VfZGlmZihzZWxmKToKLSAg ICAgICAgYmluYXJ5X25hbWUgPSAnaW1hZ2VfZGlmZicKLSAgICAgICAgaWYgc2VsZi5fb3B0aW9u cy51c2VfZHJ0OgotICAgICAgICAgICAgYmluYXJ5X25hbWUgPSAnSW1hZ2VEaWZmJwotICAgICAg ICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChzZWxmLl9vcHRpb25zLmNvbmZpZ3VyYXRpb24sIGJp bmFyeV9uYW1lKQotCiAgICAgZGVmIF9wYXRoX3RvX3dkaWZmKHNlbGYpOgogICAgICAgICByZXR1 cm4gJ3dkaWZmJwogCg== 55519 2010-05-09 22:19:12 -0700 2010-05-18 19:01:56 -0700 Patch bug-37845-20100509221911.patch text/plain 7343 tony ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0ZTQ4YjM2NGE0YzEyMjY5MDc0ZGFmYWYyNmI0YjRkMzAzMTI5NTJmLi5kMmYzOWJj MGRlNTBhZDhiODM3ZTVlMTU2ZTU0ZWQ4Yzg2ZTE4NzM1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDUtMDkgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIG5ldy1ydW4t d2Via2l0LXRlc3RzIC0tdXNlLWRydCBzaG91bGQgcnVuIG9uIExpbnV4CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzg0NQorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5OgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5 OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1f dW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV93aW4ucHk6CisKIDIwMTAtMDUtMDkgIERhbmllbCBCYXRlcyAgPGRiYXRlc0By aW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IENocmlzIEplcmRvbmVrLgpkaWZmIC0tZ2l0 IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW0ucHkKaW5kZXggYmNiZDQ5ODk5MWJiMDBkZWU2MjkyZjljODU1NDYxYTJiODBlYWY2YS4u YjcxNWY3YmU2MGU1MGY1OTgxOGFlNGRhODhmMjExZDk3YjZlOWJhNiAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t aXVtLnB5CkBAIC0xNTgsOSArMTU4LDggQEAgY2xhc3MgQ2hyb21pdW1Qb3J0KGJhc2UuUG9ydCk6 CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgnd2Via2l0 JywKICAgICAgICAgICAgICAgICBzZWxmLl9vcHRpb25zLmNvbmZpZ3VyYXRpb24sIHNlbGYuX29w dGlvbnMucmVzdWx0c19kaXJlY3RvcnkpCiAgICAgICAgIGV4Y2VwdCBBc3NlcnRpb25FcnJvcjoK LSAgICAgICAgICAgIHJldHVybiBzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgnV2ViS2l0Jywg J2Nocm9taXVtJywKLSAgICAgICAgICAgICAgICAneGNvZGVidWlsZCcsIHNlbGYuX29wdGlvbnMu Y29uZmlndXJhdGlvbiwKLSAgICAgICAgICAgICAgICBzZWxmLl9vcHRpb25zLnJlc3VsdHNfZGly ZWN0b3J5KQorICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoc2VsZi5fb3B0aW9u cy5jb25maWd1cmF0aW9uLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Vs Zi5fb3B0aW9ucy5yZXN1bHRzX2RpcmVjdG9yeSkKIAogICAgIGRlZiBzZXR1cF90ZXN0X3J1bihz ZWxmKToKICAgICAgICAgIyBEZWxldGUgdGhlIGRpc2sgY2FjaGUgaWYgYW55IHRvIGVuc3VyZSBh IGNsZWFuIHRlc3QgcnVuLgpAQCAtMjczLDYgKzI3MiwxMiBAQCBjbGFzcyBDaHJvbWl1bVBvcnQo YmFzZS5Qb3J0KToKICAgICAgICAgICAgIHBsYXRmb3JtID0gc2VsZi5uYW1lKCkKICAgICAgICAg cmV0dXJuIHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdMYXlvdXRUZXN0cycsICdwbGF0Zm9y bScsIHBsYXRmb3JtKQogCisgICAgZGVmIF9wYXRoX3RvX2ltYWdlX2RpZmYoc2VsZik6CisgICAg ICAgIGJpbmFyeV9uYW1lID0gJ2ltYWdlX2RpZmYnCisgICAgICAgIGlmIHNlbGYuX29wdGlvbnMu dXNlX2RydDoKKyAgICAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0ltYWdlRGlmZicKKyAgICAgICAg cmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoc2VsZi5fb3B0aW9ucy5jb25maWd1cmF0aW9uLCBiaW5h cnlfbmFtZSkKKwogCiBjbGFzcyBDaHJvbWl1bURyaXZlcihiYXNlLkRyaXZlcik6CiAgICAgIiIi QWJzdHJhY3QgaW50ZXJmYWNlIGZvciB0ZXN0X3NoZWxsLiIiIgpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5w eSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21p dW1fbGludXgucHkKaW5kZXggOTc5ZTIyNWRiYjAyOGY3ZjRhOGEwMTMzZDViNzIxZmRkMWIzNjY4 OC4uMDgxOGQ1MTI2ZDk0MWUxZDEwYTEzOWJkZGY1ZGNlNjg2OTRjOWM3NiAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9s aW51eC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Nocm9taXVtX2xpbnV4LnB5CkBAIC04MSwxMSArODEsMTUgQEAgY2xhc3MgQ2hyb21pdW1M aW51eFBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAjCiAKICAgICBkZWYgX2J1aWxk X3BhdGgoc2VsZiwgKmNvbXBzKToKLSAgICAgICAgYmFzZSA9IHNlbGYucGF0aF9mcm9tX2Nocm9t aXVtX2Jhc2UoKQorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnVzZV9kcnQ6CisgICAgICAgICAg ICBiYXNlID0gb3MucGF0aC5qb2luKHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCksICdXZWJL aXQnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnY2hyb21pdW0nKQorICAgICAg ICBlbHNlOgorICAgICAgICAgICAgYmFzZSA9IHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2Uo KQogICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oYmFzZSwgJ3Njb25zYnVp bGQnKSk6Ci0gICAgICAgICAgICByZXR1cm4gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgn c2NvbnNidWlsZCcsICpjb21wcykKKyAgICAgICAgICAgIHJldHVybiBvcy5wYXRoLmpvaW4oYmFz ZSwgJ3Njb25zYnVpbGQnLCAqY29tcHMpCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICByZXR1 cm4gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgnb3V0JywgKmNvbXBzKQorICAgICAgICAg ICAgcmV0dXJuIG9zLnBhdGguam9pbihiYXNlLCAnb3V0JywgKmNvbXBzKQogCiAgICAgZGVmIF9j aGVja19hcGFjaGVfaW5zdGFsbChzZWxmKToKICAgICAgICAgcmVzdWx0ID0gY2hyb21pdW0uY2hl Y2tfZmlsZV9leGlzdHMoc2VsZi5fcGF0aF90b19hcGFjaGUoKSwKQEAgLTE0NywxNCArMTUxLDE0 IEBAIGNsYXNzIENocm9taXVtTGludXhQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAg ZGVmIF9wYXRoX3RvX2RyaXZlcihzZWxmLCBjb25maWd1cmF0aW9uPU5vbmUpOgogICAgICAgICBp ZiBub3QgY29uZmlndXJhdGlvbjoKICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb24gPSBzZWxmLl9v cHRpb25zLmNvbmZpZ3VyYXRpb24KLSAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoY29u ZmlndXJhdGlvbiwgJ3Rlc3Rfc2hlbGwnKQorICAgICAgICBiaW5hcnlfbmFtZSA9ICd0ZXN0X3No ZWxsJworICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnVzZV9kcnQ6CisgICAgICAgICAgICBiaW5h cnlfbmFtZSA9ICdEdW1wUmVuZGVyVHJlZScKKyAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3Bh dGgoY29uZmlndXJhdGlvbiwgYmluYXJ5X25hbWUpCiAKICAgICBkZWYgX3BhdGhfdG9faGVscGVy KHNlbGYpOgogICAgICAgICByZXR1cm4gTm9uZQogCi0gICAgZGVmIF9wYXRoX3RvX2ltYWdlX2Rp ZmYoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKHNlbGYuX29wdGlvbnMu Y29uZmlndXJhdGlvbiwgJ2ltYWdlX2RpZmYnKQotCiAgICAgZGVmIF9wYXRoX3RvX3dkaWZmKHNl bGYpOgogICAgICAgICBpZiBzZWxmLl9pc19yZWRoYXRfYmFzZWQoKToKICAgICAgICAgICAgIHJl dHVybiAnL3Vzci9iaW4vZHdkaWZmJwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQppbmRleCBi YTY3YTNlYWUyNWVmMTRmOTFiNjc3ODk3YjQxMjIyOTY1OWU3ODJkLi5hYTNhYzhkMWU0YTFhNDEz M2Q1NDViZjA2YjZlZWE3MDZhYjRiMTY1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQorKysgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQpA QCAtMTUwLDEyICsxNTAsNiBAQCBjbGFzcyBDaHJvbWl1bU1hY1BvcnQoY2hyb21pdW0uQ2hyb21p dW1Qb3J0KToKICAgICAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0xheW91dFRlc3RIZWxwZXInCiAg ICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKHNlbGYuX29wdGlvbnMuY29uZmlndXJhdGlv biwgYmluYXJ5X25hbWUpCiAKLSAgICBkZWYgX3BhdGhfdG9faW1hZ2VfZGlmZihzZWxmKToKLSAg ICAgICAgYmluYXJ5X25hbWUgPSAnaW1hZ2VfZGlmZicKLSAgICAgICAgaWYgc2VsZi5fb3B0aW9u cy51c2VfZHJ0OgotICAgICAgICAgICAgYmluYXJ5X25hbWUgPSAnSW1hZ2VEaWZmJwotICAgICAg ICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChzZWxmLl9vcHRpb25zLmNvbmZpZ3VyYXRpb24sIGJp bmFyeV9uYW1lKQotCiAgICAgZGVmIF9wYXRoX3RvX3dkaWZmKHNlbGYpOgogICAgICAgICByZXR1 cm4gJ3dkaWZmJwogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91bml0dGVzdC5weQppbmRleCA5 NWQ2Mzc4MjZkOWI1YzNiYTczNmU2M2U2MjRmMjBmZTBjYjEyMjRhLi5kYjdmMDBhNzdhODhhZjRl ZTQ2NGUxOGU4MjRhYjViZmVlOTk3OTAzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3VuaXR0ZXN0LnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fdW5p dHRlc3QucHkKQEAgLTI3LDYgKzI3LDkgQEAKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAogaW1wb3J0IGNocm9t aXVtCitpbXBvcnQgY2hyb21pdW1fbGludXgKK2ltcG9ydCBjaHJvbWl1bV9tYWMKK2ltcG9ydCBj aHJvbWl1bV93aW4KIGltcG9ydCB1bml0dGVzdAogaW1wb3J0IFN0cmluZ0lPCiAKQEAgLTc4LDMg KzgxLDE3IEBAIGNsYXNzIENocm9taXVtRHJpdmVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAg ICAgICAgICAgICByYWlzZSBJT0Vycm9yCiAgICAgICAgIHNlbGYuZHJpdmVyLl9wcm9jLnN0ZG91 dC5yZWFkbGluZSA9IG1vY2tfcmVhZGxpbmUKICAgICAgICAgc2VsZi5fYXNzZXJ0X3dyaXRlX2Nv bW1hbmRfYW5kX3JlYWRfbGluZShleHBlY3RlZF9jcmFzaD1UcnVlKQorCisgICAgZGVmIHRlc3Rf cGF0aF90b19pbWFnZV9kaWZmKHNlbGYpOgorICAgICAgICBjbGFzcyBNb2NrT3B0aW9uczoKKyAg ICAgICAgICAgIGRlZiBfX2luaXRfXyhzZWxmKToKKyAgICAgICAgICAgICAgICBzZWxmLnVzZV9k cnQgPSBUcnVlCisKKyAgICAgICAgcG9ydCA9IGNocm9taXVtX2xpbnV4LkNocm9taXVtTGludXhQ b3J0KCd0ZXN0LXBvcnQnLCBvcHRpb25zPU1vY2tPcHRpb25zKCkpCisgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZShwb3J0Ll9wYXRoX3RvX2ltYWdlX2RpZmYoKS5lbmRzd2l0aCgKKyAgICAgICAgICAg ICcvb3V0L1JlbGVhc2UvSW1hZ2VEaWZmJykpCisgICAgICAgIHBvcnQgPSBjaHJvbWl1bV9tYWMu Q2hyb21pdW1NYWNQb3J0KCd0ZXN0LXBvcnQnLCBvcHRpb25zPU1vY2tPcHRpb25zKCkpCisgICAg ICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Ll9wYXRoX3RvX2ltYWdlX2RpZmYoKS5lbmRzd2l0aCgK KyAgICAgICAgICAgICcveGNvZGVidWlsZC9SZWxlYXNlL0ltYWdlRGlmZicpKQorICAgICAgICAj IFRPRE8odG9ueSk6IEZpZ3VyZSBvdXQgaG93IHRoaXMgaXMgZ29pbmcgdG8gd29yayBvbiBXaW5k b3dzLgorICAgICAgICAjcG9ydCA9IGNocm9taXVtX3dpbi5DaHJvbWl1bVdpblBvcnQoJ3Rlc3Qt cG9ydCcsIG9wdGlvbnM9TW9ja09wdGlvbnMoKSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHkK aW5kZXggNjVjNDJiYjRmMDk2Y2MwZDQzMDRjYmMwNDk1MDhmNzYyZjE2ZmZlOC4uMTQwZGNjNDM1 YjAxOWUxMTMzOTIzMzgyZmUyMzRkMGI1OTZkYWZiMyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHkKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93 aW4ucHkKQEAgLTk4LDYgKzk4LDkgQEAgY2xhc3MgQ2hyb21pdW1XaW5Qb3J0KGNocm9taXVtLkNo cm9taXVtUG9ydCk6CiAgICAgIwogCiAgICAgZGVmIF9idWlsZF9wYXRoKHNlbGYsICpjb21wcyk6 CisgICAgICAgIGlmIHNlbGYuX29wdGlvbnMudXNlX2RydDoKKyAgICAgICAgICAgIHJldHVybiBv cy5wYXRoLmpvaW4oc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoKSwgJ1dlYktpdCcsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICdjaHJvbWl1bScsICpjb21wcykKICAgICAgICAg cCA9IHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ3dlYmtpdCcsICpjb21wcykKICAgICAg ICAgaWYgb3MucGF0aC5leGlzdHMocCk6CiAgICAgICAgICAgICByZXR1cm4gcAo=