185876 2018-05-22 11:24:19 -0700 Do not convert testharness paths in import-w3c-tests 2023-07-07 07:45:17 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cnardi gsnedders achristensen cdumez ews-watchlist glenn lforschler webkit-bug-importer youennf oldest_to_newest 1426210 0 cnardi 2018-05-22 11:24:19 -0700 Do not convert testharness paths in import-w3c-tests 1426212 1 340996 cnardi 2018-05-22 11:27:03 -0700 Created attachment 340996 Patch 1426370 2 youennf 2018-05-22 16:20:20 -0700 Note that some WebKittens would actually like to convert all testharness paths so that some of these tests could also be run file based. 1426390 3 cnardi 2018-05-22 16:41:36 -0700 (In reply to youenn fablet from comment #2) > Note that some WebKittens would actually like to convert all testharness > paths so that some of these tests could also be run file based. Right, I forgot about all of that. Bringing us closer to upstream rather than further seems preferable, as it would make it easier to share modifications back and forth. But it's probably not you I need to convince of that. :) 1810747 4 340996 achristensen 2021-11-01 12:16:18 -0700 Comment on attachment 340996 Patch This has been requesting review for more than one year. If this is still needed, please rebase and re-request review. 1965010 5 gsnedders 2023-07-04 10:32:05 -0700 (In reply to youenn fablet from comment #2) > Note that some WebKittens would actually like to convert all testharness > paths so that some of these tests could also be run file based. We've had all the code to do this since 2014 (bug 134763), and yet we've never turned it on for WPT (and it was explicitly disabled from day one for WPT in bug 134764). We _did_ have this turned on for the old CSS WG test suite, prior to it getting merged into WPT; this was removed six years ago in bug 170647. As such, unless people are manually invoking the importer with this (and presumably any such import would simply get trampled at the next re-import), this code has been entirely dead since 2017 and we should just get rid of it. There's a real cost to rewriting tests (especially in terms of enabling export) and it seems unlikely we're ever going revert course here and start rewriting WPT. 1965019 6 gsnedders 2023-07-04 11:19:54 -0700 Pull request: https://github.com/WebKit/WebKit/pull/15547 1965559 7 ews-feeder 2023-07-07 07:44:44 -0700 Committed 265842@main (1866a4e1cf48): <https://commits.webkit.org/265842@main> Reviewed commits have been landed. Closing PR #15547 and removing active labels. 1965560 8 webkit-bug-importer 2023-07-07 07:45:17 -0700 <rdar://problem/111907873> 340996 2018-05-22 11:27:03 -0700 2021-11-01 12:16:18 -0700 Patch bug-185876-20180522142703.patch text/plain 13034 cnardi U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMDcwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmEzNTEwYWRmZWM4ZDU2MmJjNjY1OTA4NjBmMzM5MmJm Y2ZhYWYwNi4uNmU4ZWRlNGQyNWQ4M2IzOTc1YWYwNjU0ZGRhYmE4ZjBiNjI4NzVhZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDE4LTA1LTIyICBDaHJpcyBOYXJkaSAgPGNuYXJkaUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgRG8gbm90IGNvbnZlcnQgdGVzdGhhcm5lc3MgcGF0aHMgaW4gaW1wb3J0LXczYy10ZXN0 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg1ODc2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2luY2Ug dGhlIGNzc3dnLXRlc3RzIHJlcG8gd2FzIG1lcmdlZCBpbnRvIFdQVCwgdGhlcmUgaXMgb25seSBv bmUgdGVzdCByZXBvc2l0b3J5IG5vdyBpbgorICAgICAgICBpbXBvcnRlZC93M2MvcmVzb3VyY2Vz L1Rlc3RSZXBvc2l0b3JpZXMsIHdoaWNoIGRvZXMgbm90IHNwZWNpZnkgdGhlIG9wdGlvbiB0byBj b252ZXJ0CisgICAgICAgIHRlc3RoYXJuZXNzIHBhdGhzIGZyb20gcmVsYXRpdmUgcGF0aHMgdG8g ZXhwbGljaXQgcGF0aHMuIEFkZGl0aW9uYWxseSwgd3B0c2VydmUgaGFzIGJlZW4KKyAgICAgICAg dXNlZCBmb3Igc29tZSB0aW1lLCBzbyBydW4td2Via2l0LXRlc3RzIHNob3VsZCBoYXZlIG5vIHBy b2JsZW0gd2l0aCByZWxhdGl2ZSBwYXRocyB0bworICAgICAgICB0aGUgdGVzdGhhcm5lc3MgcGF0 aHMuIFRodXMsIHRoZXJlIGlzIG5vIHJlYXNvbiB0byBjb250aW51ZSBjb252ZXJ0aW5nIHRlc3Ro YXJuZXNzIHBhdGhzLAorICAgICAgICBzbyB0aGlzIHBhdGNoIHJlbW92ZXMgYWxsIGNvZGUgcmVs YXRlZCB0byB0aGF0IGNvbnZlcnNpb24uCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3cz Yy90ZXN0X2NvbnZlcnRlci5weToKKyAgICAgICAgKGNvbnZlcnRfZm9yX3dlYmtpdCk6CisgICAg ICAgIChfVzNDVGVzdENvbnZlcnRlci5fX2luaXRfXyk6CisgICAgICAgIChfVzNDVGVzdENvbnZl cnRlci5jb252ZXJ0X2F0dHJpYnV0ZXNfaWZfbmVlZGVkKToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlcl91bml0dGVzdC5weToKKyAgICAgICAgKHZlcmlmeV90 ZXN0X2hhcm5lc3NfcGF0aHMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3Rf aW1wb3J0ZXIucHk6CisgICAgICAgIChUZXN0SW1wb3J0ZXIuZmluZF9pbXBvcnRhYmxlX3Rlc3Rz KToKKyAgICAgICAgKFRlc3RJbXBvcnRlci5pbXBvcnRfdGVzdHMpOgorCiAyMDE4LTA1LTIyICBS eWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIyMzIwNTIuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3czYy90ZXN0X2NvbnZlcnRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3Rf Y29udmVydGVyLnB5CmluZGV4IDZlMjk5NmU5MDEzNjU1YzA4NjE1NTA1ZDE2OWIwNmIzMTI2YjY1 ZWQuLjFmNjZlNjk4MmRjN2Q0MDJjMDMyNTgwZDBkYTMxODhmMTM1MjFhMzUgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5CkBAIC0zOCwxMiArMzgsMTIg QEAgZnJvbSBIVE1MUGFyc2VyIGltcG9ydCBIVE1MUGFyc2VyCiBfbG9nID0gbG9nZ2luZy5nZXRM b2dnZXIoX19uYW1lX18pCiAKIAotZGVmIGNvbnZlcnRfZm9yX3dlYmtpdChuZXdfcGF0aCwgZmls ZW5hbWUsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgpLCBjb252ZXJ0X3Rlc3Rf aGFybmVzc19saW5rcz1UcnVlKToKK2RlZiBjb252ZXJ0X2Zvcl93ZWJraXQobmV3X3BhdGgsIGZp bGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0PUhvc3QoKSk6CiAgICAgIiIiIENv bnZlcnRzIGEgZmlsZSdzIHxjb250ZW50c3wgc28gaXQgd2lsbCBmdW5jdGlvbiBjb3JyZWN0bHkg aW4gaXRzIHxuZXdfcGF0aHwgaW4gV2Via2l0LgogCiAgICAgUmV0dXJucyB0aGUgbGlzdCBvZiBt b2RpZmllZCBwcm9wZXJ0aWVzIGFuZCB0aGUgbW9kaWZpZWQgdGV4dCBpZiB0aGUgZmlsZSB3YXMg bW9kaWZlZCwgTm9uZSBvdGhlcndpc2UuIiIiCiAgICAgY29udGVudHMgPSBob3N0LmZpbGVzeXN0 ZW0ucmVhZF9iaW5hcnlfZmlsZShmaWxlbmFtZSkKLSAgICBjb252ZXJ0ZXIgPSBfVzNDVGVzdENv bnZlcnRlcihuZXdfcGF0aCwgZmlsZW5hbWUsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Qs IGNvbnZlcnRfdGVzdF9oYXJuZXNzX2xpbmtzKQorICAgIGNvbnZlcnRlciA9IF9XM0NUZXN0Q29u dmVydGVyKG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5mbywgaG9zdCkK ICAgICBpZiBmaWxlbmFtZS5lbmRzd2l0aCgnLmNzcycpOgogICAgICAgICByZXR1cm4gY29udmVy dGVyLmFkZF93ZWJraXRfcHJlZml4X3RvX3VucHJlZml4ZWRfcHJvcGVydGllc19hbmRfdmFsdWVz KGNvbnRlbnRzKQogICAgIGVsc2U6CkBAIC01Myw3ICs1Myw3IEBAIGRlZiBjb252ZXJ0X2Zvcl93 ZWJraXQobmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0PUhv c3QoKSwKIAogCiBjbGFzcyBfVzNDVGVzdENvbnZlcnRlcihIVE1MUGFyc2VyKToKLSAgICBkZWYg X19pbml0X18oc2VsZiwgbmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZv LCBob3N0PUhvc3QoKSwgY29udmVydF90ZXN0X2hhcm5lc3NfbGlua3M9VHJ1ZSk6CisgICAgZGVm IF9faW5pdF9fKHNlbGYsIG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5m bywgaG9zdD1Ib3N0KCkpOgogICAgICAgICBIVE1MUGFyc2VyLl9faW5pdF9fKHNlbGYpCiAKICAg ICAgICAgc2VsZi5faG9zdCA9IGhvc3QKQEAgLTY4LDE3ICs2OCwxMCBAQCBjbGFzcyBfVzNDVGVz dENvbnZlcnRlcihIVE1MUGFyc2VyKToKICAgICAgICAgc2VsZi5maWxlbmFtZSA9IGZpbGVuYW1l CiAgICAgICAgIHNlbGYucmVmZXJlbmNlX3N1cHBvcnRfaW5mbyA9IHJlZmVyZW5jZV9zdXBwb3J0 X2luZm8KIAotICAgICAgICByZXNvdXJjZXNfcGF0aCA9IHNlbGYucGF0aF9mcm9tX3dlYmtpdF9y b290KCdMYXlvdXRUZXN0cycsICdyZXNvdXJjZXMnKQotICAgICAgICByZXNvdXJjZXNfcmVscGF0 aCA9IHNlbGYuX2ZpbGVzeXN0ZW0ucmVscGF0aChyZXNvdXJjZXNfcGF0aCwgbmV3X3BhdGgpCi0g ICAgICAgIHNlbGYubmV3X3Rlc3RfaGFybmVzc19wYXRoID0gcmVzb3VyY2VzX3JlbHBhdGgKLSAg ICAgICAgc2VsZi5jb252ZXJ0X3Rlc3RfaGFybmVzc19saW5rcyA9IGNvbnZlcnRfdGVzdF9oYXJu ZXNzX2xpbmtzCi0KICAgICAgICAgIyBUaGVzZSBzZXR0aW5ncyBtaWdodCB2YXJ5IGJldHdlZW4g V2ViS2l0IGFuZCBCbGluawogICAgICAgICBjc3NfcHJvcGVydHlfZmlsZSA9IHNlbGYucGF0aF9m cm9tX3dlYmtpdF9yb290KCdTb3VyY2UnLCAnV2ViQ29yZScsICdjc3MnLCAnQ1NTUHJvcGVydGll cy5qc29uJykKICAgICAgICAgY3NzX3Byb3BlcnR5X3ZhbHVlX2ZpbGUgPSBzZWxmLnBhdGhfZnJv bV93ZWJraXRfcm9vdCgnU291cmNlJywgJ1dlYkNvcmUnLCAnY3NzJywgJ0NTU1ZhbHVlS2V5d29y ZHMuaW4nKQogCi0gICAgICAgIHNlbGYudGVzdF9oYXJuZXNzX3JlID0gcmUuY29tcGlsZSgnL3Jl c291cmNlcy90ZXN0aGFybmVzcycpCi0KICAgICAgICAgc2VsZi5wcmVmaXhlZF9wcm9wZXJ0aWVz ID0gc2VsZi5yZWFkX3dlYmtpdF9wcmVmaXhlZF9jc3NfcHJvcGVydHlfbGlzdChjc3NfcHJvcGVy dHlfZmlsZSkKICAgICAgICAgcHJvcF9yZWdleCA9ICcoW1xze118XikoJyArICJ8Ii5qb2luKHBy b3AucmVwbGFjZSgnLXdlYmtpdC0nLCAnJykgZm9yIHByb3AgaW4gc2VsZi5wcmVmaXhlZF9wcm9w ZXJ0aWVzKSArICcpKFxzKzp8OiknCiAgICAgICAgIHNlbGYucHJvcF9yZSA9IHJlLmNvbXBpbGUo cHJvcF9yZWdleCkKQEAgLTE5MiwxNCArMTg1LDYgQEAgY2xhc3MgX1czQ1Rlc3RDb252ZXJ0ZXIo SFRNTFBhcnNlcik6CiAKICAgICBkZWYgY29udmVydF9hdHRyaWJ1dGVzX2lmX25lZWRlZChzZWxm LCB0YWcsIGF0dHJzKToKICAgICAgICAgY29udmVydGVkID0gc2VsZi5nZXRfc3RhcnR0YWdfdGV4 dCgpCi0gICAgICAgIGlmIHNlbGYuY29udmVydF90ZXN0X2hhcm5lc3NfbGlua3MgYW5kIHRhZyBp biAoJ3NjcmlwdCcsICdsaW5rJyk6Ci0gICAgICAgICAgICBhdHRyX25hbWUgPSAnc3JjJwotICAg ICAgICAgICAgaWYgdGFnICE9ICdzY3JpcHQnOgotICAgICAgICAgICAgICAgIGF0dHJfbmFtZSA9 ICdocmVmJwotICAgICAgICAgICAgZm9yIGF0dHIgaW4gYXR0cnM6Ci0gICAgICAgICAgICAgICAg aWYgYXR0clswXSA9PSBhdHRyX25hbWU6Ci0gICAgICAgICAgICAgICAgICAgIG5ld19wYXRoID0g cmUuc3ViKHNlbGYudGVzdF9oYXJuZXNzX3JlLCBzZWxmLm5ld190ZXN0X2hhcm5lc3NfcGF0aCAr ICcvdGVzdGhhcm5lc3MnLCBhdHRyWzFdKQotICAgICAgICAgICAgICAgICAgICBjb252ZXJ0ZWQg PSByZS5zdWIocmUuZXNjYXBlKGF0dHJbMV0pLCBuZXdfcGF0aCwgY29udmVydGVkKQogCiAgICAg ICAgIGZvciBhdHRyIGluIGF0dHJzOgogICAgICAgICAgICAgaWYgYXR0clswXSA9PSAnc3R5bGUn OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXJf dW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlcl91 bml0dGVzdC5weQppbmRleCAxMTJlNzZhNGJjNjdkMGVkZjNmNGY0MWI4MDdlOTA0N2UwNjUxN2Y3 Li4xMmJhMzNiN2I3OGI0MGY1MWYyYmZmYTZjYTkwZDkxMWNmMmRhMzczIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlcl91bml0dGVzdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlcl91bml0dGVzdC5weQpA QCAtMTA3LDcgKzEwNyw3IEBAIENPTlRFTlQgT0YgVEVTVAogICAgICAgICBjb252ZXJ0ZWQgPSBj b252ZXJ0ZXIub3V0cHV0KCkKIAogICAgICAgICBzZWxmLnZlcmlmeV9jb252ZXJzaW9uX2hhcHBl bmVkKGNvbnZlcnRlZCkKLSAgICAgICAgc2VsZi52ZXJpZnlfdGVzdF9oYXJuZXNzX3BhdGhzKGNv bnZlcnRlciwgY29udmVydGVkWzJdLCBmYWtlX2Rpcl9wYXRoLCAxLCAxKQorICAgICAgICBzZWxm LnZlcmlmeV90ZXN0X2hhcm5lc3NfcGF0aHMoY29udmVydGVkWzJdLCAxLCAxKQogICAgICAgICBz ZWxmLnZlcmlmeV9wcmVmaXhlZF9wcm9wZXJ0aWVzKGNvbnZlcnRlZCwgW10pCiAgICAgICAgIHNl bGYudmVyaWZ5X3ByZWZpeGVkX3Byb3BlcnR5X3ZhbHVlcyhjb252ZXJ0ZWQsIFtdKQogCkBAIC0x NDMsNyArMTQzLDcgQEAgQ09OVEVOVCBPRiBURVNUCiAgICAgICAgICAgICBvYy5yZXN0b3JlX291 dHB1dCgpCiAKICAgICAgICAgc2VsZi52ZXJpZnlfY29udmVyc2lvbl9oYXBwZW5lZChjb252ZXJ0 ZWQpCi0gICAgICAgIHNlbGYudmVyaWZ5X3Rlc3RfaGFybmVzc19wYXRocyhjb252ZXJ0ZXIsIGNv bnZlcnRlZFsyXSwgZmFrZV9kaXJfcGF0aCwgMSwgMSkKKyAgICAgICAgc2VsZi52ZXJpZnlfdGVz dF9oYXJuZXNzX3BhdGhzKGNvbnZlcnRlZFsyXSwgMSwgMSkKICAgICAgICAgc2VsZi52ZXJpZnlf cHJlZml4ZWRfcHJvcGVydGllcyhjb252ZXJ0ZWQsIHRlc3RfY29udGVudFswXSkKICAgICAgICAg c2VsZi52ZXJpZnlfcHJlZml4ZWRfcHJvcGVydHlfdmFsdWVzKGNvbnZlcnRlZCwgdGVzdF9jb250 ZW50WzFdKQogCkBAIC0xODEsNyArMTgxLDcgQEAgQ09OVEVOVCBPRiBURVNUCiAgICAgICAgICAg ICBvYy5yZXN0b3JlX291dHB1dCgpCiAKICAgICAgICAgc2VsZi52ZXJpZnlfY29udmVyc2lvbl9o YXBwZW5lZChjb252ZXJ0ZWQpCi0gICAgICAgIHNlbGYudmVyaWZ5X3Rlc3RfaGFybmVzc19wYXRo cyhjb252ZXJ0ZXIsIGNvbnZlcnRlZFsyXSwgZmFrZV9kaXJfcGF0aCwgMSwgMSkKKyAgICAgICAg c2VsZi52ZXJpZnlfdGVzdF9oYXJuZXNzX3BhdGhzKGNvbnZlcnRlZFsyXSwgMSwgMSkKICAgICAg ICAgc2VsZi52ZXJpZnlfcHJlZml4ZWRfcHJvcGVydGllcyhjb252ZXJ0ZWQsIHRlc3RfY29udGVu dFswXSkKICAgICAgICAgc2VsZi52ZXJpZnlfcHJlZml4ZWRfcHJvcGVydHlfdmFsdWVzKGNvbnZl cnRlZCwgdGVzdF9jb250ZW50WzFdKQogCkBAIC0yMDcsNyArMjA3LDcgQEAgQ09OVEVOVCBPRiBU RVNUCiAgICAgICAgICAgICBvYy5yZXN0b3JlX291dHB1dCgpCiAKICAgICAgICAgc2VsZi52ZXJp ZnlfY29udmVyc2lvbl9oYXBwZW5lZChjb252ZXJ0ZWQpCi0gICAgICAgIHNlbGYudmVyaWZ5X3Rl c3RfaGFybmVzc19wYXRocyhjb252ZXJ0ZXIsIGNvbnZlcnRlZFsyXSwgZmFrZV9kaXJfcGF0aCwg MiwgMSkKKyAgICAgICAgc2VsZi52ZXJpZnlfdGVzdF9oYXJuZXNzX3BhdGhzKGNvbnZlcnRlZFsy XSwgMiwgMSkKIAogICAgIGRlZiB0ZXN0X2NvbnZlcnRfcHJlZml4ZWRfcHJvcGVydGllcyhzZWxm KToKICAgICAgICAgIiIiIFRlc3RzIGNvbnZlcnRfcHJlZml4ZWRfcHJvcGVydGllcygpIGZpbGUg dGhhdCBoYXMgMjAgcHJvcGVydGllcyByZXF1aXJpbmcgdGhlIC13ZWJraXQtIHByZWZpeDoKQEAg LTMyNCwyMSArMzI0LDEzIEBAIENPTlRFTlQgT0YgVEVTVAogICAgIGRlZiB2ZXJpZnlfbm9fY29u dmVyc2lvbl9oYXBwZW5lZChzZWxmLCBjb252ZXJ0ZWQsIG9yaWdpbmFsKToKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChjb252ZXJ0ZWRbMl0sIG9yaWdpbmFsLCAndGVzdCBzaG91bGQgbm90IGhh dmUgYmVlbiBjb252ZXJ0ZWQnKQogCi0gICAgZGVmIHZlcmlmeV90ZXN0X2hhcm5lc3NfcGF0aHMo c2VsZiwgY29udmVydGVyLCBjb252ZXJ0ZWQsIHRlc3RfcGF0aCwgbnVtX3NyY19wYXRocywgbnVt X2hyZWZfcGF0aHMpOgorICAgIGRlZiB2ZXJpZnlfdGVzdF9oYXJuZXNzX3BhdGhzKHNlbGYsIGNv bnZlcnRlZCwgbnVtX3NyY19wYXRocywgbnVtX2hyZWZfcGF0aHMpOgogICAgICAgICBpZiBpc2lu c3RhbmNlKGNvbnZlcnRlZCwgYmFzZXN0cmluZyk6CiAgICAgICAgICAgICBjb252ZXJ0ZWQgPSBC ZWF1dGlmdWxTb3VwKGNvbnZlcnRlZCkKIAotICAgICAgICByZXNvdXJjZXNfZGlyID0gY29udmVy dGVyLnBhdGhfZnJvbV93ZWJraXRfcm9vdCgiTGF5b3V0VGVzdHMiLCAicmVzb3VyY2VzIikKLQot ICAgICAgICAjIFZlcmlmeSB0aGUgb3JpZ2luYWwgcGF0aHMgYXJlIGdvbmUsIGFuZCB0aGUgbmV3 IHBhdGhzIGFyZSBwcmVzZW50LgotICAgICAgICBvcmlnX3BhdGhfcGF0dGVybiA9IHJlLmNvbXBp bGUoJ1wiL3Jlc291cmNlcy90ZXN0aGFybmVzcycpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KGxlbihjb252ZXJ0ZWQuZmluZEFsbChzcmM9b3JpZ19wYXRoX3BhdHRlcm4pKSwgMCwgJ3Rlc3Ro YXJuZXNzIHNyYyBwYXRoIHdhcyBub3QgY29udmVydGVkJykKLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMobGVuKGNvbnZlcnRlZC5maW5kQWxsKGhyZWY9b3JpZ19wYXRoX3BhdHRlcm4pKSwgMCwg J3Rlc3RoYXJuZXNzIGhyZWYgcGF0aCB3YXMgbm90IGNvbnZlcnRlZCcpCi0KLSAgICAgICAgbmV3 X3JlbHBhdGggPSBvcy5wYXRoLnJlbHBhdGgocmVzb3VyY2VzX2RpciwgdGVzdF9wYXRoKQotICAg ICAgICByZWxwYXRoX3BhdHRlcm4gPSByZS5jb21waWxlKG5ld19yZWxwYXRoKQotICAgICAgICBz ZWxmLmFzc2VydEVxdWFscyhsZW4oY29udmVydGVkLmZpbmRBbGwoc3JjPXJlbHBhdGhfcGF0dGVy bikpLCBudW1fc3JjX3BhdGhzLCAndGVzdGhhcm5lc3Mgc3JjIHJlbGF0aXZlIHBhdGggbm90IGNv cnJlY3QnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhsZW4oY29udmVydGVkLmZpbmRBbGwo aHJlZj1yZWxwYXRoX3BhdHRlcm4pKSwgbnVtX2hyZWZfcGF0aHMsICd0ZXN0aGFybmVzcyBocmVm IHJlbGF0aXZlIHBhdGggbm90IGNvcnJlY3QnKQorICAgICAgICBvcmlnX3BhdGhfcGF0dGVybiA9 IHJlLmNvbXBpbGUoJ14vcmVzb3VyY2VzL3Rlc3RoYXJuZXNzJykKKyAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbHMobGVuKGNvbnZlcnRlZC5maW5kQWxsKHNyYz1vcmlnX3BhdGhfcGF0dGVybikpLCBu dW1fc3JjX3BhdGhzLCAndGVzdGhhcm5lc3Mgc3JjIHBhdGggc2hvdWxkIG5vdCBoYXZlIGJlZW4g Y29udmVydGVkJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMobGVuKGNvbnZlcnRlZC5maW5k QWxsKGhyZWY9b3JpZ19wYXRoX3BhdHRlcm4pKSwgbnVtX2hyZWZfcGF0aHMsICd0ZXN0aGFybmVz cyBocmVmIHBhdGggc2hvdWxkIG5vdCBoYXZlIGJlZW4gY29udmVydGVkJykKIAogICAgIGRlZiB2 ZXJpZnlfcHJlZml4ZWRfcHJvcGVydGllcyhzZWxmLCBjb252ZXJ0ZWQsIHRlc3RfcHJvcGVydGll cyk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKHNldChjb252ZXJ0ZWRbMF0pKSwgbGVu KHNldCh0ZXN0X3Byb3BlcnRpZXMpKSwgJ0luY29ycmVjdCBudW1iZXIgb2YgcHJvcGVydGllcyBj b252ZXJ0ZWQnKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9p bXBvcnRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkK aW5kZXggNDIxZTM2MzRmZmM4NDBmZWE2YWNhYmJjMTIyMWM4M2M4NTViZDhiNi4uOWU5NThhOGRi MmZiYmRkNWQyY2Y1ZWYwZTgwNjRjMmNjZWUxYTZmYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5CkBAIC01MCwxNCArNTAsMTEgQEAKICAgICAgICAgIDIu IExheW91dFRlc3RzL2ltcG9ydGVkL3czYy9yZXNvdXJjZXMvSW1wb3J0RXhwZWN0YXRpb25zIGxp c3QgdGhlIHRlc3Qgc3VpdGVzIG9yIHRlc3RzIHRvIE5PVCBpbXBvcnQuCiAKICAgICAtIEFsbCBm aWxlcyBhcmUgY29udmVydGVkIHRvIHdvcmsgaW4gV2ViS2l0OgotICAgICAgICAgMS4gUGF0aHMg dG8gdGVzdGhhcm5lc3MuanMgZmlsZXMgYXJlIG1vZGlmaWVkIHRvIHBvaW50IHRvIFdlYmtpdCdz IGNvcHkgb2YgdGhlbSBpbgotICAgICAgICAgICAgTGF5b3V0VGVzdHMvcmVzb3VyY2VzLCB1c2lu ZyB0aGUgY29ycmVjdCByZWxhdGl2ZSBwYXRoIGZyb20gdGhlIG5ldyBsb2NhdGlvbi4KLSAgICAg ICAgICAgIFRoaXMgaXMgYXBwbGllZCB0byBDU1MgdGVzdHMgYnV0IG5vdCB0byBXUFQgdGVzdHMu Ci0gICAgICAgICAyLiBBbGwgQ1NTIHByb3BlcnRpZXMgcmVxdWlyaW5nIHRoZSAtd2Via2l0LXZl bmRvciBwcmVmaXggYXJlIHByZWZpeGVkIC0gdGhpcyBjdXJyZW50CisgICAgICAgICAxLiBBbGwg Q1NTIHByb3BlcnRpZXMgcmVxdWlyaW5nIHRoZSAtd2Via2l0LXZlbmRvciBwcmVmaXggYXJlIHBy ZWZpeGVkIC0gdGhpcyBjdXJyZW50CiAgICAgICAgICAgICBsaXN0IG9mIHdoYXQgbmVlZHMgcHJl Zml4ZXMgaXMgcmVhZCBmcm9tIFNvdXJjZS9XZWJDb3JlL0NTUy9DU1NQcm9wZXJ0aWVzLmluCi0g ICAgICAgICAzLiBFYWNoIHJlZnRlc3QgaGFzIGl0cyBvd24gY29weSBvZiBpdHMgcmVmZXJlbmNl IGZpbGUgZm9sbG93aW5nIHRoZSBuYW1pbmcgY29udmVudGlvbnMKKyAgICAgICAgIDIuIEVhY2gg cmVmdGVzdCBoYXMgaXRzIG93biBjb3B5IG9mIGl0cyByZWZlcmVuY2UgZmlsZSBmb2xsb3dpbmcg dGhlIG5hbWluZyBjb252ZW50aW9ucwogICAgICAgICAgICAgbmV3LXJ1bi13ZWJraXQtdGVzdHMg ZXhwZWN0cwotICAgICAgICAgNC4gSWYgYSByZWZlcmVuY2UgZmlsZXMgbGl2ZXMgb3V0c2lkZSB0 aGUgZGlyZWN0b3J5IG9mIHRoZSB0ZXN0IHRoYXQgdXNlcyBpdCwgaXQgaXMgY2hlY2tlZAorICAg ICAgICAgMy4gSWYgYSByZWZlcmVuY2UgZmlsZXMgbGl2ZXMgb3V0c2lkZSB0aGUgZGlyZWN0b3J5 IG9mIHRoZSB0ZXN0IHRoYXQgdXNlcyBpdCwgaXQgaXMgY2hlY2tlZAogICAgICAgICAgICAgZm9y IHBhdGhzIHRvIHN1cHBvcnQgZmlsZXMgYXMgaXQgd2lsbCBiZSBpbXBvcnRlZCBpbnRvIGEgZGlm ZmVyZW50IHJlbGF0aXZlIHBvc2l0aW9uIHRvIHRoZQogICAgICAgICAgICAgdGVzdCBmaWxlIChp biB0aGUgc2FtZSBkaXJlY3RvcnkpCiAKQEAgLTEyMiw4ICsxMTksNiBAQCBUbyBpbXBvcnQgYSB3 ZWItcGxhdGZvcm0tdGVzdHMgc3VpdGUgZnJvbSBhIHNwZWNpZmljIGZvbGRlciwgdXNlICdpbXBv cnQtdzNjLXRlcwogCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLW4nLCAnLS1uby1vdmVyd3Jp dGUnLCBkZXN0PSdvdmVyd3JpdGUnLCBhY3Rpb249J3N0b3JlX2ZhbHNlJywgZGVmYXVsdD1UcnVl LAogICAgICAgICBoZWxwPSdGbGFnIHRvIHByZXZlbnQgZHVwbGljYXRlIHRlc3QgZmlsZXMgZnJv bSBvdmVyd3JpdGluZyBleGlzdGluZyB0ZXN0cy4gQnkgZGVmYXVsdCwgdGhleSB3aWxsIGJlIG92 ZXJ3cml0dGVuJykKLSAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctbCcsICctLW5vLWxpbmtzLWNv bnZlcnNpb24nLCBkZXN0PSdjb252ZXJ0X3Rlc3RfaGFybmVzc19saW5rcycsIGFjdGlvbj0nc3Rv cmVfZmFsc2UnLCBkZWZhdWx0PVRydWUsCi0gICAgICAgaGVscD0nRG8gbm90IGNoYW5nZSBsaW5r cyAodGVzdGhhcm5lc3MganMgb3IgY3NzIGUuZy4pLiBUaGlzIG9wdGlvbiBvbmx5IGFwcGxpZXMg d2hlbiBwcm92aWRpbmcgYSBzb3VyY2UgZGlyZWN0b3J5LCBpbiB3aGljaCBjYXNlIGJ5IGRlZmF1 bHQsIGxpbmtzIGFyZSBjb252ZXJ0ZWQgdG8gcG9pbnQgdG8gV2ViS2l0IHRlc3RoYXJuZXNzIGZp bGVzLiBXaGVuIHRlc3RzIGFyZSBkb3dubG9hZGVkIGZyb20gVzNDIHJlcG9zaXRvcnksIGxpbmtz IGFyZSBjb252ZXJ0ZWQgZm9yIENTUyB0ZXN0cyBhbmQgcmVtYWluIHVuY2hhbmdlZCBmb3IgV1BU IHRlc3RzJykKIAogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy10JywgJy0tdGlwLW9mLXRyZWUn LCBkZXN0PSd1c2VfdGlwX29mX3RyZWUnLCBhY3Rpb249J3N0b3JlX3RydWUnLCBkZWZhdWx0PUZh bHNlLAogICAgICAgICBoZWxwPSdJbXBvcnQgYWxsIHRlc3RzIHVzaW5nIHRoZSBsYXRlc3QgcmVw b3NpdG9yeSByZXZpc2lvbicpCkBAIC0zNTEsMTQgKzM0Niw2IEBAIGNsYXNzIFRlc3RJbXBvcnRl cihvYmplY3QpOgogICAgICAgICAgICAgICAgIHNlbGYuaW1wb3J0X2xpc3QuYXBwZW5kKHsnZGly bmFtZSc6IHJvb3QsICdjb3B5X2xpc3QnOiBjb3B5X2xpc3QsCiAgICAgICAgICAgICAgICAgICAg ICdyZWZ0ZXN0cyc6IHJlZnRlc3RzLCAnanN0ZXN0cyc6IGpzdGVzdHMsICd0b3RhbF90ZXN0cyc6 IHRvdGFsX3Rlc3RzfSkKIAotICAgIGRlZiBzaG91bGRfY29udmVydF90ZXN0X2hhcm5lc3NfbGlu a3Moc2VsZiwgdGVzdCk6Ci0gICAgICAgIGlmIHNlbGYuX2ltcG9ydGluZ19kb3dubG9hZGVkX3Rl c3RzOgotICAgICAgICAgICAgZm9yIHRlc3RfcmVwb3NpdG9yeSBpbiBzZWxmLnRlc3RfZG93bmxv YWRlcigpLnRlc3RfcmVwb3NpdG9yaWVzOgotICAgICAgICAgICAgICAgIGlmIHRlc3Quc3RhcnRz d2l0aCh0ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSk6Ci0gICAgICAgICAgICAgICAgICAgIHJldHVy biAnY29udmVydF90ZXN0X2hhcm5lc3NfbGlua3MnIGluIHRlc3RfcmVwb3NpdG9yeVsnaW1wb3J0 X29wdGlvbnMnXQotICAgICAgICAgICAgcmV0dXJuIFRydWUKLSAgICAgICAgcmV0dXJuIHNlbGYu b3B0aW9ucy5jb252ZXJ0X3Rlc3RfaGFybmVzc19saW5rcwotCiAgICAgZGVmIHdyaXRlX2h0bWxf ZmlsZXNfZm9yX3RlbXBsYXRlZF9qc190ZXN0cyhzZWxmLCBvcmlnX2ZpbGVwYXRoLCBuZXdfZmls ZXBhdGgpOgogICAgICAgICBjb250ZW50ID0gJzwhLS0gVGhpcyBmaWxlIGlzIHJlcXVpcmVkIGZv ciBXZWJLaXQgdGVzdCBpbmZyYXN0cnVjdHVyZSB0byBydW4gdGhlIHRlbXBsYXRlZCB0ZXN0IC0t PicKICAgICAgICAgaWYgKG9yaWdfZmlsZXBhdGguZW5kc3dpdGgoJy53b3JrZXIuanMnKSk6CkBA IC00NDUsNyArNDMyLDcgQEAgY2xhc3MgVGVzdEltcG9ydGVyKG9iamVjdCk6CiAgICAgICAgICAg ICAgICAgbWltZXR5cGUgPSBtaW1ldHlwZXMuZ3Vlc3NfdHlwZShvcmlnX2ZpbGVwYXRoKQogICAg ICAgICAgICAgICAgIGlmIHNob3VsZF9yZXdyaXRlX2ZpbGVzIGFuZCAoJ2h0bWwnIGluIHN0ciht aW1ldHlwZVswXSkgb3IgJ3htbCcgaW4gc3RyKG1pbWV0eXBlWzBdKSAgb3IgJ2NzcycgaW4gc3Ry KG1pbWV0eXBlWzBdKSk6CiAgICAgICAgICAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAg ICAgICAgICAgIGNvbnZlcnRlZF9maWxlID0gY29udmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBm aWxlbmFtZT1vcmlnX2ZpbGVwYXRoLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvPXJlZmVyZW5jZV9z dXBwb3J0X2luZm8sIGhvc3Q9c2VsZi5ob3N0LCBjb252ZXJ0X3Rlc3RfaGFybmVzc19saW5rcz1z ZWxmLnNob3VsZF9jb252ZXJ0X3Rlc3RfaGFybmVzc19saW5rcyhzdWJwYXRoKSkKKyAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnZlcnRlZF9maWxlID0gY29udmVydF9mb3Jfd2Via2l0KG5ld19w YXRoLCBmaWxlbmFtZT1vcmlnX2ZpbGVwYXRoLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvPXJlZmVy ZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Q9c2VsZi5ob3N0KQogICAgICAgICAgICAgICAgICAgICBl eGNlcHQ6CiAgICAgICAgICAgICAgICAgICAgICAgICBfbG9nLndhcm4oJ0ZhaWxlZCBjb252ZXJ0 aW5nICVzJywgb3JpZ19maWxlcGF0aCkKICAgICAgICAgICAgICAgICAgICAgICAgIGZhaWxlZF9j b252ZXJzaW9uX2ZpbGVzLmFwcGVuZChvcmlnX2ZpbGVwYXRoKQo=