124974 2013-11-28 08:50:04 -0800 REGRESSION(r159839): run-webkit-tests doesn't generate pretty diff (Requested by Ossy on #webkit). 2013-11-28 08:52:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 124937 1 commit-queue commit-queue rniwa oldest_to_newest 954747 0 commit-queue 2013-11-28 08:50:04 -0800 http://trac.webkit.org/changeset/159839 broke the build: run-webkit-tests doesn't generate pretty diff (Requested by Ossy on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 954749 1 218003 commit-queue 2013-11-28 08:50:24 -0800 Created attachment 218003 ROLLOUT of r159839 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 954750 2 218003 commit-queue 2013-11-28 08:52:50 -0800 Comment on attachment 218003 ROLLOUT of r159839 Clearing flags on attachment: 218003 Committed r159847: <http://trac.webkit.org/changeset/159847> 954751 3 commit-queue 2013-11-28 08:52:52 -0800 All reviewed patches have been landed. Closing bug. 218003 2013-11-28 08:50:24 -0800 2013-11-28 08:52:50 -0800 ROLLOUT of r159839 bug-124974-20131128085024.patch text/plain 14583 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5ODQ2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2RiODA4YTVmNzY3ZDdkZjNhMTFhZjRkZGMyYTY5NDNl ODhmYTlkOS4uY2VmMDAzMjIxYmRlZmEzNWMyM2Y3MTllNWE5ZTY1OGNmMDNjZGFjOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDEzLTExLTI4ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4K KworICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTU5ODM5LgorICAgICAgICBodHRw Oi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xNTk4MzkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDk3NAorCisgICAgICAgIHJ1bi13ZWJraXQt dGVzdHMgZG9lc24ndCBnZW5lcmF0ZSBwcmV0dHkgZGlmZiAoUmVxdWVzdGVkIGJ5CisgICAgICAg IE9zc3kgb24gI3dlYmtpdCkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9w cmV0dHlwYXRjaC5weToKKyAgICAgICAgKFByZXR0eVBhdGNoLl9faW5pdF9fKToKKyAgICAgICAg KFByZXR0eVBhdGNoLnByZXR0eV9kaWZmKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jlc3VsdF93cml0ZXIucHk6CisgICAgICAgIChU ZXN0UmVzdWx0V3JpdGVyLmNyZWF0ZV90ZXh0X2RpZmZfYW5kX3dyaXRlX3Jlc3VsdCk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3Vs dHMucHk6CisgICAgICAgIChzdW1tYXJpemVfcmVzdWx0cyk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQb3J0Ll9faW5pdF9fKToKKyAgICAgICAg KFBvcnQucHJldHR5X3BhdGNoX2F2YWlsYWJsZSk6CisgICAgICAgIChQb3J0LmNoZWNrX3ByZXR0 eV9wYXRjaCk6CisgICAgICAgIChQb3J0LnZhcmlhYmxlKToKKyAgICAgICAgKFBvcnQudmFyaWFi bGUucHJldHR5X3BhdGNoX3RleHQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9i YXNlX3VuaXR0ZXN0LnB5OgorICAgICAgICAoUG9ydFRlc3QudGVzdF9wcmV0dHlfcGF0Y2hfb3Nf ZXJyb3IpOgorICAgICAgICAoUG9ydFRlc3QudGVzdF9wcmV0dHlfcGF0Y2hfc2NyaXB0X2Vycm9y KToKKwogMjAxMy0xMS0yOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVtb3ZlIGZlYXR1cmU6IENTUyB2YXJpYWJsZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3ByZXR0eXBhdGNoLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vcHJldHR5cGF0Y2gucHkKaW5kZXggNzg2OGE1ZmFjMjUwYmI3MzlhMTk4OTgz ZjY0MGY0M2NjMTc5MzFlNC4uZThhOTEzYTQxMWQ0ZjI0ZWE3NTllYzAxMTMxODRjNjdmYmEwYjdh OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vcHJldHR5cGF0Y2gu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vcHJldHR5cGF0Y2gucHkKQEAg LTI2LDI1ICsyNiwxNSBAQAogIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAotaW1wb3J0 IGVycm5vCi1pbXBvcnQgbG9nZ2luZwogaW1wb3J0IG9zCiBpbXBvcnQgdGVtcGZpbGUKLWZyb20g d2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCi0KLV9s b2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogCiBjbGFzcyBQcmV0dHlQYXRjaChv YmplY3QpOgogICAgICMgRklYTUU6IFByZXR0eVBhdGNoIHNob3VsZCBub3QgcmVxdWlyZSBjaGVj a291dF9yb290LgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBleGVjdXRpdmUsIGNoZWNrb3V0X3Jv b3QsIGZpbGVzeXN0ZW09Tm9uZSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGV4ZWN1dGl2ZSwg Y2hlY2tvdXRfcm9vdCk6CiAgICAgICAgIHNlbGYuX2V4ZWN1dGl2ZSA9IGV4ZWN1dGl2ZQotICAg ICAgICBzZWxmLl9maWxlc3lzdGVtID0gZmlsZXN5c3RlbQogICAgICAgICBzZWxmLl9jaGVja291 dF9yb290ID0gY2hlY2tvdXRfcm9vdAotICAgICAgICBzZWxmLl9wcmV0dHlfcGF0Y2hfcGF0aCA9 IG9zLnBhdGguam9pbihzZWxmLl9jaGVja291dF9yb290LCAiV2Vic2l0ZXMiLCAiYnVncy53ZWJr aXQub3JnIiwgIlByZXR0eVBhdGNoIikKLSAgICAgICAgc2VsZi5fcHJldHRpZnlfcGF0aCA9IG9z LnBhdGguam9pbihzZWxmLl9wcmV0dHlfcGF0Y2hfcGF0aCwgInByZXR0aWZ5LnJiIikKLSAgICAg ICAgc2VsZi5wcmV0dHlfcGF0Y2hfZXJyb3JfaHRtbCA9ICJGYWlsZWQgdG8gcnVuIFByZXR0eVBh dGNoLCBzZWUgZXJyb3IgbG9nLiIKLSAgICAgICAgc2VsZi5wcGF0Y2hfYXZhaWxhYmxlID0gTm9u ZQogCiAgICAgZGVmIHByZXR0eV9kaWZmX2ZpbGUoc2VsZiwgZGlmZik6CiAgICAgICAgICMgRGlm ZnMgY2FuIGNvbnRhaW4gbXVsdGlwbGUgdGV4dCBmaWxlcyBvZiBkaWZmZXJlbnQgZW5jb2Rpbmdz CkBAIC02Miw1OSArNTIsMTYgQEAgY2xhc3MgUHJldHR5UGF0Y2gob2JqZWN0KToKICAgICAgICAg aWYgbm90IGRpZmY6CiAgICAgICAgICAgICByZXR1cm4gIiIKIAorICAgICAgICBwcmV0dHlfcGF0 Y2hfcGF0aCA9IG9zLnBhdGguam9pbihzZWxmLl9jaGVja291dF9yb290LAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiV2Vic2l0ZXMiLCAiYnVncy53ZWJraXQub3Jn IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlByZXR0eVBhdGNo IikKKyAgICAgICAgcHJldHRpZnlfcGF0aCA9IG9zLnBhdGguam9pbihwcmV0dHlfcGF0Y2hfcGF0 aCwgInByZXR0aWZ5LnJiIikKICAgICAgICAgYXJncyA9IFsKICAgICAgICAgICAgICJydWJ5IiwK ICAgICAgICAgICAgICItSSIsCi0gICAgICAgICAgICBzZWxmLl9wcmV0dHlfcGF0Y2hfcGF0aCwK LSAgICAgICAgICAgIHNlbGYuX3ByZXR0aWZ5X3BhdGgsCisgICAgICAgICAgICBwcmV0dHlfcGF0 Y2hfcGF0aCwKKyAgICAgICAgICAgIHByZXR0aWZ5X3BhdGgsCiAgICAgICAgIF0KICAgICAgICAg IyBQcmV0dHlQYXRjaCBkb2VzIG5vdCBtb2RpZnkgdGhlIGVuY29kaW5nIG9mIHRoZSBkaWZmIG91 dHB1dAogICAgICAgICAjIHNvIHdlIGNhbid0IGV4cGVjdCBpdCB0byBiZSB1dGYtOC4KICAgICAg ICAgcmV0dXJuIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChhcmdzLCBpbnB1dD1kaWZmLCBk ZWNvZGVfb3V0cHV0PUZhbHNlKQotCi0gICAgZGVmIHByZXR0eV9wYXRjaF9hdmFpbGFibGUoc2Vs Zik6Ci0gICAgICAgIGlmIHNlbGYucHBhdGNoX2F2YWlsYWJsZSBpcyBOb25lOgotICAgICAgICAg ICAgc2VsZi5wcGF0Y2hfYXZhaWxhYmxlID0gc2VsZi5jaGVja19wcmV0dHlfcGF0Y2gobG9nZ2lu Zz1GYWxzZSkKLSAgICAgICAgcmV0dXJuIHNlbGYucHBhdGNoX2F2YWlsYWJsZQotCi0gICAgZGVm IGNoZWNrX3ByZXR0eV9wYXRjaChzZWxmLCBsb2dnaW5nPVRydWUpOgotICAgICAgICAiIiJDaGVj a3Mgd2hldGhlciB3ZSBjYW4gdXNlIHRoZSBQcmV0dHlQYXRjaCBydWJ5IHNjcmlwdC4iIiIKLSAg ICAgICAgdHJ5OgotICAgICAgICAgICAgXyA9IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChb J3J1YnknLCAnLS12ZXJzaW9uJ10pCi0gICAgICAgIGV4Y2VwdCBPU0Vycm9yLCBlOgotICAgICAg ICAgICAgaWYgZS5lcnJubyBpbiBbZXJybm8uRU5PRU5ULCBlcnJuby5FQUNDRVMsIGVycm5vLkVD SElMRF06Ci0gICAgICAgICAgICAgICAgaWYgbG9nZ2luZzoKLSAgICAgICAgICAgICAgICAgICAg X2xvZy53YXJuaW5nKCJSdWJ5IGlzIG5vdCBpbnN0YWxsZWQ7IGNhbid0IGdlbmVyYXRlIHByZXR0 eSBwYXRjaGVzLiIpCi0gICAgICAgICAgICAgICAgICAgIF9sb2cud2FybmluZygnJykKLSAgICAg ICAgICAgICAgICByZXR1cm4gRmFsc2UKLQotICAgICAgICBpZiBub3Qgc2VsZi5fZmlsZXN5c3Rl bS5leGlzdHMoc2VsZi5fcHJldHR5X3BhdGNoX3BhdGgpOgotICAgICAgICAgICAgaWYgbG9nZ2lu ZzoKLSAgICAgICAgICAgICAgICBfbG9nLndhcm5pbmcoIlVuYWJsZSB0byBmaW5kICVzOyBjYW4n dCBnZW5lcmF0ZSBwcmV0dHkgcGF0Y2hlcy4iICUgc2VsZi5fcHJldHR5X3BhdGNoX3BhdGgpCi0g ICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCcnKQotICAgICAgICAgICAgcmV0dXJuIEZhbHNl Ci0KLSAgICAgICAgcmV0dXJuIFRydWUKLQotICAgIGRlZiBwcmV0dHlfcGF0Y2hfdGV4dChzZWxm LCBkaWZmX3BhdGgpOgotICAgICAgICBpZiBzZWxmLnBwYXRjaF9hdmFpbGFibGUgaXMgTm9uZToK LSAgICAgICAgICAgIHNlbGYucHBhdGNoX2F2YWlsYWJsZSA9IHNlbGYuY2hlY2tfcHJldHR5X3Bh dGNoKGxvZ2dpbmc9RmFsc2UpCi0gICAgICAgIGlmIG5vdCBzZWxmLnBwYXRjaF9hdmFpbGFibGU6 Ci0gICAgICAgICAgICByZXR1cm4gc2VsZi5wcmV0dHlfcGF0Y2hfZXJyb3JfaHRtbAotICAgICAg ICBjb21tYW5kID0gKCJydWJ5IiwgIi1JIiwgc2VsZi5fZmlsZXN5c3RlbS5kaXJuYW1lKHNlbGYu X3ByZXR0eV9wYXRjaF9wYXRoKSwKLSAgICAgICAgICAgICAgICAgICBzZWxmLl9wcmV0dHlfcGF0 Y2hfcGF0aCwgZGlmZl9wYXRoKQotICAgICAgICB0cnk6Ci0gICAgICAgICAgICAjIERpZmZzIGFy ZSB0cmVhdGVkIGFzIGJpbmFyeSAod2UgcGFzcyBkZWNvZGVfb3V0cHV0PUZhbHNlKSBhcyB0aGV5 Ci0gICAgICAgICAgICAjIG1heSBjb250YWluIG11bHRpcGxlIGZpbGVzIG9mIGNvbmZsaWN0aW5n IGVuY29kaW5ncy4KLSAgICAgICAgICAgIHJldHVybiBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1h bmQoY29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxzZSkKLSAgICAgICAgZXhjZXB0IE9TRXJyb3Is IGU6Ci0gICAgICAgICAgICAjIElmIHRoZSBzeXN0ZW0gaXMgbWlzc2luZyBydWJ5IGxvZyB0aGUg ZXJyb3IgYW5kIHN0b3AgdHJ5aW5nLgotICAgICAgICAgICAgc2VsZi5wcGF0Y2hfYXZhaWxhYmxl ID0gRmFsc2UKLSAgICAgICAgICAgIF9sb2cuZXJyb3IoIkZhaWxlZCB0byBydW4gUHJldHR5UGF0 Y2ggKCVzKTogJXMiICUgKGNvbW1hbmQsIGUpKQotICAgICAgICAgICAgcmV0dXJuIHNlbGYucHJl dHR5X3BhdGNoX2Vycm9yX2h0bWwKLSAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlOgotICAg ICAgICAgICAgIyBJZiBydWJ5IGZhaWxlZCB0byBydW4gZm9yIHNvbWUgcmVhc29uLCBsb2cgdGhl IGNvbW1hbmQKLSAgICAgICAgICAgICMgb3V0cHV0IGFuZCBzdG9wIHRyeWluZy4KLSAgICAgICAg ICAgIHNlbGYucHBhdGNoX2F2YWlsYWJsZSA9IEZhbHNlCi0gICAgICAgICAgICBfbG9nLmVycm9y KCJGYWlsZWQgdG8gcnVuIFByZXR0eVBhdGNoICglcyk6XG4lcyIgJSAoY29tbWFuZCwgZS5tZXNz YWdlX3dpdGhfb3V0cHV0KCkpKQotICAgICAgICAgICAgcmV0dXJuIHNlbGYucHJldHR5X3BhdGNo X2Vycm9yX2h0bWwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRlci5weQppbmRl eCAwMDVjNzAyYWUwMDk3NmY2ZGMxNDJlOWMxYzg4YjIwZTVhNzNjZGY5Li4yM2U0NGQ1MGIyZjU3 NWMwNDVmNDcyZjA1YmJlOTZlYTUwZjViNzMxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jlc3VsdF93cml0ZXIucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9y ZXN1bHRfd3JpdGVyLnB5CkBAIC0xOTYsOCArMTk2LDggQEAgY2xhc3MgVGVzdFJlc3VsdFdyaXRl cihvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5fd3JpdGVfYmluYXJ5X2ZpbGUod2RpZmZfZmls ZW5hbWUsIHdkaWZmKQogCiAgICAgICAgICMgVXNlIFdlYktpdCdzIFByZXR0eVBhdGNoLnJiIHRv IGdldCBhbiBIVE1MIGRpZmYuCi0gICAgICAgIGlmIHNlbGYuX3BvcnQucHJldHR5X3BhdGNoLnBy ZXR0eV9wYXRjaF9hdmFpbGFibGUoKToKLSAgICAgICAgICAgIHByZXR0eV9wYXRjaCA9IHNlbGYu X3BvcnQucHJldHR5X3BhdGNoLnByZXR0eV9wYXRjaF90ZXh0KGRpZmZfZmlsZW5hbWUpCisgICAg ICAgIGlmIHNlbGYuX3BvcnQucHJldHR5X3BhdGNoX2F2YWlsYWJsZSgpOgorICAgICAgICAgICAg cHJldHR5X3BhdGNoID0gc2VsZi5fcG9ydC5wcmV0dHlfcGF0Y2hfdGV4dChkaWZmX2ZpbGVuYW1l KQogICAgICAgICAgICAgcHJldHR5X3BhdGNoX2ZpbGVuYW1lID0gc2VsZi5vdXRwdXRfZmlsZW5h bWUoc2VsZi5GSUxFTkFNRV9TVUZGSVhfUFJFVFRZX1BBVENIKQogICAgICAgICAgICAgc2VsZi5f d3JpdGVfYmluYXJ5X2ZpbGUocHJldHR5X3BhdGNoX2ZpbGVuYW1lLCBwcmV0dHlfcGF0Y2gpCiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90 ZXN0X3J1bl9yZXN1bHRzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHMucHkKaW5kZXggYzQ2MGY1Yjc3ZTUzZWMxN2U1NDg5NGE3 ODJmYzk5MTFjNjhiNGZjMC4uNzYzMjM2NGQ4Yjg2NjNlNDdjMDJiNjE4ZDRiYTM3MGY0NWExYjZl YyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxz L3Rlc3RfcnVuX3Jlc3VsdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHMucHkKQEAgLTI0Myw3ICsyNDMsNyBAQCBkZWYg c3VtbWFyaXplX3Jlc3VsdHMocG9ydF9vYmosIGV4cGVjdGF0aW9ucywgaW5pdGlhbF9yZXN1bHRz LCByZXRyeV9yZXN1bHRzLCBlbgogICAgIHJlc3VsdHNbJ2ludGVycnVwdGVkJ10gPSBpbml0aWFs X3Jlc3VsdHMuaW50ZXJydXB0ZWQgICMgRG9lcyByZXN1bHRzLmh0bWwgaGF2ZSBlbm91Z2ggaW5m b3JtYXRpb24gdG8gY29tcHV0ZSB0aGlzIGl0c2VsZj8gKGJ5IGNoZWNraW5nIHRvdGFsIG51bWJl ciBvZiByZXN1bHRzIHZzLiB0b3RhbCBudW1iZXIgb2YgdGVzdHM/KQogICAgIHJlc3VsdHNbJ2xh eW91dF90ZXN0c19kaXInXSA9IHBvcnRfb2JqLmxheW91dF90ZXN0c19kaXIoKQogICAgIHJlc3Vs dHNbJ2hhc193ZGlmZiddID0gcG9ydF9vYmoud2RpZmZfYXZhaWxhYmxlKCkKLSAgICByZXN1bHRz WydoYXNfcHJldHR5X3BhdGNoJ10gPSBwb3J0X29iai5wcmV0dHlfcGF0Y2gucHJldHR5X3BhdGNo X2F2YWlsYWJsZSgpCisgICAgcmVzdWx0c1snaGFzX3ByZXR0eV9wYXRjaCddID0gcG9ydF9vYmou cHJldHR5X3BhdGNoX2F2YWlsYWJsZSgpCiAgICAgcmVzdWx0c1sncGl4ZWxfdGVzdHNfZW5hYmxl ZCddID0gcG9ydF9vYmouZ2V0X29wdGlvbigncGl4ZWxfdGVzdHMnKQogCiAgICAgdHJ5OgpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQppbmRleCBmYjY3MjZlNDZjYTFjNTYxZDQ2NzMzMzQ2 MjRkNzg2MTRlNTg5ZDI3Li4zMTE4YjMzODUwZTlmZDcxNDcwYWMzYzM4MWZmMjQ4OTRhNDhjODkx IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQpAQCAtNTEsNyArNTEsNiBAQCBleGNl cHQgSW1wb3J0RXJyb3I6CiBmcm9tIHdlYmtpdHB5LmNvbW1vbiBpbXBvcnQgZmluZF9maWxlcwog ZnJvbSB3ZWJraXRweS5jb21tb24gaW1wb3J0IHJlYWRfY2hlY2tzdW1fZnJvbV9wbmcKIGZyb20g d2Via2l0cHkuY29tbW9uLm1lbW9pemVkIGltcG9ydCBtZW1vaXplZAotZnJvbSB3ZWJraXRweS5j b21tb24ucHJldHR5cGF0Y2ggaW1wb3J0IFByZXR0eVBhdGNoCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi5zeXN0ZW0gaW1wb3J0IHBhdGgKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRp dmUgaW1wb3J0IFNjcmlwdEVycm9yCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVt aG9zdCBpbXBvcnQgU3lzdGVtSG9zdApAQCAtMTE3LDcgKzExNiw2IEBAIGNsYXNzIFBvcnQob2Jq ZWN0KToKICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbSA9IGhvc3QuZmlsZXN5c3RlbQogICAgICAg ICBzZWxmLl93ZWJraXRfZmluZGVyID0gV2ViS2l0RmluZGVyKGhvc3QuZmlsZXN5c3RlbSkKICAg ICAgICAgc2VsZi5fY29uZmlnID0gcG9ydF9jb25maWcuQ29uZmlnKHNlbGYuX2V4ZWN1dGl2ZSwg c2VsZi5fZmlsZXN5c3RlbSwgc2VsZi5wb3J0X25hbWUpCi0gICAgICAgIHNlbGYucHJldHR5X3Bh dGNoID0gUHJldHR5UGF0Y2goc2VsZi5fZXhlY3V0aXZlLCBzZWxmLnBhdGhfZnJvbV93ZWJraXRf YmFzZSgpLCBzZWxmLl9maWxlc3lzdGVtKQogCiAgICAgICAgIHNlbGYuX2hlbHBlciA9IE5vbmUK ICAgICAgICAgc2VsZi5faHR0cF9zZXJ2ZXIgPSBOb25lCkBAIC0xNDEsNiArMTM5LDEwIEBAIGNs YXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgIyBodHRwOi8vYnVncy5weXRob24ub3JnL2lzc3Vl MzIxMAogICAgICAgICBzZWxmLl93ZGlmZl9hdmFpbGFibGUgPSBOb25lCiAKKyAgICAgICAgIyBG SVhNRTogcHJldHR5cGF0Y2gucHkga25vd3MgdGhpcyBwYXRoLCB3aHkgaXMgaXQgY29waWVkIGhl cmU/CisgICAgICAgIHNlbGYuX3ByZXR0eV9wYXRjaF9wYXRoID0gc2VsZi5wYXRoX2Zyb21fd2Vi a2l0X2Jhc2UoIldlYnNpdGVzIiwgImJ1Z3Mud2Via2l0Lm9yZyIsICJQcmV0dHlQYXRjaCIsICJw cmV0dGlmeS5yYiIpCisgICAgICAgIHNlbGYuX3ByZXR0eV9wYXRjaF9hdmFpbGFibGUgPSBOb25l CisKICAgICAgICAgaWYgbm90IGhhc2F0dHIob3B0aW9ucywgJ2NvbmZpZ3VyYXRpb24nKSBvciBu b3Qgb3B0aW9ucy5jb25maWd1cmF0aW9uOgogICAgICAgICAgICAgc2VsZi5zZXRfb3B0aW9uX2Rl ZmF1bHQoJ2NvbmZpZ3VyYXRpb24nLCBzZWxmLmRlZmF1bHRfY29uZmlndXJhdGlvbigpKQogICAg ICAgICBzZWxmLl90ZXN0X2NvbmZpZ3VyYXRpb24gPSBOb25lCkBAIC0xNzYsNiArMTc4LDExIEBA IGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuX3dkaWZmX2F2YWlsYWJsZSA9 IHNlbGYuY2hlY2tfd2RpZmYobG9nZ2luZz1GYWxzZSkKICAgICAgICAgcmV0dXJuIHNlbGYuX3dk aWZmX2F2YWlsYWJsZQogCisgICAgZGVmIHByZXR0eV9wYXRjaF9hdmFpbGFibGUoc2VsZik6Cisg ICAgICAgIGlmIHNlbGYuX3ByZXR0eV9wYXRjaF9hdmFpbGFibGUgaXMgTm9uZToKKyAgICAgICAg ICAgIHNlbGYuX3ByZXR0eV9wYXRjaF9hdmFpbGFibGUgPSBzZWxmLmNoZWNrX3ByZXR0eV9wYXRj aChsb2dnaW5nPUZhbHNlKQorICAgICAgICByZXR1cm4gc2VsZi5fcHJldHR5X3BhdGNoX2F2YWls YWJsZQorCiAgICAgZGVmIHNob3VsZF9yZXRyeV9jcmFzaGVzKHNlbGYpOgogICAgICAgICByZXR1 cm4gRmFsc2UKIApAQCAtMjc0LDYgKzI4MSwyNSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAg ICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgcmV0dXJuIFRydWUKIAorICAgIGRlZiBjaGVj a19wcmV0dHlfcGF0Y2goc2VsZiwgbG9nZ2luZz1UcnVlKToKKyAgICAgICAgIiIiQ2hlY2tzIHdo ZXRoZXIgd2UgY2FuIHVzZSB0aGUgUHJldHR5UGF0Y2ggcnVieSBzY3JpcHQuIiIiCisgICAgICAg IHRyeToKKyAgICAgICAgICAgIF8gPSBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWydydWJ5 JywgJy0tdmVyc2lvbiddKQorICAgICAgICBleGNlcHQgT1NFcnJvciwgZToKKyAgICAgICAgICAg IGlmIGUuZXJybm8gaW4gW2Vycm5vLkVOT0VOVCwgZXJybm8uRUFDQ0VTLCBlcnJuby5FQ0hJTERd OgorICAgICAgICAgICAgICAgIGlmIGxvZ2dpbmc6CisgICAgICAgICAgICAgICAgICAgIF9sb2cu d2FybmluZygiUnVieSBpcyBub3QgaW5zdGFsbGVkOyBjYW4ndCBnZW5lcmF0ZSBwcmV0dHkgcGF0 Y2hlcy4iKQorICAgICAgICAgICAgICAgICAgICBfbG9nLndhcm5pbmcoJycpCisgICAgICAgICAg ICAgICAgcmV0dXJuIEZhbHNlCisKKyAgICAgICAgaWYgbm90IHNlbGYuX2ZpbGVzeXN0ZW0uZXhp c3RzKHNlbGYuX3ByZXR0eV9wYXRjaF9wYXRoKToKKyAgICAgICAgICAgIGlmIGxvZ2dpbmc6Cisg ICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCJVbmFibGUgdG8gZmluZCAlczsgY2FuJ3QgZ2Vu ZXJhdGUgcHJldHR5IHBhdGNoZXMuIiAlIHNlbGYuX3ByZXR0eV9wYXRjaF9wYXRoKQorICAgICAg ICAgICAgICAgIF9sb2cud2FybmluZygnJykKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorCisg ICAgICAgIHJldHVybiBUcnVlCisKICAgICBkZWYgY2hlY2tfd2RpZmYoc2VsZiwgbG9nZ2luZz1U cnVlKToKICAgICAgICAgaWYgbm90IHNlbGYuX3BhdGhfdG9fd2RpZmYoKToKICAgICAgICAgICAg ICMgRG9uJ3QgbmVlZCB0byBsb2cgaGVyZSBzaW5jZSB0aGlzIGlzIHRoZSBwb3J0IGNob29zaW5n IG5vdCB0byB1c2Ugd2RpZmYuCkBAIC0xMTI4LDYgKzExNTQsMzIgQEAgY2xhc3MgUG9ydChvYmpl Y3QpOgogICAgICAgICAgICAgICAgIHJldHVybiAiIgogICAgICAgICAgICAgcmFpc2UKIAorICAg ICMgVGhpcyBpcyBhIGNsYXNzIHZhcmlhYmxlIHNvIHdlIGNhbiB0ZXN0IGVycm9yIG91dHB1dCBl YXNpbHkuCisgICAgX3ByZXR0eV9wYXRjaF9lcnJvcl9odG1sID0gIkZhaWxlZCB0byBydW4gUHJl dHR5UGF0Y2gsIHNlZSBlcnJvciBsb2cuIgorCisgICAgZGVmIHByZXR0eV9wYXRjaF90ZXh0KHNl bGYsIGRpZmZfcGF0aCk6CisgICAgICAgIGlmIHNlbGYuX3ByZXR0eV9wYXRjaF9hdmFpbGFibGUg aXMgTm9uZToKKyAgICAgICAgICAgIHNlbGYuX3ByZXR0eV9wYXRjaF9hdmFpbGFibGUgPSBzZWxm LmNoZWNrX3ByZXR0eV9wYXRjaChsb2dnaW5nPUZhbHNlKQorICAgICAgICBpZiBub3Qgc2VsZi5f cHJldHR5X3BhdGNoX2F2YWlsYWJsZToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLl9wcmV0dHlf cGF0Y2hfZXJyb3JfaHRtbAorICAgICAgICBjb21tYW5kID0gKCJydWJ5IiwgIi1JIiwgc2VsZi5f ZmlsZXN5c3RlbS5kaXJuYW1lKHNlbGYuX3ByZXR0eV9wYXRjaF9wYXRoKSwKKyAgICAgICAgICAg ICAgICAgICBzZWxmLl9wcmV0dHlfcGF0Y2hfcGF0aCwgZGlmZl9wYXRoKQorICAgICAgICB0cnk6 CisgICAgICAgICAgICAjIERpZmZzIGFyZSB0cmVhdGVkIGFzIGJpbmFyeSAod2UgcGFzcyBkZWNv ZGVfb3V0cHV0PUZhbHNlKSBhcyB0aGV5CisgICAgICAgICAgICAjIG1heSBjb250YWluIG11bHRp cGxlIGZpbGVzIG9mIGNvbmZsaWN0aW5nIGVuY29kaW5ncy4KKyAgICAgICAgICAgIHJldHVybiBz ZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoY29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxzZSkK KyAgICAgICAgZXhjZXB0IE9TRXJyb3IsIGU6CisgICAgICAgICAgICAjIElmIHRoZSBzeXN0ZW0g aXMgbWlzc2luZyBydWJ5IGxvZyB0aGUgZXJyb3IgYW5kIHN0b3AgdHJ5aW5nLgorICAgICAgICAg ICAgc2VsZi5fcHJldHR5X3BhdGNoX2F2YWlsYWJsZSA9IEZhbHNlCisgICAgICAgICAgICBfbG9n LmVycm9yKCJGYWlsZWQgdG8gcnVuIFByZXR0eVBhdGNoICglcyk6ICVzIiAlIChjb21tYW5kLCBl KSkKKyAgICAgICAgICAgIHJldHVybiBzZWxmLl9wcmV0dHlfcGF0Y2hfZXJyb3JfaHRtbAorICAg ICAgICBleGNlcHQgU2NyaXB0RXJyb3IsIGU6CisgICAgICAgICAgICAjIElmIHJ1YnkgZmFpbGVk IHRvIHJ1biBmb3Igc29tZSByZWFzb24sIGxvZyB0aGUgY29tbWFuZAorICAgICAgICAgICAgIyBv dXRwdXQgYW5kIHN0b3AgdHJ5aW5nLgorICAgICAgICAgICAgc2VsZi5fcHJldHR5X3BhdGNoX2F2 YWlsYWJsZSA9IEZhbHNlCisgICAgICAgICAgICBfbG9nLmVycm9yKCJGYWlsZWQgdG8gcnVuIFBy ZXR0eVBhdGNoICglcyk6XG4lcyIgJSAoY29tbWFuZCwgZS5tZXNzYWdlX3dpdGhfb3V0cHV0KCkp KQorICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3ByZXR0eV9wYXRjaF9lcnJvcl9odG1sCisKICAg ICBkZWYgZGVmYXVsdF9jb25maWd1cmF0aW9uKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5f Y29uZmlnLmRlZmF1bHRfY29uZmlndXJhdGlvbigpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2Jhc2VfdW5pdHRlc3QucHkKaW5kZXggZTJkYTVjNjBjMDUzYjgzOWJiNzRjZTlhZmM5 Zjc2MmY4YmQ0ODFlNi4uYzA0Y2FlMGMwZDYzNDI5MzZmOWIxOTEzOGIzYmEwMGZkN2VkNjhkNSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2VfdW5pdHRlc3QucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2VfdW5pdHRlc3QucHkKQEAgLTkw LDI0ICs5MCwyNCBAQCBjbGFzcyBQb3J0VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAg IHBvcnQgPSBzZWxmLm1ha2VfcG9ydChleGVjdXRpdmU9ZXhlY3V0aXZlX21vY2suTW9ja0V4ZWN1 dGl2ZTIoZXhjZXB0aW9uPU9TRXJyb3IpKQogICAgICAgICBvYyA9IE91dHB1dENhcHR1cmUoKQog ICAgICAgICBvYy5jYXB0dXJlX291dHB1dCgpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9y dC5wcmV0dHlfcGF0Y2gucHJldHR5X3BhdGNoX3RleHQoInBhdGNoLnR4dCIpLAotICAgICAgICAg ICAgICAgICAgICAgICAgIHBvcnQucHJldHR5X3BhdGNoLnByZXR0eV9wYXRjaF9lcnJvcl9odG1s KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQucHJldHR5X3BhdGNoX3RleHQoInBhdGNo LnR4dCIpLAorICAgICAgICAgICAgICAgICAgICAgICAgIHBvcnQuX3ByZXR0eV9wYXRjaF9lcnJv cl9odG1sKQogCiAgICAgICAgICMgVGhpcyB0ZXN0cyByZXBlYXRlZCBjYWxscyB0byBtYWtlIHN1 cmUgd2UgY2FjaGUgdGhlIHJlc3VsdC4KLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LnBy ZXR0eV9wYXRjaC5wcmV0dHlfcGF0Y2hfdGV4dCgicGF0Y2gudHh0IiksCi0gICAgICAgICAgICAg ICAgICAgICAgICAgcG9ydC5wcmV0dHlfcGF0Y2gucHJldHR5X3BhdGNoX2Vycm9yX2h0bWwpCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5wcmV0dHlfcGF0Y2hfdGV4dCgicGF0Y2gudHh0 IiksCisgICAgICAgICAgICAgICAgICAgICAgICAgcG9ydC5fcHJldHR5X3BhdGNoX2Vycm9yX2h0 bWwpCiAgICAgICAgIG9jLnJlc3RvcmVfb3V0cHV0KCkKIAogICAgIGRlZiB0ZXN0X3ByZXR0eV9w YXRjaF9zY3JpcHRfZXJyb3Ioc2VsZik6CiAgICAgICAgICMgRklYTUU6IFRoaXMgaXMgc29tZSB1 Z2x5IHdoaXRlLWJveCB0ZXN0IGhhY2tpbmcgLi4uCiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2Vf cG9ydChleGVjdXRpdmU9ZXhlY3V0aXZlX21vY2suTW9ja0V4ZWN1dGl2ZTIoZXhjZXB0aW9uPVNj cmlwdEVycm9yKSkKLSAgICAgICAgcG9ydC5wcmV0dHlfcGF0Y2gucHBhdGNoX2F2YWlsYWJsZSA9 IFRydWUKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LnByZXR0eV9wYXRjaC5wcmV0dHlf cGF0Y2hfdGV4dCgicGF0Y2gudHh0IiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgcG9ydC5w cmV0dHlfcGF0Y2gucHJldHR5X3BhdGNoX2Vycm9yX2h0bWwpCisgICAgICAgIHBvcnQuX3ByZXR0 eV9wYXRjaF9hdmFpbGFibGUgPSBUcnVlCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5w cmV0dHlfcGF0Y2hfdGV4dCgicGF0Y2gudHh0IiksCisgICAgICAgICAgICAgICAgICAgICAgICAg cG9ydC5fcHJldHR5X3BhdGNoX2Vycm9yX2h0bWwpCiAKICAgICAgICAgIyBUaGlzIHRlc3RzIHJl cGVhdGVkIGNhbGxzIHRvIG1ha2Ugc3VyZSB3ZSBjYWNoZSB0aGUgcmVzdWx0LgotICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHBvcnQucHJldHR5X3BhdGNoLnByZXR0eV9wYXRjaF90ZXh0KCJwYXRj aC50eHQiKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICBwb3J0LnByZXR0eV9wYXRjaC5wcmV0 dHlfcGF0Y2hfZXJyb3JfaHRtbCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LnByZXR0 eV9wYXRjaF90ZXh0KCJwYXRjaC50eHQiKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICBwb3J0 Ll9wcmV0dHlfcGF0Y2hfZXJyb3JfaHRtbCkKIAogICAgIGRlZiBpbnRlZ3JhdGlvbl90ZXN0X3J1 bl93ZGlmZihzZWxmKToKICAgICAgICAgZXhlY3V0aXZlID0gRXhlY3V0aXZlKCkK