64346 2011-07-12 00:50:35 -0700 NRWT should open test results page with Safari trunk, not the system provided one on Mac 2011-07-12 10:53:13 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 34984 1 zimmermann eric abarth dpranke eric webkit.review.bot oldest_to_newest 435508 0 zimmermann 2011-07-12 00:50:35 -0700 NRWT should open test results page with Safari trunk, not the system provided one on Mac. I was puzzled a few times, as I'm used to the fact that the results page is opened with the built WebCore/WebKit and Safari, not the system provided one. 435534 1 eric 2011-07-12 02:28:16 -0700 *** Bug 64347 has been marked as a duplicate of this bug. *** 435545 2 100458 eric 2011-07-12 02:58:33 -0700 Created attachment 100458 Patch 435747 3 100458 webkit.review.bot 2011-07-12 10:53:08 -0700 Comment on attachment 100458 Patch Clearing flags on attachment: 100458 Committed r90826: <http://trac.webkit.org/changeset/90826> 435748 4 webkit.review.bot 2011-07-12 10:53:13 -0700 All reviewed patches have been landed. Closing bug. 100458 2011-07-12 02:58:33 -0700 2011-07-12 10:53:08 -0700 Patch bug-64346-20110712025832.patch text/plain 22544 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4MTAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4ODBjNmFiNTg3OTUwOTY2ZjNmNTFjNDU4YzA3NDY1NTA0 ODY4MTA2Li42ZGJkMTcwNDgwZTRmNzZlYmE5NmZhYjBmMTU5MGRkNWEzYjY1ZWM1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNTAg QEAKIDIwMTEtMDctMTIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAg IE5SV1Qgc2hvdWxkIG9wZW4gdGVzdCByZXN1bHRzIHBhZ2Ugd2l0aCBTYWZhcmkgdHJ1bmssIG5v dCB0aGUgc3lzdGVtIHByb3ZpZGVkIG9uZSBvbiBNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MzQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gZml4IHRoaXMgSSBpbXBsZW1lbnRlZCBQb3J0LnNo b3dfcmVzdWx0c19odG1sX2ZpbGUgaW4gTWFjLCBHdGsgYW5kIFF0IHBvcnRzIHdpdGgKKyAgICAg ICAgaW1wbGVtZW50YXRpb25zIChtb3N0bHkpIG1hdGNoaW5nIHRob3NlIGZvdW5kIGluIG9sZC1y dW4td2Via2l0LXRlc3RzLgorICAgICAgICBUaGVyZSBhcmUgc3RpbGwgc29tZSBtaW5vciBkaWZm ZXJlbmNlcyBmb3IgUXQgd2hpY2ggUXQgaGFja2VycyBtYXkgd2lzaCB0byB0d2Vhay4KKworICAg ICAgICBJIGhhZCB0byBhZGQgYSBXZWJLaXRQb3J0Ll9wb3J0X2ZsYWdfZm9yX3NjcmlwdHMgbWV0 aG9kIChzaW1pbGFyIHRvIGZsYWcoKSBpbiBjb21tb24uY29uZmlnLnBvcnRzLnB5KQorICAgICAg ICBmb3IgdGhlIFF0L0d0ayBwb3J0cyB3aGljaCBhbHdheXMgcmVxdWlyZSBhIGZsYWcgcGFzc2Vk IHRvIHNjcmlwdHMuCisKKyAgICAgICAgV2hpbGUgdHJ5aW5nIHRvIHRlc3QgdGhpcywgSSBmb3Vu ZCB0aGF0IEZhY3RvcnlUZXN0LnRlc3RfY2hyb21pdW1fZ3B1X2xpbnV4CisgICAgICAgIHdhcyB1 c2luZyBhIHJlYWwgZmlsZXN5c3RlbSAoZHVlIHRvIGFzc2VydF9wbGF0Zm9ybSkgd2hpY2ggZHVl IHRvCisgICAgICAgIGdsb2JhbCB2YXJpYWJsZXMgaW4gY29uZmlnLnB5IHdhcyBjYXVzaW5nIHNl dC13ZWJraXQtY29uZmlndXJhdGlvbiB0byBoYXZlCisgICAgICAgIGFuIGFmZmVjdCBvbiB1bml0 IHRlc3QgcmVzdWx0cyEgIFNvIEkgZml4ZWQgdGhpcyBieSBtYWtpbmcgRmFjdG9yeVRlc3QuYXNz ZXJ0X3BvcnQKKyAgICAgICAgcGFzcyBhIG1vY2sgZmlsZSBzeXN0ZW0gd2hlbmV2ZXIgY2FsbGlu ZyBmYWN0b3J5LmdldC4KKworICAgICAgICBVbmZvcnR1bmF0ZWx5IFRlc3RQb3J0IHdhcyBkZXBl bmRpbmcgb24gYWx3YXlzIGJlaW5nIHBhc3NlZCBhIE5vbmUgZmlsZXN5c3RlbQorICAgICAgICBh bmQgYXNzZXJ0aW5nIGZpbGVzeXN0ZW0uX3Rlc3RzIChvbmx5IHRydWUgZm9yIHVuaXRfdGVzdF9m aWxlc3lzdGVtKCkpLgorICAgICAgICBTbyBJIGp1c3QgcmVtb3ZlZCB0aGUgRmFjdG9yeVRlc3Qu dGVzdF90ZXN0IGFuZCBGYWN0b3J5VGVzdC50ZXN0X2RyeXJ1biB0ZXN0cworICAgICAgICBkZWNp ZGluZyB0aGF0IHRoZXkgd2VyZSBwcmV0dHkgbXVjaCB1c2VsZXNzIGFueXdheS4gIElmIG90aGVy cyBmZWVsIHN0cm9uZ2x5CisgICAgICAgIEknbSBoYXBweSB0byBmaXggdGhpcyBpbiBhIGRpZmZl cmVudCB3YXkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhl Y3V0aXZlLnB5OgorICAgICAgICAgLSBkZWZhdWx0IGFyZ3VtZW50cyBpbiBweXRob24gYXJlIHNj cmV3eS4gIFRoZXkgdXNlIGEgc2luZ2xlIHNoYXJlZAorICAgICAgICAgICBpbnN0YW5jZSwgc28g aXQncyBiZXR0ZXIgdG8gdXNlIGFyZ3VtZW50PU5vbmUgYW5kIHRoZW4gYXJndW1lbnQgPSBhcmd1 bWVudCBvciBEZWZhdWx0KCkKKyAgICAgICAgICAgaWYgeW91IGhhdmUgYW55IGNoYW5jZSBvZiBt dXRhdGluZyAob3IgcmV0dXJuaW5nKSB0aGUgZGVmYXVsdCBhcmd1bWVudC4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZpZy5weToKKyAgICAgICAgIC0g VGhpcyBjb2RlIGlzIHdyb25nLiAgV2UgZG9uJ3QgbmVlZCB0byB1c2UgYSBnbG9iYWwgdmFyaWFi bGUgaGVyZSAoYXMgZmFyIGFzIEkgY2FuIHRlbGwpLgorICAgICAgICAgICBJJ20gbm90IGZpeGlu ZyBpdCBpbiB0aGlzIHBhdGNoLCBidXQgSSd2ZSBtYXJrZWQgaXQgd2l0aCBhIEZJWE1FIGFuZCB3 ZSBjYW4gY29udmVydCB0bworICAgICAgICAgICBzdG9yaW5nIHRoZSByZXN1bHRzIG9mIHRoZSBy ZWFkIG9uIHRoZSBDb25maWcgb2JqZWN0ICh3aGljaCBzaG91bGQgb25seSBiZSBjcmVhdGVkIG9u Y2UgZHVyaW5nIG5vcm1hbCBvcGVyYXRpb24pLgorICAgICAgICAgICBVbml0IHRlc3RzIHNob3Vs ZG4ndCBiZSBoaXR0aW5nIHRoZSBkaXNrIGFueXdheS4gIEl0J3MgcG9zc2libGUgQ29uZmlnIHNo b3VsZCBtb3ZlIG9mZiBvZiBQb3J0IGFuZCBvbnRvIFRvb2wvSG9zdCBkaXJlY3RseS4KKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnkucHk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5X3VuaXR0ZXN0 LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5 OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrX3VuaXR0 ZXN0LnB5OiBBZGRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L21hYy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L21hY191bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3F0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvcXRfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC93ZWJraXQucHk6CisKKzIwMTEtMDctMTIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJr aXQub3JnPgorCiAgICAgICAgIFtRdF0gTlJXVCBzaG91bGQgcGljayB1cCB0aGUgcmlnaHQgaHR0 cGQgY29uZmlnIGZpbGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY0MDg2CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L3N5c3RlbS9leGVjdXRpdmUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0 ZW0vZXhlY3V0aXZlLnB5CmluZGV4IGI1YzNiZGEyYzE4Y2JkZWE2MGE1YTc2MGE2MGQ2ODY5MGM0 MTIyZjQuLjg1YWE4YTMxODNkNzI3MWNhMzM0MTIyNzRmOTI1MGRhZTgwNDAzZTcgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQpAQCAt MTgzLDcgKzE4Myw4IEBAIGNsYXNzIEV4ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICByZXR1cm4g MgogCiAgICAgQHN0YXRpY21ldGhvZAotICAgIGRlZiBpbnRlcnByZXRlcl9mb3Jfc2NyaXB0KHNj cmlwdF9wYXRoLCBmcz1GaWxlU3lzdGVtKCkpOgorICAgIGRlZiBpbnRlcnByZXRlcl9mb3Jfc2Ny aXB0KHNjcmlwdF9wYXRoLCBmcz1Ob25lKToKKyAgICAgICAgZnMgPSBmcyBvciBGaWxlU3lzdGVt KCkKICAgICAgICAgbGluZXMgPSBmcy5yZWFkX3RleHRfZmlsZShzY3JpcHRfcGF0aCkuc3BsaXRs aW5lcygpCiAgICAgICAgIGlmIG5vdCBsZW4obGluZXMpOgogICAgICAgICAgICAgcmV0dXJuIE5v bmUKQEAgLTE5OSw3ICsyMDAsOCBAQCBjbGFzcyBFeGVjdXRpdmUob2JqZWN0KToKICAgICAgICAg cmV0dXJuIE5vbmUKIAogICAgIEBzdGF0aWNtZXRob2QKLSAgICBkZWYgc2hlbGxfY29tbWFuZF9m b3Jfc2NyaXB0KHNjcmlwdF9wYXRoLCBmcz1GaWxlU3lzdGVtKCkpOgorICAgIGRlZiBzaGVsbF9j b21tYW5kX2Zvcl9zY3JpcHQoc2NyaXB0X3BhdGgsIGZzPU5vbmUpOgorICAgICAgICBmcyA9IGZz IG9yIEZpbGVTeXN0ZW0oKQogICAgICAgICAjIFdpbjMyIGRvZXMgbm90IHN1cHBvcnQgc2hlYmFu Zy4gV2UgbmVlZCB0byBkZXRlY3QgdGhlIGludGVycHJldGVyIG91cnNlbGYuCiAgICAgICAgIGlm IHN5cy5wbGF0Zm9ybSA9PSAnd2luMzInOgogICAgICAgICAgICAgaW50ZXJwcmV0ZXIgPSBFeGVj dXRpdmUuaW50ZXJwcmV0ZXJfZm9yX3NjcmlwdChzY3JpcHRfcGF0aCwgZnMpCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZpZy5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnLnB5CmluZGV4IGJi ZGZiMjEzOWQ4NmI0YTRhMTAwMTRjMzIxMzE5YzZmZWQyODk4YjkuLmM1NTI5MDcyODE4ZDMwMmVh M2RlODY4YjkzZjdkYTdiM2M4NjU3MDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnLnB5CkBAIC0xMzEsNiArMTMxLDggQEAgY2xhc3Mg Q29uZmlnKG9iamVjdCk6CiAgICAgICAgICMKICAgICAgICAgIyBGSVhNRTogU2VlIHRoZSBjb21t ZW50IGF0IHRoZSB0b3Agb2YgdGhlIGZpbGUgcmVnYXJkaW5nIHVuaXQgdGVzdHMKICAgICAgICAg IyBhbmQgb3VyIHVzZSBvZiBnbG9iYWwgbXV0YWJsZSBzdGF0aWMgdmFyaWFibGVzLgorICAgICAg ICAjIEZJWE1FOiBXZSBzaG91bGQganVzdCBAbWVtb2l6ZSB0aGlzIG1ldGhvZCBhbmQgdGhlbiB0 aGlzIHdpbGwgb25seQorICAgICAgICAjIGJlIHJlYWQgb25jZSBwZXIgb2JqZWN0IGxpZmV0aW1l ICh3aGljaCBzaG91bGQgYmUgc3VmZmljaWVudGx5IGZhc3QpLgogICAgICAgICBnbG9iYWwgX2hh dmVfZGV0ZXJtaW5lZF9jb25maWd1cmF0aW9uLCBfY29uZmlndXJhdGlvbgogICAgICAgICBpZiBu b3QgX2hhdmVfZGV0ZXJtaW5lZF9jb25maWd1cmF0aW9uOgogICAgICAgICAgICAgY29udGVudHMg PSBzZWxmLl9yZWFkX2NvbmZpZ3VyYXRpb24oKQpAQCAtMTQ2LDggKzE0OCw3IEBAIGNsYXNzIENv bmZpZyhvYmplY3QpOgogCiAgICAgZGVmIF9yZWFkX2NvbmZpZ3VyYXRpb24oc2VsZik6CiAgICAg ICAgIHRyeToKLSAgICAgICAgICAgIGNvbmZpZ3VyYXRpb25fcGF0aCA9IHNlbGYuX2ZpbGVzeXN0 ZW0uam9pbihzZWxmLmJ1aWxkX2RpcmVjdG9yeShOb25lKSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiQ29uZmlndXJhdGlvbiIpCisgICAg ICAgICAgICBjb25maWd1cmF0aW9uX3BhdGggPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5i dWlsZF9kaXJlY3RvcnkoTm9uZSksICJDb25maWd1cmF0aW9uIikKICAgICAgICAgICAgIGlmIG5v dCBzZWxmLl9maWxlc3lzdGVtLmV4aXN0cyhjb25maWd1cmF0aW9uX3BhdGgpOgogICAgICAgICAg ICAgICAgIHJldHVybiBOb25lCiAgICAgICAgIGV4Y2VwdCAoT1NFcnJvciwgZXhlY3V0aXZlLlNj cmlwdEVycm9yKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvZmFjdG9yeS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvZmFjdG9yeS5weQppbmRleCA2NGQ1N2U1ZTFkMGRiODNmMWRiZTk3MDdlZjU0ZjhhNTlm M2E1ODk0Li4xM2I5ZTdiMjJmZWYxOWRiZDRmZjMwYzBhYWJmNWM0MDA2YmRkYTQ5IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnkucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5LnB5 CkBAIC03NSw4ICs3NSw3IEBAIGRlZiBfZ2V0X2t3YXJncygqKmt3YXJncyk6CiAgICAgICAgICAg ICAgICAgcG9ydF90b191c2UgPSAnbWFjJwogCiAgICAgaWYgcG9ydF90b191c2UgaXMgTm9uZToK LSAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcigndW5rbm93biBwb3J0OyBzeXMucGxh dGZvcm0gPSAiJXMiJyAlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3lzLnBs YXRmb3JtKQorICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCd1bmtub3duIHBvcnQ7 IHN5cy5wbGF0Zm9ybSA9ICIlcyInICUgc3lzLnBsYXRmb3JtKQogCiAgICAgaWYgcG9ydF90b191 c2Uuc3RhcnRzd2l0aCgndGVzdCcpOgogICAgICAgICBpbXBvcnQgdGVzdApkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5X3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5X3Vu aXR0ZXN0LnB5CmluZGV4IDg4YjMyM2JiYmQ4Y2ZlOGE4ODU4ZDQ4OGRhMjU0YzQ4NTg2MGQzMGYu LjU0ZjE1N2I1NDJjZTU5ZTAyZTg0MTM1NTY0OWM5MGQwM2ExYjBkNWEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeV91bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3Rvcnlf dW5pdHRlc3QucHkKQEAgLTI5LDcgKzI5LDggQEAKIGltcG9ydCBzeXMKIGltcG9ydCB1bml0dGVz dAogCi1mcm9tIHdlYmtpdHB5LnRvb2wgaW1wb3J0IG1vY2t0b29sCitmcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0uZmlsZXN5c3RlbV9tb2NrIGltcG9ydCBNb2NrRmlsZVN5c3RlbQorZnJvbSB3 ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2NrT3B0aW9ucywgTW9ja1VzZXIsIE1vY2tF eGVjdXRpdmUKIAogaW1wb3J0IGNocm9taXVtX2dwdQogaW1wb3J0IGNocm9taXVtX2xpbnV4CkBA IC01Niw5ICs1Nyw4IEBAIGNsYXNzIEZhY3RvcnlUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAog ICAgIGRlZiBzZXRVcChzZWxmKToKICAgICAgICAgc2VsZi5yZWFsX3N5c19wbGF0Zm9ybSA9IHN5 cy5wbGF0Zm9ybQotICAgICAgICBzZWxmLndlYmtpdF9vcHRpb25zID0gbW9ja3Rvb2wuTW9ja09w dGlvbnMocGl4ZWxfdGVzdHM9RmFsc2UpCi0gICAgICAgIHNlbGYuY2hyb21pdW1fb3B0aW9ucyA9 IG1vY2t0b29sLk1vY2tPcHRpb25zKHBpeGVsX3Rlc3RzPUZhbHNlLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNocm9taXVtPVRydWUpCisgICAg ICAgIHNlbGYud2Via2l0X29wdGlvbnMgPSBNb2NrT3B0aW9ucyhwaXhlbF90ZXN0cz1GYWxzZSkK KyAgICAgICAgc2VsZi5jaHJvbWl1bV9vcHRpb25zID0gTW9ja09wdGlvbnMocGl4ZWxfdGVzdHM9 RmFsc2UsIGNocm9taXVtPVRydWUpCiAKICAgICBkZWYgdGVhckRvd24oc2VsZik6CiAgICAgICAg IHN5cy5wbGF0Zm9ybSA9IHNlbGYucmVhbF9zeXNfcGxhdGZvcm0KQEAgLTcxLDcgKzcxLDggQEAg Y2xhc3MgRmFjdG9yeVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgIGV4cGVjdGVk X3BvcnQ6IGNsYXNzIG9mIGV4cGVjdGVkIHBvcnQgb2JqZWN0LgogICAgICAgICAgIHBvcnRfb2Jq OiBvcHRpb25hbCBwb3J0IG9iamVjdAogICAgICAgICAiIiIKLSAgICAgICAgcG9ydF9vYmogPSBw b3J0X29iaiBvciBmYWN0b3J5LmdldChwb3J0X25hbWU9cG9ydF9uYW1lKQorCisgICAgICAgIHBv cnRfb2JqID0gcG9ydF9vYmogb3IgZmFjdG9yeS5nZXQocG9ydF9uYW1lPXBvcnRfbmFtZSwgZmls ZXN5c3RlbT1Nb2NrRmlsZVN5c3RlbSgpLCB1c2VyPU1vY2tVc2VyKCksIGV4ZWN1dGl2ZT1Nb2Nr RXhlY3V0aXZlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShpc2luc3RhbmNlKHBvcnRfb2Jq LCBleHBlY3RlZF9wb3J0KSkKIAogICAgIGRlZiBhc3NlcnRfcGxhdGZvcm1fcG9ydChzZWxmLCBw bGF0Zm9ybSwgb3B0aW9ucywgZXhwZWN0ZWRfcG9ydCk6CkBAIC04NSwxNyArODYsOSBAQCBjbGFz cyBGYWN0b3J5VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICIiIgogICAgICAgICBv cmlnX3BsYXRmb3JtID0gc3lzLnBsYXRmb3JtCiAgICAgICAgIHN5cy5wbGF0Zm9ybSA9IHBsYXRm b3JtCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShpc2luc3RhbmNlKGZhY3RvcnkuZ2V0KG9wdGlv bnM9b3B0aW9ucyksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4cGVjdGVk X3BvcnQpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoaXNpbnN0YW5jZShmYWN0b3J5LmdldChv cHRpb25zPW9wdGlvbnMsIGZpbGVzeXN0ZW09TW9ja0ZpbGVTeXN0ZW0oKSwgdXNlcj1Nb2NrVXNl cigpLCBleGVjdXRpdmU9TW9ja0V4ZWN1dGl2ZSgpKSwgZXhwZWN0ZWRfcG9ydCkpCiAgICAgICAg IHN5cy5wbGF0Zm9ybSA9IG9yaWdfcGxhdGZvcm0KIAotICAgIGRlZiB0ZXN0X3Rlc3Qoc2VsZik6 Ci0gICAgICAgIHNlbGYuYXNzZXJ0X3BvcnQoInRlc3QiLCB0ZXN0LlRlc3RQb3J0KQotCi0gICAg ZGVmIHRlc3RfZHJ5cnVuKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydF9wb3J0KCJkcnlydW4t dGVzdCIsIGRyeXJ1bi5EcnlSdW5Qb3J0KQotICAgICAgICBzZWxmLmFzc2VydF9wb3J0KCJkcnly dW4tbWFjIiwgZHJ5cnVuLkRyeVJ1blBvcnQpCi0KICAgICBkZWYgdGVzdF9tYWMoc2VsZik6CiAg ICAgICAgIHNlbGYuYXNzZXJ0X3BvcnQoIm1hYyIsIG1hYy5NYWNQb3J0KQogICAgICAgICBzZWxm LmFzc2VydF9wbGF0Zm9ybV9wb3J0KCJkYXJ3aW4iLCBOb25lLCBtYWMuTWFjUG9ydCkKQEAgLTEx MSwxNCArMTA0LDEwIEBAIGNsYXNzIEZhY3RvcnlUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICBkZWYgdGVzdF9nb29nbGVfY2hyb21lKHNlbGYpOgogICAgICAgICAjIFRoZSBhY3R1YWwgQ2hy b21lIGNsYXNzIG5hbWVzIGFyZW4ndCBhdmFpbGFibGUgc28gd2UgdGVzdCB0aGF0IHRoZQogICAg ICAgICAjIG9iamVjdHMgd2UgZ2V0IGFyZSBhdCBsZWFzdCBzdWJjbGFzc2VzIG9mIHRoZSBDaHJv bWl1bSB2ZXJzaW9ucy4KLSAgICAgICAgc2VsZi5hc3NlcnRfcG9ydCgiZ29vZ2xlLWNocm9tZS1s aW51eDMyIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICBjaHJvbWl1bV9saW51eC5DaHJvbWl1 bUxpbnV4UG9ydCkKLSAgICAgICAgc2VsZi5hc3NlcnRfcG9ydCgiZ29vZ2xlLWNocm9tZS1saW51 eDY0IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICBjaHJvbWl1bV9saW51eC5DaHJvbWl1bUxp bnV4UG9ydCkKLSAgICAgICAgc2VsZi5hc3NlcnRfcG9ydCgiZ29vZ2xlLWNocm9tZS13aW4iLAot ICAgICAgICAgICAgICAgICAgICAgICAgIGNocm9taXVtX3dpbi5DaHJvbWl1bVdpblBvcnQpCi0g ICAgICAgIHNlbGYuYXNzZXJ0X3BvcnQoImdvb2dsZS1jaHJvbWUtbWFjIiwKLSAgICAgICAgICAg ICAgICAgICAgICAgICBjaHJvbWl1bV9tYWMuQ2hyb21pdW1NYWNQb3J0KQorICAgICAgICBzZWxm LmFzc2VydF9wb3J0KCJnb29nbGUtY2hyb21lLWxpbnV4MzIiLCBjaHJvbWl1bV9saW51eC5DaHJv bWl1bUxpbnV4UG9ydCkKKyAgICAgICAgc2VsZi5hc3NlcnRfcG9ydCgiZ29vZ2xlLWNocm9tZS1s aW51eDY0IiwgY2hyb21pdW1fbGludXguQ2hyb21pdW1MaW51eFBvcnQpCisgICAgICAgIHNlbGYu YXNzZXJ0X3BvcnQoImdvb2dsZS1jaHJvbWUtd2luIiwgY2hyb21pdW1fd2luLkNocm9taXVtV2lu UG9ydCkKKyAgICAgICAgc2VsZi5hc3NlcnRfcG9ydCgiZ29vZ2xlLWNocm9tZS1tYWMiLCBjaHJv bWl1bV9tYWMuQ2hyb21pdW1NYWNQb3J0KQogCiAgICAgZGVmIHRlc3RfZ3RrKHNlbGYpOgogICAg ICAgICBzZWxmLmFzc2VydF9wb3J0KCJndGsiLCBndGsuR3RrUG9ydCkKQEAgLTE1Nyw4ICsxNDYs NyBAQCBjbGFzcyBGYWN0b3J5VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3Rf dW5rbm93bl9zcGVjaWZpZWQoc2VsZik6CiAgICAgICAgICMgVGVzdCB3aGF0IGhhcHBlbnMgd2hl biB5b3Ugc3BlY2lmeSBhbiB1bmtub3duIHBvcnQuCiAgICAgICAgIG9yaWdfcGxhdGZvcm0gPSBz eXMucGxhdGZvcm0KLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoTm90SW1wbGVtZW50ZWRFcnJv ciwgZmFjdG9yeS5nZXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIHBvcnRfbmFtZT0ndW5r bm93bicpCisgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKE5vdEltcGxlbWVudGVkRXJyb3IsIGZh Y3RvcnkuZ2V0LCBwb3J0X25hbWU9J3Vua25vd24nKQogCiAgICAgZGVmIHRlc3RfdW5rbm93bl9k ZWZhdWx0KHNlbGYpOgogICAgICAgICAjIFRlc3Qgd2hhdCBoYXBwZW5zIHdoZW4geW91J3JlIHJ1 bm5pbmcgb24gYW4gdW5rbm93biBwbGF0Zm9ybS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkKaW5kZXggNTY0NGMxNTc4MjZiYTU2OWE2MjljZTQ3 ZjNjZTM0ZjM0NDZkZDMyZC4uZGI0ZDI4NTJmYmQ0YzViMDdhOTBkNmVkMjNhOTU2NTFjY2RiNDQw MiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9n dGsucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsu cHkKQEAgLTU5LDYgKzU5LDkgQEAgY2xhc3MgR3RrRHJpdmVyKHdlYmtpdC5XZWJLaXREcml2ZXIp OgogY2xhc3MgR3RrUG9ydCh3ZWJraXQuV2ViS2l0UG9ydCk6CiAgICAgcG9ydF9uYW1lID0gImd0 ayIKIAorICAgIGRlZiBfcG9ydF9mbGFnX2Zvcl9zY3JpcHRzKHNlbGYpOgorICAgICAgICByZXR1 cm4gIi0tZ3RrIgorCiAgICAgZGVmIGNyZWF0ZV9kcml2ZXIoc2VsZiwgd29ya2VyX251bWJlcik6 CiAgICAgICAgIHJldHVybiBHdGtEcml2ZXIoc2VsZiwgd29ya2VyX251bWJlcikKIApAQCAtMTA1 LDMgKzEwOCwxMyBAQCBjbGFzcyBHdGtQb3J0KHdlYmtpdC5XZWJLaXRQb3J0KToKIAogICAgIGRl ZiBfcnVudGltZV9mZWF0dXJlX2xpc3Qoc2VsZik6CiAgICAgICAgIHJldHVybiBOb25lCisKKyAg ICAjIEZJWE1FOiBXZSBzaG91bGQgZmluZCBhIHdheSB0byBzaGFyZSB0aGlzIGltcGxtZW50YXRp b24gd2l0aCBHdGssCisgICAgIyBvciB0ZWFjaCBydW4tbGF1bmNoZXIgaG93IHRvIGNhbGwgcnVu LXNhZmFyaSBhbmQgbW92ZSB0aGlzIGRvd24gdG8gV2ViS2l0UG9ydC4KKyAgICBkZWYgc2hvd19y ZXN1bHRzX2h0bWxfZmlsZShzZWxmLCByZXN1bHRzX2ZpbGVuYW1lKToKKyAgICAgICAgcnVuX2xh dW5jaGVyX2FyZ3MgPSBbImZpbGU6Ly8lcyIgJSByZXN1bHRzX2ZpbGVuYW1lXQorICAgICAgICBp ZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgorICAgICAgICAgICAgcnVu X2xhdW5jaGVyX2FyZ3MuYXBwZW5kKCctLXdlYmtpdC10ZXN0LXJ1bm5lcicpCisgICAgICAgICMg RklYTUU6IG9sZC1ydW4td2Via2l0LXRlc3RzIGFsc28gYWRkZWQgWyItZ3JhcGhpY3NzeXN0ZW0i LCAicmFzdGVyIiwgIi1zdHlsZSIsICJ3aW5kb3dzIl0KKyAgICAgICAgIyBGSVhNRTogb2xkLXJ1 bi13ZWJraXQtdGVzdHMgY29udmVydGVkIHJlc3VsdHNfZmlsZW5hbWUgcGF0aCBmb3IgY3lnd2lu LgorICAgICAgICBzZWxmLl9ydW5fc2NyaXB0KCJydW4tbGF1bmNoZXIiLCBydW5fbGF1bmNoZXJf YXJncykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvZ3RrX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9ndGtfdW5pdHRlc3QucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNzdjNzg0MDM0MzEzYzQyMzc3ZjljNzM3 MzA0NjUyZjQzNDNiYTgxNQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrX3VuaXR0ZXN0LnB5CkBAIC0wLDAgKzEsNDUgQEAKKyMg Q29weXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisj IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgKiBSZWRpc3RyaWJ1 dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIuCisjICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNl IHRoZSBhYm92ZQorIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9v ciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorIyAg ICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMK KyMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0 cyBkZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdy aXR0ZW4gcGVybWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUg Q09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQ UkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVE IFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVT UyBGT1IKKyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5U IFNIQUxMIFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBG T1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBP RiBVU0UsCisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9X RVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElO IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElH RU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgorCitpbXBvcnQgdW5pdHRlc3QKKworZnJvbSB3ZWJraXRweS5jb21tb24uc3lz dGVtLm91dHB1dGNhcHR1cmUgaW1wb3J0IE91dHB1dENhcHR1cmUKK2Zyb20gd2Via2l0cHkubGF5 b3V0X3Rlc3RzLnBvcnQuZ3RrIGltcG9ydCBHdGtQb3J0Citmcm9tIHdlYmtpdHB5LmxheW91dF90 ZXN0cy5wb3J0IGltcG9ydCBwb3J0X3Rlc3RjYXNlCitmcm9tIHdlYmtpdHB5LnRvb2wubW9ja3Rv b2wgaW1wb3J0IE1vY2tFeGVjdXRpdmUKKworCitjbGFzcyBHdGtQb3J0VGVzdChwb3J0X3Rlc3Rj YXNlLlBvcnRUZXN0Q2FzZSk6CisgICAgZGVmIHBvcnRfbWFrZXIoc2VsZiwgcGxhdGZvcm0pOgor ICAgICAgICByZXR1cm4gR3RrUG9ydAorCisgICAgZGVmIHRlc3Rfc2hvd19yZXN1bHRzX2h0bWxf ZmlsZShzZWxmKToKKyAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKKyAgICAgICAgcG9y dC5fZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZShzaG91bGRfbG9nPVRydWUpCisgICAgICAgIGV4 cGVjdGVkX3N0ZGVyciA9ICJNT0NLIHJ1bl9jb21tYW5kOiBbJ1Rvb2xzL1NjcmlwdHMvcnVuLWxh dW5jaGVyJywgJy0tcmVsZWFzZScsICctLWd0aycsICdmaWxlOi8vdGVzdC5odG1sJ11cbiIKKyAg ICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuc2hvd19yZXN1 bHRzX2h0bWxfZmlsZSwgWyJ0ZXN0Lmh0bWwiXSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0 ZGVycikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvbWFjLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMu cHkKaW5kZXggNzYyMWFiZmYxYTc1OWFiNDIzMDZhYmIxNTViYmFlNDI1N2ViNjU4YS4uOWE1NTFj NWVkNGE3MmE2MTIxYjFlZDgzMjA0NzQxNDI0MWRjNjAzMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKQEAgLTExNSwzICsxMTUsNiBAQCBj bGFzcyBNYWNQb3J0KFdlYktpdFBvcnQpOgogCiAgICAgZGVmIF9wYXRoX3RvX3dlYmNvcmVfbGli cmFyeShzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoJ1dlYkNvcmUuZnJh bWV3b3JrL1ZlcnNpb25zL0EvV2ViQ29yZScpCisKKyAgICBkZWYgc2hvd19yZXN1bHRzX2h0bWxf ZmlsZShzZWxmLCByZXN1bHRzX2ZpbGVuYW1lKToKKyAgICAgICAgc2VsZi5fcnVuX3NjcmlwdCgn cnVuLXNhZmFyaScsIFsnLU5TT3BlbicsIHJlc3VsdHNfZmlsZW5hbWVdKQpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5pdHRlc3QucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5w eQppbmRleCAxNWMwM2IzOGIzNDY3NDg3MGQ1NWY3OTdlZjQ4M2EyNGJhNmVkZTkxLi40MzQ2MzAw ZTgzODc1NjY2NjQzMjc0YTBkZDU5NjYzN2I1YzAxNjA4IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weQpAQCAt MzMsMTEgKzMzLDEzIEBAIGltcG9ydCB1bml0dGVzdAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVz dHMucG9ydC5tYWMgaW1wb3J0IE1hY1BvcnQKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBv cnQgaW1wb3J0IHBvcnRfdGVzdGNhc2UKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxl c3lzdGVtX21vY2sgaW1wb3J0IE1vY2tGaWxlU3lzdGVtCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5z eXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQogZnJvbSB3ZWJraXRweS50 b29sLm1vY2t0b29sIGltcG9ydCBNb2NrT3B0aW9ucywgTW9ja1VzZXIsIE1vY2tFeGVjdXRpdmUK IAogCiBjbGFzcyBNYWNUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAgICBkZWYg cG9ydF9tYWtlcihzZWxmLCBwbGF0Zm9ybSk6CisgICAgICAgICMgRklYTUU6IFRoaXMgcGxhdGZv cm0gY2hlY2sgc2hvdWxkIG5vIGxvbmdlciBiZSBuZWNlc3NhcnkgYW5kIHNob3VsZCBiZSByZW1v dmVkIGFzIHNvb24gYXMgcG9zc2libGUuCiAgICAgICAgIGlmIHBsYXRmb3JtICE9ICdkYXJ3aW4n OgogICAgICAgICAgICAgcmV0dXJuIE5vbmUKICAgICAgICAgcmV0dXJuIE1hY1BvcnQKQEAgLTE0 MSw2ICsxNDMsMTMgQEAgc3ZnL2JhdGlrL3RleHQvc21hbGxGb250cy5zdmcKICAgICAgICAgc2Vs Zi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsnbWFjLXdrMicsICdtYWMtbGVvcGFyZCcsICdtYWMtc25v d2xlb3BhcmQnLCAnbWFjJ10sICdsZW9wYXJkJywgdXNlX3dlYmtpdDI9VHJ1ZSkKICAgICAgICAg c2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsnbWFjLXdrMicsICdtYWMtc25vd2xlb3BhcmQnLCAn bWFjJ10sICdzbm93bGVvcGFyZCcsIHVzZV93ZWJraXQyPVRydWUpCiAKKyAgICBkZWYgdGVzdF9z aG93X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYpOgorICAgICAgICBwb3J0ID0gTWFjUG9ydChmaWxl c3lzdGVtPU1vY2tGaWxlU3lzdGVtKCksIHVzZXI9TW9ja1VzZXIoKSwgZXhlY3V0aXZlPU1vY2tF eGVjdXRpdmUoKSkKKyAgICAgICAgIyBEZWxheSBzZXR0aW5nIGEgc2hvdWxkX2xvZyBleGVjdXRp dmUgdG8gYXZvaWQgbG9nZ2luZyBmcm9tIE1hY1BvcnQuX19pbml0X18uCisgICAgICAgIHBvcnQu X2V4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUoc2hvdWxkX2xvZz1UcnVlKQorICAgICAgICBleHBl Y3RlZF9zdGRlcnIgPSAiTU9DSyBydW5fY29tbWFuZDogWydUb29scy9TY3JpcHRzL3J1bi1zYWZh cmknLCAnLS1yZWxlYXNlJywgJy1OU09wZW4nLCAndGVzdC5odG1sJ11cbiIKKyAgICAgICAgT3V0 cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuc2hvd19yZXN1bHRzX2h0bWxf ZmlsZSwgWyJ0ZXN0Lmh0bWwiXSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKKwog CiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIHBvcnRfdGVzdGNhc2UubWFpbigpCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQppbmRleCBh NmE4YzJlZjMzZTMxZWE5YWMzMTAyNDNiMjU0NDBmZTllMzQ2ODY4Li5mZGFiYTFjODQ5NTQ2NjFm ZTg1M2M3YjMwZjhlYTNiMTAxOWZiYWEyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKQEAgLTQyLDYgKzQyLDkgQEAgX2xvZyA9IGxvZ2dpbmcu Z2V0TG9nZ2VyKF9fbmFtZV9fKQogY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogICAgIHBvcnRf bmFtZSA9ICJxdCIKIAorICAgIGRlZiBfcG9ydF9mbGFnX2Zvcl9zY3JpcHRzKHNlbGYpOgorICAg ICAgICByZXR1cm4gIi0tcXQiCisKICAgICBkZWYgX29wZXJhdGluZ19zeXN0ZW1fZm9yX3BsYXRm b3JtKHNlbGYsIHBsYXRmb3JtKToKICAgICAgICAgaWYgcGxhdGZvcm0uc3RhcnRzd2l0aCgnbGlu dXgnKToKICAgICAgICAgICAgIHJldHVybiAibGludXgiCkBAIC04MywzICs4NiwxMSBAQCBjbGFz cyBRdFBvcnQoV2ViS2l0UG9ydCk6CiAgICAgICAgIGVudiA9IFdlYktpdFBvcnQuc2V0dXBfZW52 aXJvbl9mb3Jfc2VydmVyKHNlbGYpCiAgICAgICAgIGVudlsnUVRXRUJLSVRfUExVR0lOX1BBVEgn XSA9IHNlbGYuX2J1aWxkX3BhdGgoJ2xpYi9wbHVnaW5zJykKICAgICAgICAgcmV0dXJuIGVudgor CisgICAgIyBGSVhNRTogV2Ugc2hvdWxkIGZpbmQgYSB3YXkgdG8gc2hhcmUgdGhpcyBpbXBsbWVu dGF0aW9uIHdpdGggR3RrLAorICAgICMgb3IgdGVhY2ggcnVuLWxhdW5jaGVyIGhvdyB0byBjYWxs IHJ1bi1zYWZhcmkgYW5kIG1vdmUgdGhpcyBkb3duIHRvIFdlYktpdFBvcnQuCisgICAgZGVmIHNo b3dfcmVzdWx0c19odG1sX2ZpbGUoc2VsZiwgcmVzdWx0c19maWxlbmFtZSk6CisgICAgICAgIHJ1 bl9sYXVuY2hlcl9hcmdzID0gWyJmaWxlOi8vJXMiICUgcmVzdWx0c19maWxlbmFtZV0KKyAgICAg ICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKKyAgICAgICAgICAg IHJ1bl9sYXVuY2hlcl9hcmdzLmFwcGVuZCgnLS13ZWJraXQtdGVzdC1ydW5uZXInKQorICAgICAg ICBzZWxmLl9ydW5fc2NyaXB0KCJydW4tbGF1bmNoZXIiLCBydW5fbGF1bmNoZXJfYXJncykKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5p dHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3Vu aXR0ZXN0LnB5CmluZGV4IDY4YzNjOGM2NWJkMDRiMGVjNGI1OTlkM2I1Y2ViM2M0M2ViYmZmMDYu LjY3NzRjNTdjOTAwMjA5MjZjOGM1NmFhYTRkODA3N2E0NTBmNGFjMTQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5w eQpAQCAtMjksMTEgKzI5LDE2IEBACiBpbXBvcnQgdW5pdHRlc3QKIAogZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLmZpbGVzeXN0ZW1fbW9jayBpbXBvcnQgTW9ja0ZpbGVTeXN0ZW0KK2Zyb20g d2Via2l0cHkuY29tbW9uLnN5c3RlbS5vdXRwdXRjYXB0dXJlIGltcG9ydCBPdXRwdXRDYXB0dXJl CiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0LnF0IGltcG9ydCBRdFBvcnQKK2Zyb20g d2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IHBvcnRfdGVzdGNhc2UKIGZyb20gd2Vi a2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQgTW9ja09wdGlvbnMsIE1vY2tVc2VyLCBNb2NrRXhl Y3V0aXZlCiAKIAotY2xhc3MgUXRQb3J0VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CitjbGFzcyBR dFBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKKyAgICBkZWYgcG9ydF9tYWtl cihzZWxmLCBwbGF0Zm9ybSk6CisgICAgICAgIHJldHVybiBRdFBvcnQKKwogICAgIGRlZiBfYXNz ZXJ0X3NlYXJjaF9wYXRoKHNlbGYsIHNlYXJjaF9wYXRocywgc3lzX3BsYXRmb3JtLCB1c2Vfd2Vi a2l0Mj1GYWxzZSk6CiAgICAgICAgICMgRklYTUU6IFBvcnQgY29uc3RydWN0b3JzIHNob3VsZCBu b3QgInBhcnNlIiB0aGUgcG9ydCBuYW1lLCBidXQKICAgICAgICAgIyByYXRoZXIgYmUgcGFzc2Vk IGNvbXBvbmVudHMgKGRpcmVjdGx5IG9yIHZpYSBzZXR0ZXJzKS4gIE9uY2UKQEAgLTU2LDMgKzYx LDkgQEAgY2xhc3MgUXRQb3J0VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYu X2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdrMicsICdxdC1tYWMnLCAncXQnXSwgJ2Rhcndpbics IHVzZV93ZWJraXQyPVRydWUpCiAgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0 LXdrMicsICdxdC13aW4nLCAncXQnXSwgJ2N5Z3dpbicsIHVzZV93ZWJraXQyPVRydWUpCiAgICAg ICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdrMicsICdxdC1saW51eCcsICdxdCdd LCAnbGludXgyJywgdXNlX3dlYmtpdDI9VHJ1ZSkKKworICAgIGRlZiB0ZXN0X3Nob3dfcmVzdWx0 c19odG1sX2ZpbGUoc2VsZik6CisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAg ICAgIHBvcnQuX2V4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUoc2hvdWxkX2xvZz1UcnVlKQorICAg ICAgICBleHBlY3RlZF9zdGRlcnIgPSAiTU9DSyBydW5fY29tbWFuZDogWydUb29scy9TY3JpcHRz L3J1bi1sYXVuY2hlcicsICctLXJlbGVhc2UnLCAnLS1xdCcsICdmaWxlOi8vdGVzdC5odG1sJ11c biIKKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuc2hv d19yZXN1bHRzX2h0bWxfZmlsZSwgWyJ0ZXN0Lmh0bWwiXSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVj dGVkX3N0ZGVycikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvd2Via2l0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC93ZWJraXQucHkKaW5kZXggMzkwMzlhZWRhNTdiMzA4OTY5NDg5YmUxYTY3NTY0YmFhNGRi NjJjZS4uNDVmZmIyM2NmODU4ODhjM2UwMDZiMmRjYjExNGQzOTRhZDI1YTEzZiAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKQEAg LTkzLDE1ICs5MywzMyBAQCBjbGFzcyBXZWJLaXRQb3J0KFBvcnQpOgogICAgICAgICAgICAgcmV0 dXJuICJidWlsZC13ZWJraXR0ZXN0cnVubmVyIgogICAgICAgICByZXR1cm4gImJ1aWxkLWR1bXBy ZW5kZXJ0cmVlIgogCisgICAgZGVmIF9wb3J0X2ZsYWdfZm9yX3NjcmlwdHMoc2VsZik6CisgICAg ICAgICMgVGhpcyBpcyBvdmVycnJpZGVuIGJ5IHBvcnRzIHdoaWNoIG5lZWQgYSBmbGFnIHBhc3Nl ZCB0byBzY3JpcHRzIHRvIGRpc3Rpbmd1aXNoIHRoZSB1c2Ugb2YgdGhhdCBwb3J0LgorICAgICAg ICAjIEZvciBleGFtcGxlIC0tcXQgb24gbGludXgsIHNpbmNlIGEgdXNlciBtaWdodCBoYXZlIGJv dGggR3RrIGFuZCBRdCBsaWJyYXJpZXMgaW5zdGFsbGVkLgorICAgICAgICAjIEZJWE1FOiBDaHJv bWl1bSBzaG91bGQgb3ZlcnJpZGUgdGhpcyBvbmNlIENocm9taXVtUG9ydCBpcyBhIFdlYktpdFBv cnQuCisgICAgICAgIHJldHVybiBOb25lCisKKyAgICAjIFRoaXMgaXMgbW9kZWxlZCBhZnRlciB3 ZWJraXRkaXJzLnBtIGFyZ3VtZW50c0ZvckNvbmZpZ3VyYXRpb24oKSBmcm9tIG9sZC1ydW4td2Vi a2l0LXRlc3RzCisgICAgZGVmIF9hcmd1bWVudHNfZm9yX2NvbmZpZ3VyYXRpb24oc2VsZik6Cisg ICAgICAgIGNvbmZpZ19hcmdzID0gW10KKyAgICAgICAgY29uZmlnX2FyZ3MuYXBwZW5kKHNlbGYu X2NvbmZpZy5mbGFnX2Zvcl9jb25maWd1cmF0aW9uKHNlbGYuZ2V0X29wdGlvbignY29uZmlndXJh dGlvbicpKSkKKyAgICAgICAgIyBGSVhNRTogV2UgbWF5IG5lZWQgdG8gYWRkIHN1cHBvcnQgZm9y IHBhc3NpbmcgLS0zMi1iaXQgbGlrZSBvbGQtcnVuLXdlYmtpdC10ZXN0cyBoYWQuCisgICAgICAg IHBvcnRfZmxhZyA9IHNlbGYuX3BvcnRfZmxhZ19mb3Jfc2NyaXB0cygpCisgICAgICAgIGlmIHBv cnRfZmxhZzoKKyAgICAgICAgICAgIGNvbmZpZ19hcmdzLmFwcGVuZChwb3J0X2ZsYWcpCisgICAg ICAgIHJldHVybiBjb25maWdfYXJncworCisgICAgZGVmIF9ydW5fc2NyaXB0KHNlbGYsIHNjcmlw dF9uYW1lLCBhcmdzPU5vbmUsIGluY2x1ZGVfY29uZmlndXJhdGlvbl9hcmd1bWVudHM9VHJ1ZSk6 CisgICAgICAgIHJ1bl9zY3JpcHRfY29tbWFuZCA9IFtzZWxmLl9jb25maWcuc2NyaXB0X3BhdGgo c2NyaXB0X25hbWUpXQorICAgICAgICBpZiBpbmNsdWRlX2NvbmZpZ3VyYXRpb25fYXJndW1lbnRz OgorICAgICAgICAgICAgcnVuX3NjcmlwdF9jb21tYW5kLmV4dGVuZChzZWxmLl9hcmd1bWVudHNf Zm9yX2NvbmZpZ3VyYXRpb24oKSkKKyAgICAgICAgaWYgYXJnczoKKyAgICAgICAgICAgIHJ1bl9z Y3JpcHRfY29tbWFuZC5leHRlbmQoYXJncykKKyAgICAgICAgcmV0dXJuIHNlbGYuX2V4ZWN1dGl2 ZS5ydW5fY29tbWFuZChydW5fc2NyaXB0X2NvbW1hbmQsIGN3ZD1zZWxmLl9jb25maWcud2Via2l0 X2Jhc2VfZGlyKCkpICAjIEl0J3MgdW5jbGVhciBpZiBzZXR0aW5nIGN3ZCBpcyBuZWNlc3Nhcnkg Zm9yIGFsbCBjYWxsZXJzLgorCiAgICAgZGVmIF9idWlsZF9kcml2ZXIoc2VsZik6Ci0gICAgICAg IGNvbmZpZ3VyYXRpb24gPSBzZWxmLmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKQogICAgICAg ICB0cnk6Ci0gICAgICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgcHJvYmFibHkgaGF2ZSBhIHJ1 bl9zY3JpcHQgaGVscGVyIHdoaWNoIGF1dG9tYXRpY2FsbHkgYWRkcyB0aGUgY29uZmlndXJhdGlv biBmbGFncy4KLSAgICAgICAgICAgIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChbCi0gICAg ICAgICAgICAgICAgc2VsZi5fY29uZmlnLnNjcmlwdF9wYXRoKHNlbGYuX2RyaXZlcl9idWlsZF9z Y3JpcHRfbmFtZSgpKSwKLSAgICAgICAgICAgICAgICBzZWxmLl9jb25maWcuZmxhZ19mb3JfY29u ZmlndXJhdGlvbihjb25maWd1cmF0aW9uKV0sCi0gICAgICAgICAgICAgICAgIyBGSVhNRTogSXQn cyB1bmNsZWFyIGlmIHRoaXMgY3dkPSBpcyBuZWNlc3NhcnkuIEFnYWluIGEgaGVscGVyIHNob3Vs ZCBkbyB0aGlzIGZvciB1cy4KLSAgICAgICAgICAgICAgICBjd2Q9c2VsZi5fY29uZmlnLndlYmtp dF9iYXNlX2RpcigpKQorICAgICAgICAgICAgc2VsZi5fcnVuX3NjcmlwdChzZWxmLl9kcml2ZXJf YnVpbGRfc2NyaXB0X25hbWUoKSkKICAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yOgogICAgICAg ICAgICAgX2xvZy5lcnJvcigiRmFpbGVkIHRvIGJ1aWxkICVzIiAlIHNlbGYuZHJpdmVyX25hbWUo KSkKICAgICAgICAgICAgIHJldHVybiBGYWxzZQo=