197826 2019-05-12 19:32:16 -0700 Add support for webkit-test-runner options to WPT importer 2019-05-14 10:06:40 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen cdumez commit-queue ews-watchlist glenn jbedard lforschler rniwa webkit-bug-importer oldest_to_newest 1535502 0 youennf 2019-05-12 19:32:16 -0700 Add support for webkit-test-runner options to WPT importer 1535503 1 369687 youennf 2019-05-12 19:50:25 -0700 Created attachment 369687 Patch 1536114 2 369687 commit-queue 2019-05-14 10:03:24 -0700 Comment on attachment 369687 Patch Clearing flags on attachment: 369687 Committed r245287: <https://trac.webkit.org/changeset/245287> 1536115 3 commit-queue 2019-05-14 10:03:26 -0700 All reviewed patches have been landed. Closing bug. 1536118 4 webkit-bug-importer 2019-05-14 10:06:40 -0700 <rdar://problem/50770997> 369687 2019-05-12 19:50:25 -0700 2019-05-14 10:03:24 -0700 Patch bug-197826-20190512195024.patch text/plain 14998 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1MTc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmY0ODIzNjljN2U2YzNkYTYxMGE1MTJiMTQ4NjVjYWVi ODkyNjczOC4uMTNlMjEzNzFhMmEzYWEyYmMwM2E0MjBiN2IwOTk0MzI3NTM4OWVhMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQw IEBACisyMDE5LTA1LTEyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAg ICAgICBBZGQgc3VwcG9ydCBmb3Igd2Via2l0LXRlc3QtcnVubmVyIG9wdGlvbnMgdG8gV1BUIGlt cG9ydGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTc4MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ biBjYXNlIG9mIG92ZXJ3cml0aW5nIGFuIGV4aXN0aW5nIHRlc3QsIGNoZWNrIGlmIHRoZSBleGlz dGluZyB0ZXN0CisgICAgICAgIGNvbnRhaW5zIGEgPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgLS0+ IGNvbW1lbnQgYW5kIGluc2VydCBpdCBiYWNrIGlmCisgICAgICAgIG5lZWRlZCBpbiB0aGUgbmV3 IHRlc3QuCisKKyAgICAgICAgRm9yIGV4cG9ydGVyLCBmb3JiaWQgY3JlYXRpbmcgYSBXUFQgUFIg aWYgdGhlcmUgYXJlIGNoYW5nZXMgY29udGFpbmluZworICAgICAgICB0aGUgd2Via2l0LXRlc3Qt cnVubmVyIHN0cmluZy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29u dmVydGVyLnB5OgorICAgICAgICAoY29udmVydF9mb3Jfd2Via2l0KToKKyAgICAgICAgKF9XM0NU ZXN0Q29udmVydGVyLl9faW5pdF9fKToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLmFkZF93 ZWJraXRfdGVzdF9ydW5uZXJfb3B0aW9uc19pZl9uZWVkZWQpOgorICAgICAgICAoX1czQ1Rlc3RD b252ZXJ0ZXIuaGFuZGxlX3N0YXJ0dGFnKToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLmhh bmRsZV9jb21tZW50KToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLmhhbmRsZV9kZWNsKToK KyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLmhhbmRsZV9waSk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weToKKyAgICAgICAgKFdlYlBsYXRmb3JtVGVz dEV4cG9ydGVyLndyaXRlX2dpdF9wYXRjaF9maWxlKToKKyAgICAgICAgKFdlYlBsYXRmb3JtVGVz dEV4cG9ydGVyLm1ha2VfcHVsbF9yZXF1ZXN0KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3czYy90ZXN0X2ltcG9ydGVyLnB5OgorICAgICAgICAoVGVzdEltcG9ydGVyLndlYmtpdF90ZXN0 X3J1bm5lcl9vcHRpb25zKToKKyAgICAgICAgKFRlc3RJbXBvcnRlcik6CisgICAgICAgIChUZXN0 SW1wb3J0ZXIuYWRkX3dlYmtpdF90ZXN0X3J1bm5lcl9vcHRpb25zX3RvX2NvbnRlbnQpOgorICAg ICAgICAoVGVzdEltcG9ydGVyLmNvcHlfaHRtbF9maWxlKToKKyAgICAgICAgKFRlc3RJbXBvcnRl ci53cml0ZV9odG1sX3RlbXBsYXRlKToKKyAgICAgICAgKFRlc3RJbXBvcnRlci53cml0ZV9odG1s X2ZpbGVzX2Zvcl90ZW1wbGF0ZWRfanNfdGVzdHMpOgorICAgICAgICAoVGVzdEltcG9ydGVyLmlt cG9ydF90ZXN0cyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRl cl91bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfbWFudWFsX3Nsb3dfdGVzdCk6CisgICAgICAg ICh0ZXN0X3dlYmtpdF90ZXN0X3J1bm5lcl9vcHRpb25zKToKKwogMjAxOS0wNS0xMCAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQSBzZXJ2aWNlIHdvcmtlciBp bnN0YW5jZSBzaG91bGQgYmUgdGVybWluYXRlZCB3aGVuIGl0cyBTV1NlcnZlciBpcyBkZXN0cm95 ZWQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVy LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHkKaW5kZXgg NmUyOTk2ZTkwMTM2NTVjMDg2MTU1MDVkMTY5YjA2YjMxMjZiNjVlZC4uNTI3NGEyOTA1NTFiZTNh NTVmMGIwMGVjZTE5NGM5YTc2ZTg3OWY1ZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93 M2MvdGVzdF9jb252ZXJ0ZXIucHkKQEAgLTM4LDEyICszOCwxMiBAQCBmcm9tIEhUTUxQYXJzZXIg aW1wb3J0IEhUTUxQYXJzZXIKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAog Ci1kZWYgY29udmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1 cHBvcnRfaW5mbywgaG9zdD1Ib3N0KCksIGNvbnZlcnRfdGVzdF9oYXJuZXNzX2xpbmtzPVRydWUp OgorZGVmIGNvbnZlcnRfZm9yX3dlYmtpdChuZXdfcGF0aCwgZmlsZW5hbWUsIHJlZmVyZW5jZV9z dXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgpLCBjb252ZXJ0X3Rlc3RfaGFybmVzc19saW5rcz1UcnVl LCB3ZWJraXRfdGVzdF9ydW5uZXJfb3B0aW9ucz0nJyk6CiAgICAgIiIiIENvbnZlcnRzIGEgZmls ZSdzIHxjb250ZW50c3wgc28gaXQgd2lsbCBmdW5jdGlvbiBjb3JyZWN0bHkgaW4gaXRzIHxuZXdf cGF0aHwgaW4gV2Via2l0LgogCiAgICAgUmV0dXJucyB0aGUgbGlzdCBvZiBtb2RpZmllZCBwcm9w ZXJ0aWVzIGFuZCB0aGUgbW9kaWZpZWQgdGV4dCBpZiB0aGUgZmlsZSB3YXMgbW9kaWZlZCwgTm9u ZSBvdGhlcndpc2UuIiIiCiAgICAgY29udGVudHMgPSBob3N0LmZpbGVzeXN0ZW0ucmVhZF9iaW5h cnlfZmlsZShmaWxlbmFtZSkKLSAgICBjb252ZXJ0ZXIgPSBfVzNDVGVzdENvbnZlcnRlcihuZXdf cGF0aCwgZmlsZW5hbWUsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIGhvc3QsIGNvbnZlcnRfdGVz dF9oYXJuZXNzX2xpbmtzKQorICAgIGNvbnZlcnRlciA9IF9XM0NUZXN0Q29udmVydGVyKG5ld19w YXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5mbywgaG9zdCwgY29udmVydF90ZXN0 X2hhcm5lc3NfbGlua3MsIHdlYmtpdF90ZXN0X3J1bm5lcl9vcHRpb25zKQogICAgIGlmIGZpbGVu YW1lLmVuZHN3aXRoKCcuY3NzJyk6CiAgICAgICAgIHJldHVybiBjb252ZXJ0ZXIuYWRkX3dlYmtp dF9wcmVmaXhfdG9fdW5wcmVmaXhlZF9wcm9wZXJ0aWVzX2FuZF92YWx1ZXMoY29udGVudHMpCiAg ICAgZWxzZToKQEAgLTUzLDcgKzUzLDcgQEAgZGVmIGNvbnZlcnRfZm9yX3dlYmtpdChuZXdfcGF0 aCwgZmlsZW5hbWUsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgpLAogCiAKIGNs YXNzIF9XM0NUZXN0Q29udmVydGVyKEhUTUxQYXJzZXIpOgotICAgIGRlZiBfX2luaXRfXyhzZWxm LCBuZXdfcGF0aCwgZmlsZW5hbWUsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgp LCBjb252ZXJ0X3Rlc3RfaGFybmVzc19saW5rcz1UcnVlKToKKyAgICBkZWYgX19pbml0X18oc2Vs ZiwgbmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0PUhvc3Qo KSwgY29udmVydF90ZXN0X2hhcm5lc3NfbGlua3M9VHJ1ZSwgd2Via2l0X3Rlc3RfcnVubmVyX29w dGlvbnM9JycpOgogICAgICAgICBIVE1MUGFyc2VyLl9faW5pdF9fKHNlbGYpCiAKICAgICAgICAg c2VsZi5faG9zdCA9IGhvc3QKQEAgLTY3LDYgKzY3LDggQEAgY2xhc3MgX1czQ1Rlc3RDb252ZXJ0 ZXIoSFRNTFBhcnNlcik6CiAgICAgICAgIHNlbGYuc3R5bGVfZGF0YSA9IFtdCiAgICAgICAgIHNl bGYuZmlsZW5hbWUgPSBmaWxlbmFtZQogICAgICAgICBzZWxmLnJlZmVyZW5jZV9zdXBwb3J0X2lu Zm8gPSByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvCisgICAgICAgIHNlbGYud2Via2l0X3Rlc3RfcnVu bmVyX29wdGlvbnMgPSB3ZWJraXRfdGVzdF9ydW5uZXJfb3B0aW9ucworICAgICAgICBzZWxmLmhh c19zdGFydGVkID0gRmFsc2UKIAogICAgICAgICByZXNvdXJjZXNfcGF0aCA9IHNlbGYucGF0aF9m cm9tX3dlYmtpdF9yb290KCdMYXlvdXRUZXN0cycsICdyZXNvdXJjZXMnKQogICAgICAgICByZXNv dXJjZXNfcmVscGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0ucmVscGF0aChyZXNvdXJjZXNfcGF0aCwg bmV3X3BhdGgpCkBAIC0yMTUsMTAgKzIxNywxOCBAQCBjbGFzcyBfVzNDVGVzdENvbnZlcnRlcihI VE1MUGFyc2VyKToKIAogICAgICAgICBzZWxmLmNvbnZlcnRlZF9kYXRhLmFwcGVuZChjb252ZXJ0 ZWQpCiAKKyAgICBkZWYgYWRkX3dlYmtpdF90ZXN0X3J1bm5lcl9vcHRpb25zX2lmX25lZWRlZChz ZWxmKToKKyAgICAgICAgaWYgc2VsZi5oYXNfc3RhcnRlZDoKKyAgICAgICAgICAgIHJldHVybgor ICAgICAgICBzZWxmLmhhc19zdGFydGVkID0gVHJ1ZQorICAgICAgICBpZiBzZWxmLndlYmtpdF90 ZXN0X3J1bm5lcl9vcHRpb25zOgorICAgICAgICAgICAgc2VsZi5jb252ZXJ0ZWRfZGF0YVstMV0g PSBzZWxmLmNvbnZlcnRlZF9kYXRhWy0xXSArIHNlbGYud2Via2l0X3Rlc3RfcnVubmVyX29wdGlv bnMKKwogICAgIGRlZiBoYW5kbGVfc3RhcnR0YWcoc2VsZiwgdGFnLCBhdHRycyk6CiAgICAgICAg IGlmIHRhZyA9PSAnc3R5bGUnOgogICAgICAgICAgICAgc2VsZi5pbl9zdHlsZV90YWcgPSBUcnVl CiAgICAgICAgIHNlbGYuY29udmVydF9hdHRyaWJ1dGVzX2lmX25lZWRlZCh0YWcsIGF0dHJzKQor ICAgICAgICBzZWxmLmFkZF93ZWJraXRfdGVzdF9ydW5uZXJfb3B0aW9uc19pZl9uZWVkZWQoKQog CiAgICAgZGVmIGhhbmRsZV9lbmR0YWcoc2VsZiwgdGFnKToKICAgICAgICAgaWYgdGFnID09ICdz dHlsZSc6CkBAIC0yNDQsOSArMjU0LDEyIEBAIGNsYXNzIF9XM0NUZXN0Q29udmVydGVyKEhUTUxQ YXJzZXIpOgogCiAgICAgZGVmIGhhbmRsZV9jb21tZW50KHNlbGYsIGRhdGEpOgogICAgICAgICBz ZWxmLmNvbnZlcnRlZF9kYXRhLmV4dGVuZChbJzwhLS0gJywgZGF0YSwgJyAtLT4nXSkKKyAgICAg ICAgc2VsZi5hZGRfd2Via2l0X3Rlc3RfcnVubmVyX29wdGlvbnNfaWZfbmVlZGVkKCkKIAogICAg IGRlZiBoYW5kbGVfZGVjbChzZWxmLCBkZWNsKToKICAgICAgICAgc2VsZi5jb252ZXJ0ZWRfZGF0 YS5leHRlbmQoWyc8IScsIGRlY2wsICc+J10pCisgICAgICAgIHNlbGYuYWRkX3dlYmtpdF90ZXN0 X3J1bm5lcl9vcHRpb25zX2lmX25lZWRlZCgpCiAKICAgICBkZWYgaGFuZGxlX3BpKHNlbGYsIGRh dGEpOgogICAgICAgICBzZWxmLmNvbnZlcnRlZF9kYXRhLmV4dGVuZChbJzw/JywgZGF0YSwgJz4n XSkKKyAgICAgICAgc2VsZi5hZGRfd2Via2l0X3Rlc3RfcnVubmVyX29wdGlvbnNfaWZfbmVlZGVk KCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZXhwb3J0ZXIu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2V4cG9ydGVyLnB5CmluZGV4IDBh YmNlZTdjY2QxZTJhMTE4MDFkMDBhOGNkMjZjMGQzZTEwNGQzYjguLmQ0OGRiNzVjYjExN2YwYzUx ZTQ2OTNjMzAwYjM4M2IxOGEyMTQzNmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdzNjL3Rlc3RfZXhwb3J0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2Mv dGVzdF9leHBvcnRlci5weQpAQCAtMTgyLDYgKzE4MiwxMyBAQCBjbGFzcyBXZWJQbGF0Zm9ybVRl c3RFeHBvcnRlcihvYmplY3QpOgogICAgICAgICAgICAgcmV0dXJuICcnCiAgICAgICAgICMgRklY TUU6IFdlIGNhbiBwcm9iYWJseSB0cnkgdG8gdXNlIC0tcmVsYXRpdmUgZ2l0IHBhcmFtZXRlciB0 byBub3QgZG8gdGhhdCByZXBsYWNlbWVudC4KICAgICAgICAgcGF0Y2hfZGF0YSA9IHBhdGNoX2Rh dGEucmVwbGFjZShXRUJLSVRfV1BUX0RJUiArICcvJywgJycpCisKKyAgICAgICAgIyBGSVhNRTog U3VwcG9ydCBzdHJpcHBpbmcgb2YgPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgLS0+IGNvbW1lbnRz LgorICAgICAgICBzZWxmLmhhc193ZWJraXRfdGVzdF9ydW5uZXJfc3BlY2lmaWNfY2hhbmdlcyA9 ICd3ZWJraXQtdGVzdC1ydW5uZXInIGluIHBhdGNoX2RhdGEKKyAgICAgICAgaWYgc2VsZi5oYXNf d2Via2l0X3Rlc3RfcnVubmVyX3NwZWNpZmljX2NoYW5nZXM6CisgICAgICAgICAgICBfbG9nLndh cm5pbmcoIlBhdGNoIGNvbnRhaW5zIHdlYmtpdC10ZXN0LXJ1bm5lciBzcGVjaWZpYyBjaGFuZ2Vz LCBwbGVhc2UgcmVtb3ZlIHRoZW0gYmVmb3JlIGNyZWF0aW5nIGEgUFIiKQorICAgICAgICAgICAg cmV0dXJuICcnCisKICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUocGF0 Y2hfZmlsZSwgcGF0Y2hfZGF0YSkKICAgICAgICAgcmV0dXJuIHBhdGNoX2ZpbGUKIApAQCAtMzA2 LDYgKzMxMywxMCBAQCBjbGFzcyBXZWJQbGF0Zm9ybVRlc3RFeHBvcnRlcihvYmplY3QpOgogICAg ICAgICByZXR1cm4gVHJ1ZQogCiAgICAgZGVmIG1ha2VfcHVsbF9yZXF1ZXN0KHNlbGYpOgorICAg ICAgICBpZiBzZWxmLmhhc193ZWJraXRfdGVzdF9ydW5uZXJfc3BlY2lmaWNfY2hhbmdlczoKKyAg ICAgICAgICAgIF9sb2cuZXJyb3IoJ0Nhbm5vdCBjcmVhdGUgYSBXUFQgUFIgc2luY2UgaXQgY29u dGFpbnMgd2Via2l0IHRlc3QgcnVubmVyIHNwZWNpZmljIGNoYW5nZXMnKQorICAgICAgICAgICAg cmV0dXJuCisKICAgICAgICAgaWYgbm90IHNlbGYuX2dpdGh1YjoKICAgICAgICAgICAgIF9sb2cu aW5mbygnU2tpcHBpbmcgcHVsbCByZXF1ZXN0IGJlY2F1c2UgT0F1dGggdG9rZW4gd2FzIG5vdCBw cm92aWRlZC4gWW91IGNhbiBvcGVuIHRoZSBwdWxsIHJlcXVlc3QgbWFudWFsbHkgdXNpbmcgdGhl IGJyYW5jaCAnICsgc2VsZi5fd3B0X2ZvcmtfYnJhbmNoX2dpdGh1Yl91cmwpCiAgICAgICAgICAg ICByZXR1cm4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1w b3J0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5Cmlu ZGV4IGY5MmVjZDIwNDU4ODdhYmVmZGU3NWRkZjYwZTdiODVhYTZhYTFlZmEuLmU4NzQ4MDhhY2Jk MDdmMWI5ZmJkNTg3ZTU1NzBhOTRhNWRhNGE4YmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS93M2MvdGVzdF9pbXBvcnRlci5weQpAQCAtMzYwLDE3ICszNjAsNDkgQEAgY2xhc3MgVGVzdElt cG9ydGVyKG9iamVjdCk6CiAgICAgICAgICAgICByZXR1cm4gVHJ1ZQogICAgICAgICByZXR1cm4g c2VsZi5vcHRpb25zLmNvbnZlcnRfdGVzdF9oYXJuZXNzX2xpbmtzCiAKLSAgICBkZWYgd3JpdGVf aHRtbF9maWxlc19mb3JfdGVtcGxhdGVkX2pzX3Rlc3RzKHNlbGYsIG9yaWdfZmlsZXBhdGgsIG5l d19maWxlcGF0aCk6CisgICAgZGVmIF93ZWJraXRfdGVzdF9ydW5uZXJfb3B0aW9ucyhzZWxmLCBw YXRoKToKKyAgICAgICAgaWYgbm90KHNlbGYuZmlsZXN5c3RlbS5pc2ZpbGUocGF0aCkpOgorICAg ICAgICAgICAgcmV0dXJuICcnCisKKyAgICAgICAgb3B0aW9uc19wcmVmaXggPSAnPCEtLSB3ZWJr aXQtdGVzdC1ydW5uZXInCisgICAgICAgIGNvbnRlbnRzID0gc2VsZi5maWxlc3lzdGVtLnJlYWRf dGV4dF9maWxlKHBhdGgpLnNwbGl0KCdcbicpCisgICAgICAgIGlmIG5vdCBsZW4oY29udGVudHMp OgorICAgICAgICAgICAgcmV0dXJuICcnCisgICAgICAgIGZpcnN0X2xpbmUgPSBjb250ZW50c1sw XQorCisgICAgICAgIHJldHVybiBmaXJzdF9saW5lW2ZpcnN0X2xpbmUuaW5kZXgob3B0aW9uc19w cmVmaXgpOl0gaWYgb3B0aW9uc19wcmVmaXggaW4gZmlyc3RfbGluZSBlbHNlICcnCisKKyAgICBk ZWYgX2FkZF93ZWJraXRfdGVzdF9ydW5uZXJfb3B0aW9uc190b19jb250ZW50KHNlbGYsIGNvbnRl bnQsIHdlYmtpdF90ZXN0X3J1bm5lcl9vcHRpb25zKToKKyAgICAgICAgbGluZXMgPSBjb250ZW50 LnNwbGl0KCdcbicpCisgICAgICAgIGlmIG5vdCBsZW4obGluZXMpOgorICAgICAgICAgICAgcmV0 dXJuICcnCisgICAgICAgIGxpbmVzWzBdID0gbGluZXNbMF0gKyB3ZWJraXRfdGVzdF9ydW5uZXJf b3B0aW9ucworICAgICAgICByZXR1cm4gJ1xuJy5qb2luKGxpbmVzKQorCisgICAgZGVmIF9jb3B5 X2h0bWxfZmlsZShzZWxmLCBzb3VyY2VfZmlsZXBhdGgsIG5ld19maWxlcGF0aCk6CisgICAgICAg IHdlYmtpdF90ZXN0X3J1bm5lcl9vcHRpb25zID0gc2VsZi5fd2Via2l0X3Rlc3RfcnVubmVyX29w dGlvbnMobmV3X2ZpbGVwYXRoKQorICAgICAgICBpZiBub3Qgd2Via2l0X3Rlc3RfcnVubmVyX29w dGlvbnM6CisgICAgICAgICAgICBzZWxmLmZpbGVzeXN0ZW0uY29weWZpbGUoc291cmNlX2ZpbGVw YXRoLCBuZXdfZmlsZXBhdGgpCisgICAgICAgICAgICByZXR1cm4KKworICAgICAgICBzb3VyY2Vf Y29udGVudCA9IHNlbGYuZmlsZXN5c3RlbS5yZWFkX3RleHRfZmlsZShzb3VyY2VfZmlsZXBhdGgp CisgICAgICAgIHNlbGYuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUobmV3X2ZpbGVwYXRoLCBz ZWxmLl9hZGRfd2Via2l0X3Rlc3RfcnVubmVyX29wdGlvbnNfdG9fY29udGVudChzb3VyY2VfY29u dGVudCwgd2Via2l0X3Rlc3RfcnVubmVyX29wdGlvbnMpKQorCisgICAgZGVmIF93cml0ZV9odG1s X3RlbXBsYXRlKHNlbGYsIG5ld19maWxlcGF0aCk6CisgICAgICAgIHdlYmtpdF90ZXN0X3J1bm5l cl9vcHRpb25zID0gc2VsZi5fd2Via2l0X3Rlc3RfcnVubmVyX29wdGlvbnMobmV3X2ZpbGVwYXRo KQogICAgICAgICBjb250ZW50ID0gJzwhLS0gVGhpcyBmaWxlIGlzIHJlcXVpcmVkIGZvciBXZWJL aXQgdGVzdCBpbmZyYXN0cnVjdHVyZSB0byBydW4gdGhlIHRlbXBsYXRlZCB0ZXN0IC0tPicKKyAg ICAgICAgc2VsZi5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShuZXdfZmlsZXBhdGgsIGNvbnRl bnQgKyB3ZWJraXRfdGVzdF9ydW5uZXJfb3B0aW9ucykKKworICAgIGRlZiB3cml0ZV9odG1sX2Zp bGVzX2Zvcl90ZW1wbGF0ZWRfanNfdGVzdHMoc2VsZiwgb3JpZ19maWxlcGF0aCwgbmV3X2ZpbGVw YXRoKToKICAgICAgICAgaWYgKG9yaWdfZmlsZXBhdGguZW5kc3dpdGgoJy53aW5kb3cuanMnKSk6 Ci0gICAgICAgICAgICBzZWxmLmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKG5ld19maWxlcGF0 aC5yZXBsYWNlKCcud2luZG93LmpzJywgJy53aW5kb3cuaHRtbCcpLCBjb250ZW50KQorICAgICAg ICAgICAgc2VsZi5fd3JpdGVfaHRtbF90ZW1wbGF0ZShuZXdfZmlsZXBhdGgucmVwbGFjZSgnLndp bmRvdy5qcycsICcud2luZG93Lmh0bWwnKSkKICAgICAgICAgICAgIHJldHVybgogICAgICAgICBp ZiAob3JpZ19maWxlcGF0aC5lbmRzd2l0aCgnLndvcmtlci5qcycpKToKLSAgICAgICAgICAgIHNl bGYuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUobmV3X2ZpbGVwYXRoLnJlcGxhY2UoJy53b3Jr ZXIuanMnLCAnLndvcmtlci5odG1sJyksIGNvbnRlbnQpCisgICAgICAgICAgICBzZWxmLl93cml0 ZV9odG1sX3RlbXBsYXRlKG5ld19maWxlcGF0aC5yZXBsYWNlKCcud29ya2VyLmpzJywgJy53b3Jr ZXIuaHRtbCcpKQogICAgICAgICAgICAgcmV0dXJuCiAgICAgICAgIGlmIChvcmlnX2ZpbGVwYXRo LmVuZHN3aXRoKCcuYW55LmpzJykpOgotICAgICAgICAgICAgc2VsZi5maWxlc3lzdGVtLndyaXRl X3RleHRfZmlsZShuZXdfZmlsZXBhdGgucmVwbGFjZSgnLmFueS5qcycsICcuYW55Lmh0bWwnKSwg Y29udGVudCkKLSAgICAgICAgICAgIHNlbGYuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUobmV3 X2ZpbGVwYXRoLnJlcGxhY2UoJy5hbnkuanMnLCAnLmFueS53b3JrZXIuaHRtbCcpLCBjb250ZW50 KQorICAgICAgICAgICAgc2VsZi5fd3JpdGVfaHRtbF90ZW1wbGF0ZShuZXdfZmlsZXBhdGgucmVw bGFjZSgnLmFueS5qcycsICcuYW55Lmh0bWwnKSkKKyAgICAgICAgICAgIHNlbGYuX3dyaXRlX2h0 bWxfdGVtcGxhdGUobmV3X2ZpbGVwYXRoLnJlcGxhY2UoJy5hbnkuanMnLCAnLmFueS53b3JrZXIu aHRtbCcpKQogICAgICAgICAgICAgcmV0dXJuCiAKICAgICBkZWYgaW1wb3J0X3Rlc3RzKHNlbGYp OgpAQCAtNDQ5LDcgKzQ4MSw3IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAgICAg ICAgICAgICAgIG1pbWV0eXBlID0gbWltZXR5cGVzLmd1ZXNzX3R5cGUob3JpZ19maWxlcGF0aCkK ICAgICAgICAgICAgICAgICBpZiBzaG91bGRfcmV3cml0ZV9maWxlcyBhbmQgKCdodG1sJyBpbiBz dHIobWltZXR5cGVbMF0pIG9yICd4bWwnIGluIHN0cihtaW1ldHlwZVswXSkgIG9yICdjc3MnIGlu IHN0cihtaW1ldHlwZVswXSkpOgogICAgICAgICAgICAgICAgICAgICB0cnk6Ci0gICAgICAgICAg ICAgICAgICAgICAgICBjb252ZXJ0ZWRfZmlsZSA9IGNvbnZlcnRfZm9yX3dlYmtpdChuZXdfcGF0 aCwgZmlsZW5hbWU9b3JpZ19maWxlcGF0aCwgcmVmZXJlbmNlX3N1cHBvcnRfaW5mbz1yZWZlcmVu Y2Vfc3VwcG9ydF9pbmZvLCBob3N0PXNlbGYuaG9zdCwgY29udmVydF90ZXN0X2hhcm5lc3NfbGlu a3M9c2VsZi5zaG91bGRfY29udmVydF90ZXN0X2hhcm5lc3NfbGlua3Moc3VicGF0aCkpCisgICAg ICAgICAgICAgICAgICAgICAgICBjb252ZXJ0ZWRfZmlsZSA9IGNvbnZlcnRfZm9yX3dlYmtpdChu ZXdfcGF0aCwgZmlsZW5hbWU9b3JpZ19maWxlcGF0aCwgcmVmZXJlbmNlX3N1cHBvcnRfaW5mbz1y ZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0PXNlbGYuaG9zdCwgY29udmVydF90ZXN0X2hhcm5l c3NfbGlua3M9c2VsZi5zaG91bGRfY29udmVydF90ZXN0X2hhcm5lc3NfbGlua3Moc3VicGF0aCks IHdlYmtpdF90ZXN0X3J1bm5lcl9vcHRpb25zPXNlbGYuX3dlYmtpdF90ZXN0X3J1bm5lcl9vcHRp b25zKG5ld19maWxlcGF0aCkpCiAgICAgICAgICAgICAgICAgICAgIGV4Y2VwdDoKICAgICAgICAg ICAgICAgICAgICAgICAgIF9sb2cud2FybignRmFpbGVkIGNvbnZlcnRpbmcgJXMnLCBvcmlnX2Zp bGVwYXRoKQogICAgICAgICAgICAgICAgICAgICAgICAgZmFpbGVkX2NvbnZlcnNpb25fZmlsZXMu YXBwZW5kKG9yaWdfZmlsZXBhdGgpCkBAIC00NzQsNiArNTA2LDggQEAgY2xhc3MgVGVzdEltcG9y dGVyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgZWxpZiBvcmlnX2ZpbGVwYXRoLmVuZHN3aXRo KCdfX2luaXRfXy5weScpIGFuZCBub3Qgc2VsZi5maWxlc3lzdGVtLmdldHNpemUob3JpZ19maWxl cGF0aCk6CiAgICAgICAgICAgICAgICAgICAgICMgU29tZSBib3RzIGRpc2xpa2UgZW1wdHkgX19p bml0X18ucHkuCiAgICAgICAgICAgICAgICAgICAgIHNlbGYud3JpdGVfaW5pdF9weShuZXdfZmls ZXBhdGgpCisgICAgICAgICAgICAgICAgZWxpZiAnaHRtbCcgaW4gc3RyKG1pbWV0eXBlWzBdKToK KyAgICAgICAgICAgICAgICAgICAgc2VsZi5fY29weV9odG1sX2ZpbGUob3JpZ19maWxlcGF0aCwg bmV3X2ZpbGVwYXRoKQogICAgICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgICAg IHNlbGYuZmlsZXN5c3RlbS5jb3B5ZmlsZShvcmlnX2ZpbGVwYXRoLCBuZXdfZmlsZXBhdGgpCiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5p dHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyX3VuaXR0 ZXN0LnB5CmluZGV4IDQ3YjQ2MjA4ZTM4ZDhhNDEyNWExODczYzdjMTJlMGZkMjA0MDgzZjguLjdi NjQyOTg4OGUxMDNlYWM2NzYwZTczM2JjYjM4MDIzODlhYTMwNTkgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3QucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlcl91bml0dGVzdC5weQpAQCAtMzA0 LDMgKzMwNCwyOCBAQCBjbGFzcyBUZXN0SW1wb3J0ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICAgICAgZnMgPSBzZWxmLmltcG9ydF9kb3dubG9hZGVkX3Rlc3RzKFsnLS1uby1mZXRjaCcs ICctLWltcG9ydC1hbGwnLCAnLWQnLCAndzNjJ10sIEZBS0VfRklMRVMpCiAgICAgICAgIHNlbGYu YXNzZXJ0RmFsc2UoZnMuZXhpc3RzKCcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL3QvbmV3LW1hbnVhbC5odG1sJykpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKHRlc3RzX29wdGlvbnMsIGZzLnJlYWRfdGV4dF9maWxlKCcvbW9jay1jaGVja291dC9M YXlvdXRUZXN0cy90ZXN0cy1vcHRpb25zLmpzb24nKSkKKworICAgIGRlZiB0ZXN0X3dlYmtpdF90 ZXN0X3J1bm5lcl9vcHRpb25zKHNlbGYpOgorICAgICAgICBGQUtFX0ZJTEVTID0geworICAgICAg ICAgICAgJy9tb2NrLWNoZWNrb3V0L1dlYktpdEJ1aWxkL3czYy10ZXN0cy9jc3N3Zy10ZXN0cy90 L3Rlc3QuaHRtbCc6ICc8IWRvY3R5cGUgaHRtbD48c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0 aGFybmVzcy5qcyI+PC9zY3JpcHQ+PHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3Ny ZXBvcnQuanMiPjwvc2NyaXB0PicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvV2ViS2l0 QnVpbGQvdzNjLXRlc3RzL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvdGVzdC5odG1sJzogJzwhZG9j dHlwZSBodG1sPlxuPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2Ny aXB0PjxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3Njcmlw dD4nLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL3Rlc3QuaHRtbCc6ICc8IS0tIGRvY3R5cGUgaHRtbCAtLT48IS0tIHdl YmtpdC10ZXN0LXJ1bm5lciBbIGR1bW15IF0gLS0+JywKKyAgICAgICAgICAgICcvbW9jay1jaGVj a291dC9XZWJLaXRCdWlsZC93M2MtdGVzdHMvd2ViLXBsYXRmb3JtLXRlc3RzL3QvdGVzdC5odG1s JzogJzwhZG9jdHlwZSBodG1sPjxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpz Ij48L3NjcmlwdD48c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+ PC9zY3JpcHQ+JywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL3QvdGVzdC5odG1sJzogJzwhLS0gZG9jdHlwZSBodG1sIC0tPjwh LS0gd2Via2l0LXRlc3QtcnVubmVyIFsgZHVtbXkgXSAtLT4nLAorICAgICAgICAgICAgJy9tb2Nr LWNoZWNrb3V0L1dlYktpdEJ1aWxkL3czYy10ZXN0cy93ZWItcGxhdGZvcm0tdGVzdHMvdC90ZXN0 LmFueS5qcyc6ICd0ZXN0KCgpID0+IHt9LCAiZW1wdHkiKScsCisgICAgICAgICAgICAnL21vY2st Y2hlY2tvdXQvTGF5b3V0VGVzdHMvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy90L3Rlc3QuYW55Lmh0 bWwnOiAnPCEtLSBUaGlzIGZpbGUgaXMgcmVxdWlyZWQgZm9yIFdlYktpdCB0ZXN0IGluZnJhc3Ry dWN0dXJlIHRvIHJ1biB0aGUgdGVtcGxhdGVkIHRlc3QgLS0+PCEtLSB3ZWJraXQtdGVzdC1ydW5u ZXIgWyBkdW1teSBdIC0tPicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvU291cmNlL1dl YkNvcmUvY3NzL0NTU1Byb3BlcnRpZXMuanNvbic6ICcnLAorICAgICAgICAgICAgJy9tb2NrLWNo ZWNrb3V0L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluJzogJycsCisgICAg ICAgIH0KKyAgICAgICAgRkFLRV9GSUxFUy51cGRhdGUoRkFLRV9SRVBPU0lUT1JZKQorCisgICAg ICAgIGZzID0gc2VsZi5pbXBvcnRfZG93bmxvYWRlZF90ZXN0cyhbJy0tbm8tZmV0Y2gnLCAnLS1p bXBvcnQtYWxsJywgJy1kJywgJ3czYyddLCBGQUtFX0ZJTEVTKQorCisgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZShmcy5leGlzdHMoJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL3Rlc3QuaHRtbCcpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoZnMu ZXhpc3RzKCcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L3QvdGVzdC5odG1sJykpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShmcy5leGlzdHMoJy9tb2Nr LWNoZWNrb3V0L0xheW91dFRlc3RzL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvdC90ZXN0LmFueS5o dG1sJykpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShmcy5leGlzdHMoJy9tb2NrLWNoZWNrb3V0 L0xheW91dFRlc3RzL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvdC90ZXN0LmFueS53b3JrZXIuaHRt bCcpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoJzwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsg ZHVtbXkgXSAtLT4nIGluIGZzLnJlYWRfdGV4dF9maWxlKCcvbW9jay1jaGVja291dC9MYXlvdXRU ZXN0cy93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy90ZXN0Lmh0bWwnKS5zcGxpdCgnXG4nKVsw XSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCc8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIGR1 bW15IF0gLS0+JyBpbiBmcy5yZWFkX3RleHRfZmlsZSgnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVz dHMvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy90L3Rlc3QuaHRtbCcpLnNwbGl0KCdcbicpWzBdKQor ICAgICAgICBzZWxmLmFzc2VydFRydWUoJzwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgZHVtbXkg XSAtLT4nIGluIGZzLnJlYWRfdGV4dF9maWxlKCcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3QvdGVzdC5hbnkuaHRtbCcpLnNwbGl0KCdcbicpWzBdKQor ICAgICAgICBzZWxmLmFzc2VydEZhbHNlKCc8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIGR1bW15 IF0gLS0+JyBpbiBmcy5yZWFkX3RleHRfZmlsZSgnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy90L3Rlc3QuYW55Lndvcmtlci5odG1sJykuc3BsaXQoJ1xu JylbMF0pCg==