57375 2011-03-29 12:07:31 -0700 cleanup rebaseline-chromium-webkit-tests 2011-03-29 14:21:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tony tony abarth dglazkov mihaip oldest_to_newest 375642 0 tony 2011-03-29 12:07:31 -0700 cleanup rebaseline-chromium-webkit-tests 375661 1 87391 tony 2011-03-29 12:26:04 -0700 Created attachment 87391 Patch 375663 2 tony 2011-03-29 12:27:16 -0700 No code change, just refactoring. 375688 3 87391 eric 2011-03-29 13:03:19 -0700 Comment on attachment 87391 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87391&action=review > Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:364 > + def _extract_and_add_new_baseline(self, test, zip_file): This still needs more splitting. :) > Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:398 > + if 0 != self._scm.add(expected_fullpath, return_exit_code=True): 0? > Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:459 > + else: webkit doens't else after return. 375754 4 tony 2011-03-29 14:21:10 -0700 Committed r82322: <http://trac.webkit.org/changeset/82322> 87391 2011-03-29 12:26:04 -0700 2011-03-29 13:03:19 -0700 Patch bug-57375-20110329122636.patch text/plain 20778 tony U3VidmVyc2lvbiBSZXZpc2lvbjogODIyNzkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjOGVjMzUzMzIwMjdmMjI0YTc2YjhkMTc2M2M3MjlkZTI0 OGRjMGIzLi5mMDA5ZjlkNjA4NmY3MGFkMjMwNTgxNjRkMWQ4ZmZiZGE0MTVkNmNhIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTgg QEAKIDIwMTEtMDMtMjkgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAorICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBjbGVhbnVwIHJlYmFzZWxp bmUtY2hyb21pdW0td2Via2l0LXRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01NzM3NQorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHMucHk6CisgICAgICAgICAg ICAtIFNwbGl0IF9leHRyYWN0X2FuZF9hZGRfbmV3X2Jhc2VsaW5lcyBpbnRvIDMgZnVuY3Rpb25z CisgICAgICAgICAgICAtIFJlZHVjZSB0aGUgYW1vdW50IG9mIGxpbmUgd3JhcHBpbmcgKHRoZSBm aWxlIGFscmVhZHkgaGFzIGxpbmVzCisgICAgICAgICAgICAgIG92ZXIgODAgY29sLCBzbyBtYXkg YXMgd2VsbCB0cnkgdG8gbWFrZSB0aGUgZmlsZSBjb25zaXN0ZW50KQorICAgICAgICAgICAgLSBS ZW1vdmUgdW5uZWNlc3NhcnkgKClzCisKKzIwMTEtMDMtMjkgIFRvbnkgQ2hhbmcgIDx0b255QGNo cm9taXVtLm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBPamFuIFZhZmFpLgogCiAgICAgICAg IFtjaHJvbWl1bV0gTlJXVCBzaG91bGQgYmUgYWJsZSB0byByZWFkIGNoZWNrc3VtcyBmcm9tIHBu ZyBjb21tZW50cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5weQpp bmRleCA5NWYxNmFiZjMxZTgzZWIyMTRhNzYxMzZlNTdiMDYyMzZjMmM1NWJkLi41MzVmNDIzN2Zm NDAwMjhiMWRmYmE3NWFmMzBiNzkyZGI3MWM1Y2ZhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2No cm9taXVtX3dlYmtpdF90ZXN0cy5weQpAQCAtNTksOCArNTksOCBAQCBmcm9tIHdlYmtpdHB5Lmxh eW91dF90ZXN0cy5sYXlvdXRfcGFja2FnZSBpbXBvcnQgdGVzdF9leHBlY3RhdGlvbnMKIAogX2xv ZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCi1CQVNFTElORV9TVUZGSVhFUyA9IFsn LnR4dCcsICcucG5nJywgJy5jaGVja3N1bSddCi1SRUJBU0VMSU5FX1BMQVRGT1JNX09SREVSID0g WydtYWMnLCAnd2luJywgJ3dpbi14cCcsICd3aW4tdmlzdGEnLCAnbGludXgnXQorQkFTRUxJTkVf U1VGRklYRVMgPSAoJy50eHQnLCAnLnBuZycsICcuY2hlY2tzdW0nKQorUkVCQVNFTElORV9QTEFU Rk9STV9PUkRFUiA9ICgnbWFjJywgJ3dpbicsICd3aW4teHAnLCAnd2luLXZpc3RhJywgJ2xpbnV4 JykKIEFSQ0hJVkVfRElSX05BTUVfRElDVCA9IHsnd2luJzogJ1dlYmtpdF9XaW5fX2RlcHNfJywK ICAgICAgICAgICAgICAgICAgICAgICAgICAnd2luLXZpc3RhJzogJ3dlYmtpdC1kYmctdmlzdGEn LAogICAgICAgICAgICAgICAgICAgICAgICAgICd3aW4teHAnOiAnV2Via2l0X1dpbl9fZGVwc18n LApAQCAtMTc5LDEyICsxNzksOCBAQCBjbGFzcyBSZWJhc2VsaW5lcihvYmplY3QpOgogICAgICAg ICAjICAgLS4gdXBkYXRlIHRoZSB0ZXN0cyBpbiB0ZXN0X2V4cGVjdGF0aW9ucyBmaWxlIGFmdGVy IHJlYmFzZWxpbmUKICAgICAgICAgIyAgICAgIGlzIGRvbmUuCiAgICAgICAgIGV4cGVjdGF0aW9u c19zdHIgPSBzZWxmLl9yZWJhc2VsaW5lX3BvcnQudGVzdF9leHBlY3RhdGlvbnMoKQotICAgICAg ICBzZWxmLl90ZXN0X2V4cGVjdGF0aW9ucyA9IFwKLSAgICAgICAgICAgIHRlc3RfZXhwZWN0YXRp b25zLlRlc3RFeHBlY3RhdGlvbnMoc2VsZi5fcmViYXNlbGluZV9wb3J0LAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOb25lLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RhdGlvbnNfc3RyLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9yZWJhc2VsaW5l X3BvcnQudGVzdF9jb25maWd1cmF0aW9uKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIEZhbHNlKQorICAgICAgICBzZWxmLl90ZXN0X2V4cGVjdGF0aW9u cyA9IHRlc3RfZXhwZWN0YXRpb25zLlRlc3RFeHBlY3RhdGlvbnMoCisgICAgICAgICAgICBzZWxm Ll9yZWJhc2VsaW5lX3BvcnQsIE5vbmUsIGV4cGVjdGF0aW9uc19zdHIsIHNlbGYuX3JlYmFzZWxp bmVfcG9ydC50ZXN0X2NvbmZpZ3VyYXRpb24oKSwgRmFsc2UpCiAgICAgICAgIHNlbGYuX3VybF9m ZXRjaGVyID0gdXJsX2ZldGNoZXIKICAgICAgICAgc2VsZi5femlwX2ZhY3RvcnkgPSB6aXBfZmFj dG9yeQogICAgICAgICBzZWxmLl9zY20gPSBzY20KQEAgLTIwNSwzMCArMjAxLDI0IEBAIGNsYXNz IFJlYmFzZWxpbmVyKG9iamVjdCk6CiAgICAgICAgICAgICBfbG9nLmVycm9yKCdObyBhcmNoaXZl IGZvdW5kLicpCiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgICAgICBsb2dfZGFzaGVk X3N0cmluZygnRXh0cmFjdGluZyBhbmQgYWRkaW5nIG5ldyBiYXNlbGluZXMnLAotICAgICAgICAg ICAgICAgICAgICAgICAgICBzZWxmLl9wbGF0Zm9ybSkKKyAgICAgICAgbG9nX2Rhc2hlZF9zdHJp bmcoJ0V4dHJhY3RpbmcgYW5kIGFkZGluZyBuZXcgYmFzZWxpbmVzJywgc2VsZi5fcGxhdGZvcm0p CiAgICAgICAgIGlmIG5vdCBzZWxmLl9leHRyYWN0X2FuZF9hZGRfbmV3X2Jhc2VsaW5lcyhhcmNo aXZlX2ZpbGUpOgogICAgICAgICAgICAgYXJjaGl2ZV9maWxlLmNsb3NlKCkKICAgICAgICAgICAg IHJldHVybiBGYWxzZQogCiAgICAgICAgIGFyY2hpdmVfZmlsZS5jbG9zZSgpCiAKLSAgICAgICAg bG9nX2Rhc2hlZF9zdHJpbmcoJ1VwZGF0aW5nIHJlYmFzZWxpbmVkIHRlc3RzIGluIGZpbGUnLAot ICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9wbGF0Zm9ybSkKKyAgICAgICAgbG9nX2Rh c2hlZF9zdHJpbmcoJ1VwZGF0aW5nIHJlYmFzZWxpbmVkIHRlc3RzIGluIGZpbGUnLCBzZWxmLl9w bGF0Zm9ybSkKICAgICAgICAgc2VsZi5fdXBkYXRlX3JlYmFzZWxpbmVkX3Rlc3RzX2luX2ZpbGUo YmFja3VwKQogICAgICAgICBfbG9nLmluZm8oJycpCiAKICAgICAgICAgaWYgbGVuKHNlbGYuX3Jl YmFzZWxpbmluZ190ZXN0cykgIT0gbGVuKHNlbGYuX3JlYmFzZWxpbmVkX3Rlc3RzKToKLSAgICAg ICAgICAgIF9sb2cud2FybmluZygnTk9UIEFMTCBURVNUUyBUSEFUIE5FRUQgUkVCQVNFTElOSU5H IEhBVkUgQkVFTiAnCi0gICAgICAgICAgICAgICAgICAgICAgICAgJ1JFQkFTRUxJTkVELicpCi0g ICAgICAgICAgICBfbG9nLndhcm5pbmcoJyAgVG90YWwgdGVzdHMgbmVlZGluZyByZWJhc2VsaW5p bmc6ICVkJywKLSAgICAgICAgICAgICAgICAgICAgICAgICBsZW4oc2VsZi5fcmViYXNlbGluaW5n X3Rlc3RzKSkKLSAgICAgICAgICAgIF9sb2cud2FybmluZygnICBUb3RhbCB0ZXN0cyByZWJhc2Vs aW5lZDogJWQnLAotICAgICAgICAgICAgICAgICAgICAgICAgIGxlbihzZWxmLl9yZWJhc2VsaW5l ZF90ZXN0cykpCisgICAgICAgICAgICBfbG9nLndhcm5pbmcoJ05PVCBBTEwgVEVTVFMgVEhBVCBO RUVEIFJFQkFTRUxJTklORyBIQVZFIEJFRU4gUkVCQVNFTElORUQuJykKKyAgICAgICAgICAgIF9s b2cud2FybmluZygnICBUb3RhbCB0ZXN0cyBuZWVkaW5nIHJlYmFzZWxpbmluZzogJWQnLCBsZW4o c2VsZi5fcmViYXNlbGluaW5nX3Rlc3RzKSkKKyAgICAgICAgICAgIF9sb2cud2FybmluZygnICBU b3RhbCB0ZXN0cyByZWJhc2VsaW5lZDogJWQnLCBsZW4oc2VsZi5fcmViYXNlbGluZWRfdGVzdHMp KQogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAKLSAgICAgICAgX2xvZy53YXJuaW5nKCdBbGwg dGVzdHMgbmVlZGluZyByZWJhc2VsaW5pbmcgd2VyZSBzdWNjZXNzZnVsbHkgJwotICAgICAgICAg ICAgICAgICAgICAgJ3JlYmFzZWxpbmVkLicpCisgICAgICAgIF9sb2cud2FybmluZygnQWxsIHRl c3RzIG5lZWRpbmcgcmViYXNlbGluaW5nIHdlcmUgc3VjY2Vzc2Z1bGx5IHJlYmFzZWxpbmVkLicp CiAKICAgICAgICAgcmV0dXJuIFRydWUKIApAQCAtMjU3LDkgKzI0Nyw4IEBAIGNsYXNzIFJlYmFz ZWxpbmVyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgc2VsZi5fcmViYXNlbGluaW5nX3Rlc3Rz ID0gc2V0KCkKICAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgICAgICBfbG9nLmlu Zm8oJ1RvdGFsIG51bWJlciBvZiB0ZXN0cyBuZWVkaW5nIHJlYmFzZWxpbmluZyAnCi0gICAgICAg ICAgICAgICAgICAnZm9yICIlcyI6ICIlZCInLCBzZWxmLl9wbGF0Zm9ybSwKLSAgICAgICAgICAg ICAgICAgIGxlbihzZWxmLl9yZWJhc2VsaW5pbmdfdGVzdHMpKQorICAgICAgICBfbG9nLmluZm8o J1RvdGFsIG51bWJlciBvZiB0ZXN0cyBuZWVkaW5nIHJlYmFzZWxpbmluZyBmb3IgIiVzIjogIiVk IicsCisgICAgICAgICAgICAgICAgICBzZWxmLl9wbGF0Zm9ybSwgbGVuKHNlbGYuX3JlYmFzZWxp bmluZ190ZXN0cykpCiAKICAgICAgICAgdGVzdF9ubyA9IDEKICAgICAgICAgZm9yIHRlc3QgaW4g c2VsZi5fcmViYXNlbGluaW5nX3Rlc3RzOgpAQCAtMzM0LDggKzMyMyw3IEBAIGNsYXNzIFJlYmFz ZWxpbmVyKG9iamVjdCk6CiAgICAgICAgIGxhdGVzdF9yZXZpc2lvbiA9IHNlbGYuX2dldF9sYXRl c3RfcmV2aXNpb24odXJsX2Jhc2UpCiAgICAgICAgIGlmIGxhdGVzdF9yZXZpc2lvbiBpcyBOb25l IG9yIGxhdGVzdF9yZXZpc2lvbiA8PSAwOgogICAgICAgICAgICAgcmV0dXJuIE5vbmUKLSAgICAg ICAgYXJjaGl2ZV91cmwgPSAoJyVzJXMvbGF5b3V0LXRlc3QtcmVzdWx0cy56aXAnICUgKHVybF9i YXNlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbGF0ZXN0X3JldmlzaW9uKSkKKyAgICAgICAgYXJjaGl2ZV91cmwgPSAnJXMlcy9sYXlv dXQtdGVzdC1yZXN1bHRzLnppcCcgJSAodXJsX2Jhc2UsIGxhdGVzdF9yZXZpc2lvbikKICAgICAg ICAgX2xvZy5pbmZvKCdBcmNoaXZlIHVybDogIiVzIicsIGFyY2hpdmVfdXJsKQogICAgICAgICBy ZXR1cm4gYXJjaGl2ZV91cmwKIApAQCAtMzQ2LDcgKzMzNCw3IEBAIGNsYXNzIFJlYmFzZWxpbmVy KG9iamVjdCk6CiAgICAgICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgICAgIGFyY2hpdmVfZmls ZSA9IHppcGZpbGVzZXQuWmlwRmlsZVNldCh1cmwsIGZpbGVzeXN0ZW09c2VsZi5fZmlsZXN5c3Rl bSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgemlwX2ZhY3Rvcnk9 c2VsZi5femlwX2ZhY3RvcnkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB6aXBfZmFjdG9yeT1zZWxmLl96aXBfZmFjdG9yeSkKICAgICAgICAgX2xvZy5pbmZv KCdBcmNoaXZlIGRvd25sb2FkZWQnKQogICAgICAgICByZXR1cm4gYXJjaGl2ZV9maWxlCiAKQEAg LTM1NCw5MiArMzQyLDgzIEBAIGNsYXNzIFJlYmFzZWxpbmVyKG9iamVjdCk6CiAgICAgICAgICIi IkV4dHJhY3QgbmV3IGJhc2VsaW5lcyBmcm9tIHRoZSB6aXAgZmlsZSBhbmQgYWRkIHRoZW0gdG8g U1ZOIHJlcG9zaXRvcnkuCiAKICAgICAgICAgUmV0dXJuczoKLSAgICAgICAgICBMaXN0IG9mIHRl c3RzIHRoYXQgaGF2ZSBiZWVuIHJlYmFzZWxpbmVkIG9yCi0gICAgICAgICAgTm9uZSBvbiBmYWls dXJlLgotICAgICAgICAiIiIKLQorICAgICAgICAgIExpc3Qgb2YgdGVzdHMgdGhhdCBoYXZlIGJl ZW4gcmViYXNlbGluZWQgb3IgTm9uZSBvbiBmYWlsdXJlLiIiIgogICAgICAgICB6aXBfbmFtZWxp c3QgPSB6aXBfZmlsZS5uYW1lbGlzdCgpCiAKICAgICAgICAgX2xvZy5kZWJ1ZygnemlwIGZpbGUg bmFtZWxpc3Q6JykKICAgICAgICAgZm9yIG5hbWUgaW4gemlwX25hbWVsaXN0OgogICAgICAgICAg ICAgX2xvZy5kZWJ1ZygnICAnICsgbmFtZSkKIAotICAgICAgICBwbGF0Zm9ybSA9IHNlbGYuX3Jl YmFzZWxpbmVfcG9ydC50ZXN0X3BsYXRmb3JtX25hbWVfdG9fbmFtZSgKLSAgICAgICAgICAgIHNl bGYuX3BsYXRmb3JtKQorICAgICAgICBwbGF0Zm9ybSA9IHNlbGYuX3JlYmFzZWxpbmVfcG9ydC50 ZXN0X3BsYXRmb3JtX25hbWVfdG9fbmFtZShzZWxmLl9wbGF0Zm9ybSkKICAgICAgICAgX2xvZy5k ZWJ1ZygnUGxhdGZvcm0gZGlyOiAiJXMiJywgcGxhdGZvcm0pCiAKLSAgICAgICAgdGVzdF9ubyA9 IDEKICAgICAgICAgc2VsZi5fcmViYXNlbGluZWRfdGVzdHMgPSBbXQotICAgICAgICBmb3IgdGVz dCBpbiBzZWxmLl9yZWJhc2VsaW5pbmdfdGVzdHM6Ci0gICAgICAgICAgICBfbG9nLmluZm8oJ1Rl c3QgJWQ6ICVzJywgdGVzdF9ubywgdGVzdCkKLQotICAgICAgICAgICAgZm91bmQgPSBGYWxzZQot ICAgICAgICAgICAgc2NtX2Vycm9yID0gRmFsc2UKLSAgICAgICAgICAgIHRlc3RfYmFzZW5hbWUg PSBzZWxmLl9maWxlc3lzdGVtLnNwbGl0ZXh0KHRlc3QpWzBdCi0gICAgICAgICAgICBmb3Igc3Vm Zml4IGluIEJBU0VMSU5FX1NVRkZJWEVTOgotICAgICAgICAgICAgICAgIGFyY2hpdmVfdGVzdF9u YW1lID0gKCdsYXlvdXQtdGVzdC1yZXN1bHRzLyVzLWFjdHVhbCVzJyAlCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICh0ZXN0X2Jhc2VuYW1lLCBzdWZmaXgpKQotICAgICAg ICAgICAgICAgIF9sb2cuZGVidWcoJyAgQXJjaGl2ZSB0ZXN0IGZpbGUgbmFtZTogIiVzIicsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICBhcmNoaXZlX3Rlc3RfbmFtZSkKLSAgICAgICAgICAg ICAgICBpZiBub3QgYXJjaGl2ZV90ZXN0X25hbWUgaW4gemlwX25hbWVsaXN0OgotICAgICAgICAg ICAgICAgICAgICBfbG9nLmluZm8oJyAgJXMgZmlsZSBub3QgaW4gYXJjaGl2ZS4nLCBzdWZmaXgp Ci0gICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0KLSAgICAgICAgICAgICAgICBmb3VuZCA9 IFRydWUKLSAgICAgICAgICAgICAgICBfbG9nLmluZm8oJyAgJXMgZmlsZSBmb3VuZCBpbiBhcmNo aXZlLicsIHN1ZmZpeCkKLQotICAgICAgICAgICAgICAgICMgRXh0cmFjdCBuZXcgYmFzZWxpbmUg ZnJvbSBhcmNoaXZlIGFuZCBzYXZlIGl0IHRvIGEgdGVtcCBmaWxlLgotICAgICAgICAgICAgICAg IGRhdGEgPSB6aXBfZmlsZS5yZWFkKGFyY2hpdmVfdGVzdF9uYW1lKQotICAgICAgICAgICAgICAg IHRlbXBmaWxlLCB0ZW1wX25hbWUgPSBzZWxmLl9maWxlc3lzdGVtLm9wZW5fYmluYXJ5X3RlbXBm aWxlKHN1ZmZpeCkKLSAgICAgICAgICAgICAgICB0ZW1wZmlsZS53cml0ZShkYXRhKQotICAgICAg ICAgICAgICAgIHRlbXBmaWxlLmNsb3NlKCkKLQotICAgICAgICAgICAgICAgIGV4cGVjdGVkX2Zp bGVuYW1lID0gJyVzLWV4cGVjdGVkJXMnICUgKHRlc3RfYmFzZW5hbWUsIHN1ZmZpeCkKLSAgICAg ICAgICAgICAgICBleHBlY3RlZF9mdWxscGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbigKLSAg ICAgICAgICAgICAgICAgICAgc2VsZi5fcmViYXNlbGluZV9wb3J0LmJhc2VsaW5lX3BhdGgoKSwg ZXhwZWN0ZWRfZmlsZW5hbWUpCi0gICAgICAgICAgICAgICAgZXhwZWN0ZWRfZnVsbHBhdGggPSBz ZWxmLl9maWxlc3lzdGVtLm5vcm1wYXRoKGV4cGVjdGVkX2Z1bGxwYXRoKQotICAgICAgICAgICAg ICAgIF9sb2cuZGVidWcoJyAgRXhwZWN0ZWQgZmlsZSBmdWxsIHBhdGg6ICIlcyInLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgZXhwZWN0ZWRfZnVsbHBhdGgpCi0KLSAgICAgICAgICAgICAg ICAjIFRPRE8odmljdG9ydyk6IGZvciBub3csIHRoZSByZWJhc2VsaW5pbmcgdG9vbCBjaGVja3Mg d2hldGhlcgotICAgICAgICAgICAgICAgICMgb3Igbm90IFRISVMgYmFzZWxpbmUgaXMgZHVwbGlj YXRlIGFuZCBzaG91bGQgYmUgc2tpcHBlZC4KLSAgICAgICAgICAgICAgICAjIFdlIGNvdWxkIGlt cHJvdmUgdGhlIHRvb2wgdG8gY2hlY2sgYWxsIGJhc2VsaW5lcyBpbiB1cHBlcgotICAgICAgICAg ICAgICAgICMgYW5kIGxvd2VyCi0gICAgICAgICAgICAgICAgIyBsZXZlbHMgYW5kIHJlbW92ZSBh bGwgZHVwbGljYXRlZCBiYXNlbGluZXMuCi0gICAgICAgICAgICAgICAgaWYgc2VsZi5faXNfZHVw X2Jhc2VsaW5lKHRlbXBfbmFtZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBleHBlY3RlZF9mdWxscGF0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB0ZXN0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN1 ZmZpeCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9wbGF0 Zm9ybSk6Ci0gICAgICAgICAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0ucmVtb3ZlKHRlbXBf bmFtZSkKLSAgICAgICAgICAgICAgICAgICAgc2VsZi5fZGVsZXRlX2Jhc2VsaW5lKGV4cGVjdGVk X2Z1bGxwYXRoKQotICAgICAgICAgICAgICAgICAgICBjb250aW51ZQotCi0gICAgICAgICAgICAg ICAgc2VsZi5fZmlsZXN5c3RlbS5tYXliZV9tYWtlX2RpcmVjdG9yeShzZWxmLl9maWxlc3lzdGVt LmRpcm5hbWUoZXhwZWN0ZWRfZnVsbHBhdGgpKQotCi0gICAgICAgICAgICAgICAgc2VsZi5fZmls ZXN5c3RlbS5tb3ZlKHRlbXBfbmFtZSwgZXhwZWN0ZWRfZnVsbHBhdGgpCi0KLSAgICAgICAgICAg ICAgICBpZiAwICE9IHNlbGYuX3NjbS5hZGQoZXhwZWN0ZWRfZnVsbHBhdGgsIHJldHVybl9leGl0 X2NvZGU9VHJ1ZSk6Ci0gICAgICAgICAgICAgICAgICAgICMgRklYTUU6IHByaW50IGRldGFpbGVk IGRpYWdub3NlIG1lc3NhZ2VzCi0gICAgICAgICAgICAgICAgICAgIHNjbV9lcnJvciA9IFRydWUK LSAgICAgICAgICAgICAgICBlbGlmIHN1ZmZpeCAhPSAnLmNoZWNrc3VtJzoKLSAgICAgICAgICAg ICAgICAgICAgc2VsZi5fY3JlYXRlX2h0bWxfYmFzZWxpbmVfZmlsZXMoZXhwZWN0ZWRfZnVsbHBh dGgpCi0KLSAgICAgICAgICAgIGlmIG5vdCBmb3VuZDoKLSAgICAgICAgICAgICAgICBfbG9nLndh cm4oJyAgTm8gbmV3IGJhc2VsaW5lcyBmb3VuZCBpbiBhcmNoaXZlLicpCi0gICAgICAgICAgICBl bHNlOgotICAgICAgICAgICAgICAgIGlmIHNjbV9lcnJvcjoKLSAgICAgICAgICAgICAgICAgICAg X2xvZy53YXJuKCcgIEZhaWxlZCB0byBhZGQgYmFzZWxpbmVzIHRvIHlvdXIgcmVwb3NpdG9yeS4n KQotICAgICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgICAgIF9sb2cuaW5mbygn ICBSZWJhc2VsaW5lIHN1Y2NlZWRlZC4nKQotICAgICAgICAgICAgICAgICAgICBzZWxmLl9yZWJh c2VsaW5lZF90ZXN0cy5hcHBlbmQodGVzdCkKLQotICAgICAgICAgICAgdGVzdF9ubyArPSAxCisg ICAgICAgIGZvciB0ZXN0X25vLCB0ZXN0IGluIGVudW1lcmF0ZShzZWxmLl9yZWJhc2VsaW5pbmdf dGVzdHMpOgorICAgICAgICAgICAgX2xvZy5pbmZvKCdUZXN0ICVkOiAlcycsIHRlc3Rfbm8gKyAx LCB0ZXN0KQorICAgICAgICAgICAgc2VsZi5fZXh0cmFjdF9hbmRfYWRkX25ld19iYXNlbGluZSh0 ZXN0LCB6aXBfZmlsZSkKIAogICAgICAgICB6aXBfZmlsZS5jbG9zZSgpCiAKICAgICAgICAgcmV0 dXJuIHNlbGYuX3JlYmFzZWxpbmVkX3Rlc3RzCiAKKyAgICBkZWYgX2V4dHJhY3RfYW5kX2FkZF9u ZXdfYmFzZWxpbmUoc2VsZiwgdGVzdCwgemlwX2ZpbGUpOgorICAgICAgICBmb3VuZCA9IEZhbHNl CisgICAgICAgIHNjbV9lcnJvciA9IEZhbHNlCisgICAgICAgIHRlc3RfYmFzZW5hbWUgPSBzZWxm Ll9maWxlc3lzdGVtLnNwbGl0ZXh0KHRlc3QpWzBdCisgICAgICAgIGZvciBzdWZmaXggaW4gQkFT RUxJTkVfU1VGRklYRVM6CisgICAgICAgICAgICBhcmNoaXZlX3Rlc3RfbmFtZSA9ICdsYXlvdXQt dGVzdC1yZXN1bHRzLyVzLWFjdHVhbCVzJyAlICh0ZXN0X2Jhc2VuYW1lLCBzdWZmaXgpCisgICAg ICAgICAgICBfbG9nLmRlYnVnKCcgIEFyY2hpdmUgdGVzdCBmaWxlIG5hbWU6ICIlcyInLCBhcmNo aXZlX3Rlc3RfbmFtZSkKKyAgICAgICAgICAgIGlmIG5vdCBhcmNoaXZlX3Rlc3RfbmFtZSBpbiB6 aXBfZmlsZS5uYW1lbGlzdCgpOgorICAgICAgICAgICAgICAgIF9sb2cuaW5mbygnICAlcyBmaWxl IG5vdCBpbiBhcmNoaXZlLicsIHN1ZmZpeCkKKyAgICAgICAgICAgICAgICBjb250aW51ZQorCisg ICAgICAgICAgICBmb3VuZCA9IFRydWUKKyAgICAgICAgICAgIF9sb2cuaW5mbygnICAlcyBmaWxl IGZvdW5kIGluIGFyY2hpdmUuJywgc3VmZml4KQorCisgICAgICAgICAgICB0ZW1wX25hbWUgPSBz ZWxmLl9leHRyYWN0X2Zyb21femlwX3RvX3RlbXBmaWxlKHppcF9maWxlLCBhcmNoaXZlX3Rlc3Rf bmFtZSkKKworICAgICAgICAgICAgZXhwZWN0ZWRfZmlsZW5hbWUgPSAnJXMtZXhwZWN0ZWQlcycg JSAodGVzdF9iYXNlbmFtZSwgc3VmZml4KQorICAgICAgICAgICAgZXhwZWN0ZWRfZnVsbHBhdGgg PSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oCisgICAgICAgICAgICAgICAgc2VsZi5fcmViYXNlbGlu ZV9wb3J0LmJhc2VsaW5lX3BhdGgoKSwgZXhwZWN0ZWRfZmlsZW5hbWUpCisgICAgICAgICAgICBl eHBlY3RlZF9mdWxscGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0ubm9ybXBhdGgoZXhwZWN0ZWRfZnVs bHBhdGgpCisgICAgICAgICAgICBfbG9nLmRlYnVnKCcgIEV4cGVjdGVkIGZpbGUgZnVsbCBwYXRo OiAiJXMiJywgZXhwZWN0ZWRfZnVsbHBhdGgpCisKKyAgICAgICAgICAgICMgVE9ETyh2aWN0b3J3 KTogZm9yIG5vdywgdGhlIHJlYmFzZWxpbmluZyB0b29sIGNoZWNrcyB3aGV0aGVyCisgICAgICAg ICAgICAjIG9yIG5vdCBUSElTIGJhc2VsaW5lIGlzIGR1cGxpY2F0ZSBhbmQgc2hvdWxkIGJlIHNr aXBwZWQuCisgICAgICAgICAgICAjIFdlIGNvdWxkIGltcHJvdmUgdGhlIHRvb2wgdG8gY2hlY2sg YWxsIGJhc2VsaW5lcyBpbiB1cHBlcgorICAgICAgICAgICAgIyBhbmQgbG93ZXIgbGV2ZWxzIGFu ZCByZW1vdmUgYWxsIGR1cGxpY2F0ZWQgYmFzZWxpbmVzLgorICAgICAgICAgICAgaWYgc2VsZi5f aXNfZHVwX2Jhc2VsaW5lKHRlbXBfbmFtZSwgZXhwZWN0ZWRfZnVsbHBhdGgsIHRlc3QsIHN1ZmZp eCwgc2VsZi5fcGxhdGZvcm0pOgorICAgICAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0ucmVt b3ZlKHRlbXBfbmFtZSkKKyAgICAgICAgICAgICAgICBzZWxmLl9kZWxldGVfYmFzZWxpbmUoZXhw ZWN0ZWRfZnVsbHBhdGgpCisgICAgICAgICAgICAgICAgY29udGludWUKKworICAgICAgICAgICAg c2VsZi5fZmlsZXN5c3RlbS5tYXliZV9tYWtlX2RpcmVjdG9yeShzZWxmLl9maWxlc3lzdGVtLmRp cm5hbWUoZXhwZWN0ZWRfZnVsbHBhdGgpKQorICAgICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbS5t b3ZlKHRlbXBfbmFtZSwgZXhwZWN0ZWRfZnVsbHBhdGgpCisKKyAgICAgICAgICAgIGlmIDAgIT0g c2VsZi5fc2NtLmFkZChleHBlY3RlZF9mdWxscGF0aCwgcmV0dXJuX2V4aXRfY29kZT1UcnVlKToK KyAgICAgICAgICAgICAgICAjIEZJWE1FOiBwcmludCBkZXRhaWxlZCBkaWFnbm9zZSBtZXNzYWdl cworICAgICAgICAgICAgICAgIHNjbV9lcnJvciA9IFRydWUKKyAgICAgICAgICAgIGVsaWYgc3Vm Zml4ICE9ICcuY2hlY2tzdW0nOgorICAgICAgICAgICAgICAgIHNlbGYuX2NyZWF0ZV9odG1sX2Jh c2VsaW5lX2ZpbGVzKGV4cGVjdGVkX2Z1bGxwYXRoKQorCisgICAgICAgIGlmIG5vdCBmb3VuZDoK KyAgICAgICAgICAgIF9sb2cud2FybignICBObyBuZXcgYmFzZWxpbmVzIGZvdW5kIGluIGFyY2hp dmUuJykKKyAgICAgICAgZWxpZiBzY21fZXJyb3I6CisgICAgICAgICAgICBfbG9nLndhcm4oJyAg RmFpbGVkIHRvIGFkZCBiYXNlbGluZXMgdG8geW91ciByZXBvc2l0b3J5LicpCisgICAgICAgIGVs c2U6CisgICAgICAgICAgICBfbG9nLmluZm8oJyAgUmViYXNlbGluZSBzdWNjZWVkZWQuJykKKyAg ICAgICAgICAgIHNlbGYuX3JlYmFzZWxpbmVkX3Rlc3RzLmFwcGVuZCh0ZXN0KQorCisgICAgZGVm IF9leHRyYWN0X2Zyb21femlwX3RvX3RlbXBmaWxlKHNlbGYsIHppcF9maWxlLCBmaWxlbmFtZSk6 CisgICAgICAgICIiIkV4dHJhY3RzIHxmaWxlbmFtZXwgZnJvbSB8emlwX2ZpbGV8LCBhIFppcEZp bGVTZXQuIFJldHVybnMgdGhlIGZ1bGwKKyAgICAgICAgICAgcGF0aCBuYW1lIHRvIHRoZSBleHRy YWN0ZWQgZmlsZS4iIiIKKyAgICAgICAgZGF0YSA9IHppcF9maWxlLnJlYWQoZmlsZW5hbWUpCisg ICAgICAgIHN1ZmZpeCA9IHNlbGYuX2ZpbGVzeXN0ZW0uc3BsaXRleHQoZmlsZW5hbWUpWzFdCisg ICAgICAgIHRlbXBmaWxlLCB0ZW1wX25hbWUgPSBzZWxmLl9maWxlc3lzdGVtLm9wZW5fYmluYXJ5 X3RlbXBmaWxlKHN1ZmZpeCkKKyAgICAgICAgdGVtcGZpbGUud3JpdGUoZGF0YSkKKyAgICAgICAg dGVtcGZpbGUuY2xvc2UoKQorICAgICAgICByZXR1cm4gdGVtcF9uYW1lCisKICAgICBkZWYgX2lz X2R1cF9iYXNlbGluZShzZWxmLCBuZXdfYmFzZWxpbmUsIGJhc2VsaW5lX3BhdGgsIHRlc3QsIHN1 ZmZpeCwKICAgICAgICAgICAgICAgICAgICAgICAgICBwbGF0Zm9ybSk6CiAgICAgICAgICIiIkNo ZWNrIHdoZXRoZXIgYSBiYXNlbGluZSBpcyBkdXBsaWNhdGUgYW5kIGNhbiBmYWxsYmFjayB0byBz YW1lCkBAIC00NTgsMjUgKzQzNywyNyBAQCBjbGFzcyBSZWJhc2VsaW5lcihvYmplY3QpOgogICAg ICAgICAgIFRydWUgaWYgdGhlIGJhc2VsaW5lIGlzIHVubmVjZXNzYXJ5LgogICAgICAgICAgIEZh bHNlIG90aGVyd2lzZS4KICAgICAgICAgIiIiCi0gICAgICAgIHRlc3RfZmlsZXBhdGggPSBzZWxm Ll9maWxlc3lzdGVtLmpvaW4oc2VsZi5fdGFyZ2V0X3BvcnQubGF5b3V0X3Rlc3RzX2RpcigpLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRlc3QpCisgICAgICAgIHRlc3Rf ZmlsZXBhdGggPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fdGFyZ2V0X3BvcnQubGF5b3V0 X3Rlc3RzX2RpcigpLCB0ZXN0KQogICAgICAgICBhbGxfYmFzZWxpbmVzID0gc2VsZi5fcmViYXNl bGluZV9wb3J0LmV4cGVjdGVkX2Jhc2VsaW5lcygKICAgICAgICAgICAgIHRlc3RfZmlsZXBhdGgs IHN1ZmZpeCwgVHJ1ZSkKLSAgICAgICAgZm9yIChmYWxsYmFja19kaXIsIGZhbGxiYWNrX2ZpbGUp IGluIGFsbF9iYXNlbGluZXM6Ci0gICAgICAgICAgICBpZiBmYWxsYmFja19kaXIgYW5kIGZhbGxi YWNrX2ZpbGU6Ci0gICAgICAgICAgICAgICAgZmFsbGJhY2tfZnVsbHBhdGggPSBzZWxmLl9maWxl c3lzdGVtLm5vcm1wYXRoKAotICAgICAgICAgICAgICAgICAgICBzZWxmLl9maWxlc3lzdGVtLmpv aW4oZmFsbGJhY2tfZGlyLCBmYWxsYmFja19maWxlKSkKLSAgICAgICAgICAgICAgICBpZiBmYWxs YmFja19mdWxscGF0aC5sb3dlcigpICE9IGJhc2VsaW5lX3BhdGgubG93ZXIoKToKLSAgICAgICAg ICAgICAgICAgICAgbmV3X291dHB1dCA9IHNlbGYuX2ZpbGVzeXN0ZW0ucmVhZF9iaW5hcnlfZmls ZShuZXdfYmFzZWxpbmUpCi0gICAgICAgICAgICAgICAgICAgIGZhbGxiYWNrX291dHB1dCA9IHNl bGYuX2ZpbGVzeXN0ZW0ucmVhZF9iaW5hcnlfZmlsZShmYWxsYmFja19mdWxscGF0aCkKLSAgICAg ICAgICAgICAgICAgICAgaXNfaW1hZ2UgPSBiYXNlbGluZV9wYXRoLmxvd2VyKCkuZW5kc3dpdGgo Jy5wbmcnKQotICAgICAgICAgICAgICAgICAgICBpZiBub3Qgc2VsZi5fZGlmZl9iYXNlbGluZXMo bmV3X291dHB1dCwgZmFsbGJhY2tfb3V0cHV0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgaXNfaW1hZ2UpOgotICAgICAgICAgICAgICAgICAgICAgICAg X2xvZy5pbmZvKCcgIEZvdW5kIHNhbWUgYmFzZWxpbmUgYXQgJXMnLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGZhbGxiYWNrX2Z1bGxwYXRoKQotICAgICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIFRydWUKLSAgICAgICAgICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAg ICAgICAgICAgICAgIHJldHVybiBGYWxzZQorCisgICAgICAgIGZvciBmYWxsYmFja19kaXIsIGZh bGxiYWNrX2ZpbGUgaW4gYWxsX2Jhc2VsaW5lczoKKyAgICAgICAgICAgIGlmIG5vdCBmYWxsYmFj a19kaXIgb3Igbm90IGZhbGxiYWNrX2ZpbGU6CisgICAgICAgICAgICAgICAgY29udGludWUKKwor ICAgICAgICAgICAgZmFsbGJhY2tfZnVsbHBhdGggPSBzZWxmLl9maWxlc3lzdGVtLm5vcm1wYXRo KAorICAgICAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihmYWxsYmFja19kaXIsIGZh bGxiYWNrX2ZpbGUpKQorICAgICAgICAgICAgaWYgZmFsbGJhY2tfZnVsbHBhdGgubG93ZXIgPT0g YmFzZWxpbmVfcGF0aC5sb3dlcigpOgorICAgICAgICAgICAgICAgIGNvbnRpbnVlCisKKyAgICAg ICAgICAgIG5ld19vdXRwdXQgPSBzZWxmLl9maWxlc3lzdGVtLnJlYWRfYmluYXJ5X2ZpbGUobmV3 X2Jhc2VsaW5lKQorICAgICAgICAgICAgZmFsbGJhY2tfb3V0cHV0ID0gc2VsZi5fZmlsZXN5c3Rl bS5yZWFkX2JpbmFyeV9maWxlKGZhbGxiYWNrX2Z1bGxwYXRoKQorICAgICAgICAgICAgaXNfaW1h Z2UgPSBiYXNlbGluZV9wYXRoLmxvd2VyKCkuZW5kc3dpdGgoJy5wbmcnKQorICAgICAgICAgICAg aWYgbm90IHNlbGYuX2RpZmZfYmFzZWxpbmVzKG5ld19vdXRwdXQsIGZhbGxiYWNrX291dHB1dCwg aXNfaW1hZ2UpOgorICAgICAgICAgICAgICAgIF9sb2cuaW5mbygnICBGb3VuZCBzYW1lIGJhc2Vs aW5lIGF0ICVzJywgZmFsbGJhY2tfZnVsbHBhdGgpCisgICAgICAgICAgICAgICAgcmV0dXJuIFRy dWUKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAKICAg ICAgICAgcmV0dXJuIEZhbHNlCiAKQEAgLTQ5Myw4ICs0NzQsOCBAQCBjbGFzcyBSZWJhc2VsaW5l cihvYmplY3QpOgogCiAgICAgICAgIGlmIGlzX2ltYWdlOgogICAgICAgICAgICAgcmV0dXJuIHNl bGYuX3BvcnQuZGlmZl9pbWFnZShvdXRwdXQxLCBvdXRwdXQyLCBOb25lKQotICAgICAgICBlbHNl OgotICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3BvcnQuY29tcGFyZV90ZXh0KG91dHB1dDEsIG91 dHB1dDIpCisKKyAgICAgICAgcmV0dXJuIHNlbGYuX3BvcnQuY29tcGFyZV90ZXh0KG91dHB1dDEs IG91dHB1dDIpCiAKICAgICBkZWYgX2RlbGV0ZV9iYXNlbGluZShzZWxmLCBmaWxlbmFtZSk6CiAg ICAgICAgICIiIlJlbW92ZSB0aGUgZmlsZSBmcm9tIHJlcG9zaXRvcnkgYW5kIGRlbGV0ZSBpdCBm cm9tIGRpc2suCkBAIC01MTgsMTQgKzQ5OSwxMiBAQCBjbGFzcyBSZWJhc2VsaW5lcihvYmplY3Qp OgogICAgICAgICAiIiIKIAogICAgICAgICBpZiBzZWxmLl9yZWJhc2VsaW5lZF90ZXN0czoKLSAg ICAgICAgICAgIG5ld19leHBlY3RhdGlvbnMgPSAoCi0gICAgICAgICAgICAgICAgc2VsZi5fdGVz dF9leHBlY3RhdGlvbnMucmVtb3ZlX3BsYXRmb3JtX2Zyb21fZXhwZWN0YXRpb25zKAotICAgICAg ICAgICAgICAgIHNlbGYuX3JlYmFzZWxpbmVkX3Rlc3RzLCBzZWxmLl9wbGF0Zm9ybSkpCisgICAg ICAgICAgICBuZXdfZXhwZWN0YXRpb25zID0gc2VsZi5fdGVzdF9leHBlY3RhdGlvbnMucmVtb3Zl X3BsYXRmb3JtX2Zyb21fZXhwZWN0YXRpb25zKAorICAgICAgICAgICAgICAgIHNlbGYuX3JlYmFz ZWxpbmVkX3Rlc3RzLCBzZWxmLl9wbGF0Zm9ybSkKICAgICAgICAgICAgIHBhdGggPSBzZWxmLl90 YXJnZXRfcG9ydC5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoKQogICAgICAgICAgICAg aWYgYmFja3VwOgotICAgICAgICAgICAgICAgIGRhdGVfc3VmZml4ID0gdGltZS5zdHJmdGltZSgn JVklbSVkJUglTSVTJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdGltZS5sb2NhbHRpbWUodGltZS50aW1lKCkpKQotICAgICAgICAgICAgICAgIGJhY2t1cF9m aWxlID0gKCclcy5vcmlnLiVzJyAlIChwYXRoLCBkYXRlX3N1ZmZpeCkpCisgICAgICAgICAgICAg ICAgZGF0ZV9zdWZmaXggPSB0aW1lLnN0cmZ0aW1lKCclWSVtJWQlSCVNJVMnLCB0aW1lLmxvY2Fs dGltZSh0aW1lLnRpbWUoKSkpCisgICAgICAgICAgICAgICAgYmFja3VwX2ZpbGUgPSAnJXMub3Jp Zy4lcycgJSAocGF0aCwgZGF0ZV9zdWZmaXgpCiAgICAgICAgICAgICAgICAgaWYgc2VsZi5fZmls ZXN5c3RlbS5leGlzdHMoYmFja3VwX2ZpbGUpOgogICAgICAgICAgICAgICAgICAgICBzZWxmLl9m aWxlc3lzdGVtLnJlbW92ZShiYWNrdXBfZmlsZSkKICAgICAgICAgICAgICAgICBfbG9nLmluZm8o J1NhdmluZyBvcmlnaW5hbCBmaWxlIHRvICIlcyInLCBiYWNrdXBfZmlsZSkKQEAgLTU1MSw4ICs1 MzAsNyBAQCBjbGFzcyBSZWJhc2VsaW5lcihvYmplY3QpOgogICAgICAgICAjIENvcHkgdGhlIG5l dyBiYXNlbGluZSB0byBodG1sIGRpcmVjdG9yeSBmb3IgcmVzdWx0IGNvbXBhcmlzb24uCiAgICAg ICAgIGJhc2VsaW5lX2ZpbGVuYW1lID0gc2VsZi5fZmlsZXN5c3RlbS5iYXNlbmFtZShiYXNlbGlu ZV9mdWxscGF0aCkKICAgICAgICAgbmV3X2ZpbGUgPSBnZXRfcmVzdWx0X2ZpbGVfZnVsbHBhdGgo c2VsZi5fZmlsZXN5c3RlbSwgc2VsZi5fb3B0aW9ucy5odG1sX2RpcmVjdG9yeSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFzZWxpbmVfZmlsZW5hbWUsIHNl bGYuX3BsYXRmb3JtLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnbmV3JykKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFz ZWxpbmVfZmlsZW5hbWUsIHNlbGYuX3BsYXRmb3JtLCAnbmV3JykKICAgICAgICAgc2VsZi5fZmls ZXN5c3RlbS5jb3B5ZmlsZShiYXNlbGluZV9mdWxscGF0aCwgbmV3X2ZpbGUpCiAgICAgICAgIF9s b2cuaW5mbygnICBIdG1sOiBjb3BpZWQgbmV3IGJhc2VsaW5lIGZpbGUgZnJvbSAiJXMiIHRvICIl cyIuJywKICAgICAgICAgICAgICAgICAgIGJhc2VsaW5lX2Z1bGxwYXRoLCBuZXdfZmlsZSkKQEAg LTU2NCwxOSArNTQyLDE2IEBAIGNsYXNzIFJlYmFzZWxpbmVyKG9iamVjdCk6CiAgICAgICAgICAg ICBfbG9nLmluZm8oZSkKICAgICAgICAgICAgIG91dHB1dCA9ICIiCiAKLSAgICAgICAgaWYgKG5v dCBvdXRwdXQpIG9yIChvdXRwdXQudXBwZXIoKS5yc3RyaXAoKS5lbmRzd2l0aCgKLSAgICAgICAg ICAgICdOTyBTVUNIIEZJTEUgT1IgRElSRUNUT1JZJykpOgorICAgICAgICBpZiAobm90IG91dHB1 dCkgb3IgKG91dHB1dC51cHBlcigpLnJzdHJpcCgpLmVuZHN3aXRoKCdOTyBTVUNIIEZJTEUgT1Ig RElSRUNUT1JZJykpOgogICAgICAgICAgICAgX2xvZy5pbmZvKCcgIE5vIGJhc2UgZmlsZTogIiVz IicsIGJhc2VsaW5lX2Z1bGxwYXRoKQogICAgICAgICAgICAgcmV0dXJuCiAgICAgICAgIGJhc2Vf ZmlsZSA9IGdldF9yZXN1bHRfZmlsZV9mdWxscGF0aChzZWxmLl9maWxlc3lzdGVtLCBzZWxmLl9v cHRpb25zLmh0bWxfZGlyZWN0b3J5LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYmFzZWxpbmVfZmlsZW5hbWUsIHNlbGYuX3BsYXRmb3JtLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ29sZCcpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYXNlbGluZV9maWxlbmFtZSwgc2VsZi5f cGxhdGZvcm0sICdvbGQnKQogICAgICAgICBpZiBiYXNlX2ZpbGUudXBwZXIoKS5lbmRzd2l0aCgn LlBORycpOgogICAgICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbS53cml0ZV9iaW5hcnlfZmlsZShi YXNlX2ZpbGUsIG91dHB1dCkKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNlbGYuX2ZpbGVz eXN0ZW0ud3JpdGVfdGV4dF9maWxlKGJhc2VfZmlsZSwgb3V0cHV0KQotICAgICAgICBfbG9nLmlu Zm8oJyAgSHRtbDogY3JlYXRlZCBvbGQgYmFzZWxpbmUgZmlsZTogIiVzIi4nLAotICAgICAgICAg ICAgICAgICAgYmFzZV9maWxlKQorICAgICAgICBfbG9nLmluZm8oJyAgSHRtbDogY3JlYXRlZCBv bGQgYmFzZWxpbmUgZmlsZTogIiVzIi4nLCBiYXNlX2ZpbGUpCiAKICAgICAgICAgIyBHZXQgdGhl IGRpZmYgYmV0d2VlbiBvbGQgYW5kIG5ldyBiYXNlbGluZXMgYW5kIHNhdmUgdG8gdGhlIGh0bWwg ZGlyLgogICAgICAgICBpZiBiYXNlbGluZV9maWxlbmFtZS51cHBlcigpLmVuZHN3aXRoKCcuVFhU Jyk6CkBAIC01ODYsOCArNTYxLDcgQEAgY2xhc3MgUmViYXNlbGluZXIob2JqZWN0KToKICAgICAg ICAgICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy5odG1sX2RpcmVjdG9yeSwgYmFzZWxpbmVfZmls ZW5hbWUsCiAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3BsYXRmb3JtLCAnZGlmZicpCiAgICAg ICAgICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoZGlmZl9maWxlLCBv dXRwdXQpCi0gICAgICAgICAgICAgICAgX2xvZy5pbmZvKCcgIEh0bWw6IGNyZWF0ZWQgYmFzZWxp bmUgZGlmZiBmaWxlOiAiJXMiLicsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIGRpZmZfZmls ZSkKKyAgICAgICAgICAgICAgICBfbG9nLmluZm8oJyAgSHRtbDogY3JlYXRlZCBiYXNlbGluZSBk aWZmIGZpbGU6ICIlcyIuJywgZGlmZl9maWxlKQogCiAKIGNsYXNzIEh0bWxHZW5lcmF0b3Iob2Jq ZWN0KToKQEAgLTY3Myw4ICs2NDcsNyBAQCBjbGFzcyBIdG1sR2VuZXJhdG9yKG9iamVjdCk6CiAg ICAgICAgIF9sb2cuZGVidWcoaHRtbCkKIAogICAgICAgICBzZWxmLl9maWxlc3lzdGVtLndyaXRl X3RleHRfZmlsZShzZWxmLl9odG1sX2ZpbGUsIGh0bWwpCi0gICAgICAgIF9sb2cuaW5mbygnQmFz ZWxpbmUgY29tcGFyaXNvbiBodG1sIGdlbmVyYXRlZCBhdCAiJXMiJywKLSAgICAgICAgICAgICAg ICAgIHNlbGYuX2h0bWxfZmlsZSkKKyAgICAgICAgX2xvZy5pbmZvKCdCYXNlbGluZSBjb21wYXJp c29uIGh0bWwgZ2VuZXJhdGVkIGF0ICIlcyInLCBzZWxmLl9odG1sX2ZpbGUpCiAKICAgICBkZWYg c2hvd19odG1sKHNlbGYpOgogICAgICAgICAiIiJMYXVuY2ggdGhlIHJlYmFzZWxpbmluZyBodG1s IGluIGJyd29zZXIuIiIiCkBAIC03MjYsOCArNjk5LDcgQEAgY2xhc3MgSHRtbEdlbmVyYXRvcihv YmplY3QpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ25hbWUnOiBiYXNlbGlu ZV9maWxlbmFtZX0KIAogICAgICAgICBkaWZmX2ZpbGUgPSBnZXRfcmVzdWx0X2ZpbGVfZnVsbHBh dGgoc2VsZi5fZmlsZXN5c3RlbSwgc2VsZi5faHRtbF9kaXJlY3RvcnksCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYXNlbGluZV9maWxlbmFtZSwgcGxhdGZv cm0sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnZGlmZicp CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYXNlbGluZV9m aWxlbmFtZSwgcGxhdGZvcm0sICdkaWZmJykKICAgICAgICAgX2xvZy5pbmZvKCcgICAgQmFzZWxp bmUgZGlmZiBmaWxlOiAiJXMiJywgZGlmZl9maWxlKQogICAgICAgICBpZiBzZWxmLl9maWxlc3lz dGVtLmV4aXN0cyhkaWZmX2ZpbGUpOgogICAgICAgICAgICAgbGlua3MgKz0gaHRtbF90ZF9saW5r ICUgeyd1cmknOiBzZWxmLmFic3BhdGhfdG9fdXJpKGRpZmZfZmlsZSksCkBAIC03NTcsMTEgKzcy OSw5IEBAIGNsYXNzIEh0bWxHZW5lcmF0b3Iob2JqZWN0KToKIAogICAgICAgICAgICAgX2xvZy5p bmZvKCcgIENoZWNraW5nICVzIGZpbGVzJywgc3VmZml4KQogICAgICAgICAgICAgZm9yIHBsYXRm b3JtIGluIHNlbGYuX3BsYXRmb3JtczoKLSAgICAgICAgICAgICAgICBsaW5rcyA9IHNlbGYuX2dl bmVyYXRlX2Jhc2VsaW5lX2xpbmtzKHRlc3RfYmFzZW5hbWUsIHN1ZmZpeCwKLSAgICAgICAgICAg ICAgICAgICAgcGxhdGZvcm0pCisgICAgICAgICAgICAgICAgbGlua3MgPSBzZWxmLl9nZW5lcmF0 ZV9iYXNlbGluZV9saW5rcyh0ZXN0X2Jhc2VuYW1lLCBzdWZmaXgsIHBsYXRmb3JtKQogICAgICAg ICAgICAgICAgIGlmIGxpbmtzOgotICAgICAgICAgICAgICAgICAgICByb3cgPSBzZWxmLkhUTUxf VERfTk9MSU5LICUgc2VsZi5fZ2V0X2Jhc2VsaW5lX3Jlc3VsdF90eXBlKAotICAgICAgICAgICAg ICAgICAgICAgICAgc3VmZml4KQorICAgICAgICAgICAgICAgICAgICByb3cgPSBzZWxmLkhUTUxf VERfTk9MSU5LICUgc2VsZi5fZ2V0X2Jhc2VsaW5lX3Jlc3VsdF90eXBlKHN1ZmZpeCkKICAgICAg ICAgICAgICAgICAgICAgcm93ICs9IHNlbGYuSFRNTF9URF9OT0xJTksgJSBwbGF0Zm9ybQogICAg ICAgICAgICAgICAgICAgICByb3cgKz0gbGlua3MKICAgICAgICAgICAgICAgICAgICAgX2xvZy5k ZWJ1ZygnICAgIGh0bWwgcm93OiAlcycsIHJvdykK