155017 2016-03-04 07:12:56 -0800 [check-webkit-style] Added checks for redundant virtual specifiers. 2016-03-04 09:58:46 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 annulen webkit-unassigned bfulgham commit-queue darin glenn koivisto lforschler oldest_to_newest 1170582 0 annulen 2016-03-04 07:12:56 -0800 Added 3 new checks related to virtual, override, and final specifiers: 1. When "override" is present, "virtual" is redundant. 2. When "final" is present, "virtual" is redundant. 3. When "final" is present, "override" is redundant. Inspiration was taken from current version of cpplint.py, from which our checker originates, but implementation of these checks is different. 1170583 1 272852 annulen 2016-03-04 07:15:43 -0800 Created attachment 272852 Patch 1170588 2 272852 annulen 2016-03-04 07:41:41 -0800 Comment on attachment 272852 Patch This patch does not cover cases when declaration is definition. 1170743 3 272995 annulen 2016-03-04 09:03:25 -0800 Created attachment 272995 Patch 1170753 4 darin 2016-03-04 09:08:21 -0800 (In reply to comment #0) > 3. When "final" is present, "override" is redundant. Is that true? I didn’t realize. Will the code fail to compile if we say final but it’s not an override? My global replace did not try to address this case, but I can do that now too. 1170757 5 annulen 2016-03-04 09:23:31 -0800 Yes, standard says so. I've also checked clang 3.7 and g++ 4.8. 1170913 6 272995 commit-queue 2016-03-04 09:58:42 -0800 Comment on attachment 272995 Patch Clearing flags on attachment: 272995 Committed r197567: <http://trac.webkit.org/changeset/197567> 1170914 7 commit-queue 2016-03-04 09:58:46 -0800 All reviewed patches have been landed. Closing bug. 272852 2016-03-04 07:15:43 -0800 2016-03-04 09:03:17 -0800 Patch bug-155017-20160304181527.patch text/plain 15057 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3NTE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWU4ZWU2MzBjZmY5NzRhNWQ2YTQ5YzRkZDUwZGFjZTRl MzQ4ODg2Yi4uMWRjYzgyNDJlMTY2MzhiYzVkMTcwMTcwNzAyYmM4M2VjZmZjZDdiYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDE2LTAzLTA0ICBLb25zdGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4K KworICAgICAgICBbY2hlY2std2Via2l0LXN0eWxlXSBBZGRlZCBjaGVja3MgZm9yIHJlZHVuZGFu dCB2aXJ0dWFsIHNwZWNpZmllcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTUwMTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGRlZCAzIG5ldyBjaGVja3MgcmVsYXRlZCB0byB2aXJ0dWFsLCBvdmVy cmlkZSwgYW5kIGZpbmFsIHNwZWNpZmllcnM6CisKKyAgICAgICAgMS4gV2hlbiAib3ZlcnJpZGUi IGlzIHByZXNlbnQsICJ2aXJ0dWFsIiBpcyByZWR1bmRhbnQuCisgICAgICAgIDIuIFdoZW4gImZp bmFsIiBpcyBwcmVzZW50LCAidmlydHVhbCIgaXMgcmVkdW5kYW50LgorICAgICAgICAzLiBXaGVu ICJmaW5hbCIgaXMgcHJlc2VudCwgIm92ZXJyaWRlIiBpcyByZWR1bmRhbnQuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weToKKyAgICAgICAgKF9GdW5j dGlvblN0YXRlLmJlZ2luKToKKyAgICAgICAgKF9GdW5jdGlvblN0YXRlLmlzX3ZpcnR1YWwpOgor ICAgICAgICAoX2NoZWNrX3BhcmFtZXRlcl9uYW1lX2FnYWluc3RfdGV4dCk6CisgICAgICAgIChf ZXJyb3JfcmVkdW5kYW50X3NwZWNpZmllcik6CisgICAgICAgIChjaGVja19mdW5jdGlvbl9kZWZp bml0aW9uKToKKyAgICAgICAgKENwcENoZWNrZXIpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5OgorICAgICAgICAoRnVuY3Rpb25EZXRl Y3Rpb25UZXN0LnBlcmZvcm1fZnVuY3Rpb25fZGV0ZWN0aW9uKToKKyAgICAgICAgKEZ1bmN0aW9u RGV0ZWN0aW9uVGVzdC50ZXN0X2Jhc2ljX2Z1bmN0aW9uX2RldGVjdGlvbik6CisgICAgICAgIChG dW5jdGlvbkRldGVjdGlvblRlc3QudGVzdF9mdW5jdGlvbl9kZWNsYXJhdGlvbl9kZXRlY3Rpb24p OgorICAgICAgICAoRnVuY3Rpb25EZXRlY3Rpb25UZXN0LnRlc3RfcHVyZV9mdW5jdGlvbl9kZXRl Y3Rpb24pOgorICAgICAgICAoRnVuY3Rpb25EZXRlY3Rpb25UZXN0LnRlc3Rfb3ZlcnJpZGVfYW5k X2ZpbmFsX2Z1bmN0aW9uX2RldGVjdGlvbik6CisgICAgICAgIChGdW5jdGlvbkRldGVjdGlvblRl c3QudGVzdF9ub25fZnVuY3Rpb25zKToKKyAgICAgICAgKEZ1bmN0aW9uRGV0ZWN0aW9uVGVzdC50 ZXN0X3BhcmFtZXRlcl9saXN0KToKKwogMjAxNi0wMy0wMyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0 LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE5 NzQ0Mi4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMv Y3BwLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkKaW5k ZXggNDc1ODZkYzg1M2M5OTA5NmU0Y2NmYjE0MzkyNGI0YzAwOTVhNDA3NS4uNzM3ZGY5M2ZlZmU1 NzhkNTg5ZmZiZmMzMjhlZjU2MzUzZGE4NDZiYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy9jcHAucHkKQEAgLTUyOSw5ICs1MjksMTMgQEAgY2xhc3MgX0Z1bmN0 aW9uU3RhdGUob2JqZWN0KToKICAgICAgICAgc2VsZi5pc19kZWNsYXJhdGlvbiA9IGNsZWFuX2xp bmVzLmVsaWRlZFtib2R5X3N0YXJ0X3Bvc2l0aW9uLnJvd11bYm9keV9zdGFydF9wb3NpdGlvbi5j b2x1bW5dID09ICc7JwogICAgICAgICBzZWxmLnBhcmFtZXRlcl9zdGFydF9wb3NpdGlvbiA9IHBh cmFtZXRlcl9zdGFydF9wb3NpdGlvbgogICAgICAgICBzZWxmLnBhcmFtZXRlcl9lbmRfcG9zaXRp b24gPSBwYXJhbWV0ZXJfZW5kX3Bvc2l0aW9uCisgICAgICAgIHNlbGYuaXNfZmluYWwgPSBGYWxz ZQorICAgICAgICBzZWxmLmlzX292ZXJyaWRlID0gRmFsc2UKICAgICAgICAgc2VsZi5pc19wdXJl ID0gRmFsc2UKICAgICAgICAgaWYgc2VsZi5pc19kZWNsYXJhdGlvbjoKICAgICAgICAgICAgIGNo YXJhY3RlcnNfYWZ0ZXJfcGFyYW1ldGVycyA9IFNpbmdsZUxpbmVWaWV3KGNsZWFuX2xpbmVzLmVs aWRlZCwgcGFyYW1ldGVyX2VuZF9wb3NpdGlvbiwgYm9keV9zdGFydF9wb3NpdGlvbikuc2luZ2xl X2xpbmUKKyAgICAgICAgICAgIHNlbGYuaXNfZmluYWwgPSBib29sKHNlYXJjaChyJ1xiZmluYWxc YicsIGNoYXJhY3RlcnNfYWZ0ZXJfcGFyYW1ldGVycykpCisgICAgICAgICAgICBzZWxmLmlzX292 ZXJyaWRlID0gYm9vbChzZWFyY2gocidcYm92ZXJyaWRlXGInLCBjaGFyYWN0ZXJzX2FmdGVyX3Bh cmFtZXRlcnMpKQogICAgICAgICAgICAgc2VsZi5pc19wdXJlID0gYm9vbChtYXRjaChyJ1xzKj1c cyowXHMqJywgY2hhcmFjdGVyc19hZnRlcl9wYXJhbWV0ZXJzKSkKICAgICAgICAgc2VsZi5fY2xl YW5fbGluZXMgPSBjbGVhbl9saW5lcwogICAgICAgICBzZWxmLl9wYXJhbWV0ZXJfbGlzdCA9IE5v bmUKQEAgLTU0NCw2ICs1NDgsOSBAQCBjbGFzcyBfRnVuY3Rpb25TdGF0ZShvYmplY3QpOgogICAg ICAgICAgc3RhcnRfbW9kaWZpZXJzID0gX3JmaW5kX2luX2xpbmVzKHInO3xce3xcfXwoKHByaXZh dGV8cHVibGljfHByb3RlY3RlZCk6KXwoIy4qKScsIGVsaWRlZCwgc2VsZi5wYXJhbWV0ZXJfc3Rh cnRfcG9zaXRpb24sIFBvc2l0aW9uKDAsIDApKQogICAgICAgICAgcmV0dXJuIFNpbmdsZUxpbmVW aWV3KGVsaWRlZCwgc3RhcnRfbW9kaWZpZXJzLCBzZWxmLmZ1bmN0aW9uX25hbWVfc3RhcnRfcG9z aXRpb24pLnNpbmdsZV9saW5lLnN0cmlwKCkKIAorICAgIGRlZiBpc192aXJ0dWFsKHNlbGYpOgor ICAgICAgICByZXR1cm4gYm9vbChzZWFyY2gocidcYnZpcnR1YWxcYicsIHNlbGYubW9kaWZpZXJz X2FuZF9yZXR1cm5fdHlwZSgpKSkKKwogICAgIGRlZiBwYXJhbWV0ZXJfbGlzdChzZWxmKToKICAg ICAgICAgaWYgbm90IHNlbGYuX3BhcmFtZXRlcl9saXN0OgogICAgICAgICAgICAgIyBTdG9yZSB0 aGUgZmluYWwgcmVzdWx0IGFzIGEgdHVwbGUgc2luY2UgdGhhdCBpcyBpbW11dGFibGUuCkBAIC0x NjQyLDYgKzE2NDksMTMgQEAgZGVmIF9jaGVja19wYXJhbWV0ZXJfbmFtZV9hZ2FpbnN0X3RleHQo cGFyYW1ldGVyLCB0ZXh0LCBlcnJvcik6CiAgICAgICAgIHJldHVybiBGYWxzZQogICAgIHJldHVy biBUcnVlCiAKKworZGVmIF9lcnJvcl9yZWR1bmRhbnRfc3BlY2lmaWVyKGxpbmVfbnVtYmVyLCBy ZWR1bmRhbnRfc3BlY2lmaWVyLCBnb29kX3NwZWNpZmllciwgZXJyb3IpOgorICAgIGVycm9yKGxp bmVfbnVtYmVyLCAncmVhZGFiaWxpdHkvaW5oZXJpdGFuY2UnLCA0LAorICAgICAgICAgICciJXMi IGlzIHJlZHVuZGFudCBzaW5jZSBmdW5jdGlvbiBpcyBhbHJlYWR5IGRlY2xhcmVkIGFzICIlcyIn CisgICAgICAgICAgJSAocmVkdW5kYW50X3NwZWNpZmllciwgZ29vZF9zcGVjaWZpZXIpKQorCisK IGRlZiBjaGVja19mdW5jdGlvbl9kZWZpbml0aW9uKGZpbGVuYW1lLCBmaWxlX2V4dGVuc2lvbiwg Y2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBmdW5jdGlvbl9zdGF0ZSwgZXJyb3IpOgogICAgICIi IkNoZWNrIHRoYXQgZnVuY3Rpb24gZGVmaW5pdGlvbnMgZm9yIHN0eWxlIGlzc3Vlcy4KIApAQCAt MTY3NCw2ICsxNjg4LDE2IEBAIGRlZiBjaGVja19mdW5jdGlvbl9kZWZpbml0aW9uKGZpbGVuYW1l LCBmaWxlX2V4dGVuc2lvbiwgY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyCiAgICAgICAgIGlmIG5v dCBfY2hlY2tfcGFyYW1ldGVyX25hbWVfYWdhaW5zdF90ZXh0KHBhcmFtZXRlciwgcGFyYW1ldGVy LnR5cGUsIGVycm9yKToKICAgICAgICAgICAgIGNvbnRpbnVlICAjIFNpbmNlIGFuIGVycm9yIHdh cyBub3RlZCBmb3IgdGhpcyBuYW1lLCBtb3ZlIHRvIHRoZSBuZXh0IHBhcmFtZXRlci4KIAorICAg IGlmIGZ1bmN0aW9uX3N0YXRlLmlzX2RlY2xhcmF0aW9uOgorICAgICAgICBpZiBmdW5jdGlvbl9z dGF0ZS5pc192aXJ0dWFsKCkgYW5kIGZ1bmN0aW9uX3N0YXRlLmlzX292ZXJyaWRlOgorICAgICAg ICAgICAgX2Vycm9yX3JlZHVuZGFudF9zcGVjaWZpZXIobGluZV9udW1iZXIsICd2aXJ0dWFsJywg J292ZXJyaWRlJywgZXJyb3IpCisKKyAgICAgICAgaWYgZnVuY3Rpb25fc3RhdGUuaXNfdmlydHVh bCgpIGFuZCBmdW5jdGlvbl9zdGF0ZS5pc19maW5hbDoKKyAgICAgICAgICAgIF9lcnJvcl9yZWR1 bmRhbnRfc3BlY2lmaWVyKGxpbmVfbnVtYmVyLCAndmlydHVhbCcsICdmaW5hbCcsIGVycm9yKQor CisgICAgICAgIGlmIGZ1bmN0aW9uX3N0YXRlLmlzX292ZXJyaWRlIGFuZCBmdW5jdGlvbl9zdGF0 ZS5pc19maW5hbDoKKyAgICAgICAgICAgIF9lcnJvcl9yZWR1bmRhbnRfc3BlY2lmaWVyKGxpbmVf bnVtYmVyLCAnb3ZlcnJpZGUnLCAnZmluYWwnLCBlcnJvcikKKwogCiBkZWYgY2hlY2tfZm9yX2xl YWt5X3BhdHRlcm5zKGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZnVuY3Rpb25fc3RhdGUsIGVy cm9yKToKICAgICAiIiJDaGVjayBmb3IgY29uc3RydWN0cyBrbm93biB0byBiZSBsZWFrIHByb25l LgpAQCAtMzgxMSw2ICszODM1LDcgQEAgY2xhc3MgQ3BwQ2hlY2tlcihvYmplY3QpOgogICAgICAg ICAncmVhZGFiaWxpdHkvZW51bV9jYXNpbmcnLAogICAgICAgICAncmVhZGFiaWxpdHkvZm5fc2l6 ZScsCiAgICAgICAgICdyZWFkYWJpbGl0eS9mdW5jdGlvbicsCisgICAgICAgICdyZWFkYWJpbGl0 eS9pbmhlcml0YW5jZScsCiAgICAgICAgICdyZWFkYWJpbGl0eS9tdWx0aWxpbmVfY29tbWVudCcs CiAgICAgICAgICdyZWFkYWJpbGl0eS9tdWx0aWxpbmVfc3RyaW5nJywKICAgICAgICAgJ3JlYWRh YmlsaXR5L3BhcmFtZXRlcl9uYW1lJywKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkKaW5kZXggNWI4MzdjYTBhNDQzYzAzOTQy NzQ0YzFiYjY0ODhlOTQ3MDliNTdhYy4uOThmOGI5MGNlMGY4YWRhNDBhNTA2ZTRhMjBiOTNhY2Q4 NjA5N2NlNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vy cy9jcHBfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2Vycy9jcHBfdW5pdHRlc3QucHkKQEAgLTM3NCw3ICszNzQsMTAgQEAgY2xhc3MgRnVuY3Rpb25E ZXRlY3Rpb25UZXN0KENwcFN0eWxlVGVzdEJhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KGZ1bmN0aW9uX3N0YXRlLmluX2FfZnVuY3Rpb24sIFRydWUpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoZnVuY3Rpb25fc3RhdGUuY3VycmVudF9mdW5jdGlvbiwgZnVuY3Rpb25faW5mb3JtYXRp b25bJ25hbWUnXSArICcoKScpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZnVuY3Rpb25fc3Rh dGUubW9kaWZpZXJzX2FuZF9yZXR1cm5fdHlwZSgpLCBmdW5jdGlvbl9pbmZvcm1hdGlvblsnbW9k aWZpZXJzX2FuZF9yZXR1cm5fdHlwZSddKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGZ1bmN0 aW9uX3N0YXRlLmlzX2ZpbmFsLCBmdW5jdGlvbl9pbmZvcm1hdGlvblsnaXNfZmluYWwnXSkKKyAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChmdW5jdGlvbl9zdGF0ZS5pc19vdmVycmlkZSwgZnVuY3Rp b25faW5mb3JtYXRpb25bJ2lzX292ZXJyaWRlJ10pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo ZnVuY3Rpb25fc3RhdGUuaXNfcHVyZSwgZnVuY3Rpb25faW5mb3JtYXRpb25bJ2lzX3B1cmUnXSkK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChmdW5jdGlvbl9zdGF0ZS5pc192aXJ0dWFsKCksIGZ1 bmN0aW9uX2luZm9ybWF0aW9uWydpc192aXJ0dWFsJ10pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoZnVuY3Rpb25fc3RhdGUuaXNfZGVjbGFyYXRpb24sIGZ1bmN0aW9uX2luZm9ybWF0aW9uWydp c19kZWNsYXJhdGlvbiddKQogICAgICAgICBzZWxmLmFzc2VydF9wb3NpdGlvbnNfZXF1YWwoZnVu Y3Rpb25fc3RhdGUuZnVuY3Rpb25fbmFtZV9zdGFydF9wb3NpdGlvbiwgZnVuY3Rpb25faW5mb3Jt YXRpb25bJ2Z1bmN0aW9uX25hbWVfc3RhcnRfcG9zaXRpb24nXSkKICAgICAgICAgc2VsZi5hc3Nl cnRfcG9zaXRpb25zX2VxdWFsKGZ1bmN0aW9uX3N0YXRlLnBhcmFtZXRlcl9zdGFydF9wb3NpdGlv biwgZnVuY3Rpb25faW5mb3JtYXRpb25bJ3BhcmFtZXRlcl9zdGFydF9wb3NpdGlvbiddKQpAQCAt NDAzLDYgKzQwNiw5IEBAIGNsYXNzIEZ1bmN0aW9uRGV0ZWN0aW9uVGVzdChDcHBTdHlsZVRlc3RC YXNlKToKICAgICAgICAgICAgICAncGFyYW1ldGVyX2VuZF9wb3NpdGlvbic6ICgwLCAyOSksCiAg ICAgICAgICAgICAgJ2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoMCwgMzApLAogICAgICAgICAgICAg ICdlbmRfcG9zaXRpb24nOiAoMSwgMSksCisgICAgICAgICAgICAgJ2lzX2ZpbmFsJzogRmFsc2Us CisgICAgICAgICAgICAgJ2lzX292ZXJyaWRlJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX3Zp cnR1YWwnOiBGYWxzZSwKICAgICAgICAgICAgICAnaXNfcHVyZSc6IEZhbHNlLAogICAgICAgICAg ICAgICdpc19kZWNsYXJhdGlvbic6IEZhbHNlfSkKIApAQCAtNDE2LDYgKzQyMiw5IEBAIGNsYXNz IEZ1bmN0aW9uRGV0ZWN0aW9uVGVzdChDcHBTdHlsZVRlc3RCYXNlKToKICAgICAgICAgICAgICAn cGFyYW1ldGVyX2VuZF9wb3NpdGlvbic6ICgwLCAyMyksCiAgICAgICAgICAgICAgJ2JvZHlfc3Rh cnRfcG9zaXRpb24nOiAoMCwgMjMpLAogICAgICAgICAgICAgICdlbmRfcG9zaXRpb24nOiAoMCwg MjQpLAorICAgICAgICAgICAgICdpc19maW5hbCc6IEZhbHNlLAorICAgICAgICAgICAgICdpc19v dmVycmlkZSc6IEZhbHNlLAorICAgICAgICAgICAgICdpc192aXJ0dWFsJzogRmFsc2UsCiAgICAg ICAgICAgICAgJ2lzX3B1cmUnOiBGYWxzZSwKICAgICAgICAgICAgICAnaXNfZGVjbGFyYXRpb24n OiBUcnVlfSkKIApAQCAtNDI4LDYgKzQzNyw5IEBAIGNsYXNzIEZ1bmN0aW9uRGV0ZWN0aW9uVGVz dChDcHBTdHlsZVRlc3RCYXNlKToKICAgICAgICAgICAgICAncGFyYW1ldGVyX2VuZF9wb3NpdGlv bic6ICgwLCA3NiksCiAgICAgICAgICAgICAgJ2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoMCwgNzYp LAogICAgICAgICAgICAgICdlbmRfcG9zaXRpb24nOiAoMCwgNzcpLAorICAgICAgICAgICAgICdp c19maW5hbCc6IEZhbHNlLAorICAgICAgICAgICAgICdpc19vdmVycmlkZSc6IEZhbHNlLAorICAg ICAgICAgICAgICdpc192aXJ0dWFsJzogRmFsc2UsCiAgICAgICAgICAgICAgJ2lzX3B1cmUnOiBG YWxzZSwKICAgICAgICAgICAgICAnaXNfZGVjbGFyYXRpb24nOiBUcnVlfSkKIApAQCAtNDQwLDYg KzQ1Miw5IEBAIGNsYXNzIEZ1bmN0aW9uRGV0ZWN0aW9uVGVzdChDcHBTdHlsZVRlc3RCYXNlKToK ICAgICAgICAgICAgICAncGFyYW1ldGVyX2VuZF9wb3NpdGlvbic6ICgwLCA3NiksCiAgICAgICAg ICAgICAgJ2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoMCwgNzYpLAogICAgICAgICAgICAgICdlbmRf cG9zaXRpb24nOiAoMCwgNzcpLAorICAgICAgICAgICAgICdpc19maW5hbCc6IEZhbHNlLAorICAg ICAgICAgICAgICdpc19vdmVycmlkZSc6IEZhbHNlLAorICAgICAgICAgICAgICdpc192aXJ0dWFs JzogRmFsc2UsCiAgICAgICAgICAgICAgJ2lzX3B1cmUnOiBGYWxzZSwKICAgICAgICAgICAgICAn aXNfZGVjbGFyYXRpb24nOiBUcnVlfSkKIApAQCAtNDUyLDYgKzQ2Nyw5IEBAIGNsYXNzIEZ1bmN0 aW9uRGV0ZWN0aW9uVGVzdChDcHBTdHlsZVRlc3RCYXNlKToKICAgICAgICAgICAgICAncGFyYW1l dGVyX2VuZF9wb3NpdGlvbic6ICgwLCA3NyksCiAgICAgICAgICAgICAgJ2JvZHlfc3RhcnRfcG9z aXRpb24nOiAoMCwgNzcpLAogICAgICAgICAgICAgICdlbmRfcG9zaXRpb24nOiAoMCwgNzgpLAor ICAgICAgICAgICAgICdpc19maW5hbCc6IEZhbHNlLAorICAgICAgICAgICAgICdpc19vdmVycmlk ZSc6IEZhbHNlLAorICAgICAgICAgICAgICdpc192aXJ0dWFsJzogRmFsc2UsCiAgICAgICAgICAg ICAgJ2lzX3B1cmUnOiBGYWxzZSwKICAgICAgICAgICAgICAnaXNfZGVjbGFyYXRpb24nOiBUcnVl fSkKIApAQCAtNDY0LDYgKzQ4Miw5IEBAIGNsYXNzIEZ1bmN0aW9uRGV0ZWN0aW9uVGVzdChDcHBT dHlsZVRlc3RCYXNlKToKICAgICAgICAgICAgICAncGFyYW1ldGVyX2VuZF9wb3NpdGlvbic6ICgw LCA3NiksCiAgICAgICAgICAgICAgJ2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoMCwgNzYpLAogICAg ICAgICAgICAgICdlbmRfcG9zaXRpb24nOiAoMCwgNzcpLAorICAgICAgICAgICAgICdpc19maW5h bCc6IEZhbHNlLAorICAgICAgICAgICAgICdpc19vdmVycmlkZSc6IEZhbHNlLAorICAgICAgICAg ICAgICdpc192aXJ0dWFsJzogRmFsc2UsCiAgICAgICAgICAgICAgJ2lzX3B1cmUnOiBGYWxzZSwK ICAgICAgICAgICAgICAnaXNfZGVjbGFyYXRpb24nOiBUcnVlfSkKIApAQCAtNDc3LDYgKzQ5OCw5 IEBAIGNsYXNzIEZ1bmN0aW9uRGV0ZWN0aW9uVGVzdChDcHBTdHlsZVRlc3RCYXNlKToKICAgICAg ICAgICAgICAncGFyYW1ldGVyX2VuZF9wb3NpdGlvbic6ICgwLCA0MSksCiAgICAgICAgICAgICAg J2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoMCwgNDEpLAogICAgICAgICAgICAgICdlbmRfcG9zaXRp b24nOiAoMCwgNDIpLAorICAgICAgICAgICAgICdpc19maW5hbCc6IEZhbHNlLAorICAgICAgICAg ICAgICdpc19vdmVycmlkZSc6IEZhbHNlLAorICAgICAgICAgICAgICdpc192aXJ0dWFsJzogVHJ1 ZSwKICAgICAgICAgICAgICAnaXNfcHVyZSc6IEZhbHNlLAogICAgICAgICAgICAgICdpc19kZWNs YXJhdGlvbic6IFRydWV9KQogCkBAIC00ODksNiArNTEzLDkgQEAgY2xhc3MgRnVuY3Rpb25EZXRl Y3Rpb25UZXN0KENwcFN0eWxlVGVzdEJhc2UpOgogICAgICAgICAgICAgICdwYXJhbWV0ZXJfZW5k X3Bvc2l0aW9uJzogKDAsIDM3KSwKICAgICAgICAgICAgICAnYm9keV9zdGFydF9wb3NpdGlvbic6 ICgwLCA0MSksCiAgICAgICAgICAgICAgJ2VuZF9wb3NpdGlvbic6ICgwLCA0MiksCisgICAgICAg ICAgICAgJ2lzX2ZpbmFsJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX292ZXJyaWRlJzogRmFs c2UsCisgICAgICAgICAgICAgJ2lzX3ZpcnR1YWwnOiBUcnVlLAogICAgICAgICAgICAgICdpc19w dXJlJzogVHJ1ZSwKICAgICAgICAgICAgICAnaXNfZGVjbGFyYXRpb24nOiBUcnVlfSkKIApAQCAt NTA0LDkgKzUzMSw3NSBAQCBjbGFzcyBGdW5jdGlvbkRldGVjdGlvblRlc3QoQ3BwU3R5bGVUZXN0 QmFzZSk6CiAgICAgICAgICAgICAgJ3BhcmFtZXRlcl9lbmRfcG9zaXRpb24nOiAoMCwgMzcpLAog ICAgICAgICAgICAgICdib2R5X3N0YXJ0X3Bvc2l0aW9uJzogKDIsIDMpLAogICAgICAgICAgICAg ICdlbmRfcG9zaXRpb24nOiAoMiwgNCksCisgICAgICAgICAgICAgJ2lzX2ZpbmFsJzogRmFsc2Us CisgICAgICAgICAgICAgJ2lzX292ZXJyaWRlJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX3Zp cnR1YWwnOiBUcnVlLAogICAgICAgICAgICAgICdpc19wdXJlJzogVHJ1ZSwKICAgICAgICAgICAg ICAnaXNfZGVjbGFyYXRpb24nOiBUcnVlfSkKIAorICAgIGRlZiB0ZXN0X292ZXJyaWRlX2FuZF9m aW5hbF9mdW5jdGlvbl9kZXRlY3Rpb24oc2VsZik6CisgICAgICAgIHNlbGYucGVyZm9ybV9mdW5j dGlvbl9kZXRlY3Rpb24oCisgICAgICAgICAgICBbJ3ZvaWQgdGhlVGVzdEZ1bmN0aW9uTmFtZShp bnQgb3ZlcnJpZGUsIGludCBmaW5hbCk7J10sCisgICAgICAgICAgICB7J25hbWUnOiAndGhlVGVz dEZ1bmN0aW9uTmFtZScsCisgICAgICAgICAgICAgJ21vZGlmaWVyc19hbmRfcmV0dXJuX3R5cGUn OiAndm9pZCcsCisgICAgICAgICAgICAgJ2Z1bmN0aW9uX25hbWVfc3RhcnRfcG9zaXRpb24nOiAo MCwgNSksCisgICAgICAgICAgICAgJ3BhcmFtZXRlcl9zdGFydF9wb3NpdGlvbic6ICgwLCAyNCks CisgICAgICAgICAgICAgJ3BhcmFtZXRlcl9lbmRfcG9zaXRpb24nOiAoMCwgNDkpLAorICAgICAg ICAgICAgICdib2R5X3N0YXJ0X3Bvc2l0aW9uJzogKDAsIDQ5KSwKKyAgICAgICAgICAgICAnZW5k X3Bvc2l0aW9uJzogKDAsIDUwKSwKKyAgICAgICAgICAgICAnaXNfZmluYWwnOiBGYWxzZSwKKyAg ICAgICAgICAgICAnaXNfb3ZlcnJpZGUnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfdmlydHVh bCc6IEZhbHNlLAorICAgICAgICAgICAgICdpc19wdXJlJzogRmFsc2UsCisgICAgICAgICAgICAg J2lzX2RlY2xhcmF0aW9uJzogVHJ1ZX0pCisKKyAgICAgICAgc2VsZi5wZXJmb3JtX2Z1bmN0aW9u X2RldGVjdGlvbigKKyAgICAgICAgICAgIFsndm9pZCB0aGVUZXN0RnVuY3Rpb25OYW1lKGludCBm aW5hbCkgb3ZlcnJpZGU7J10sCisgICAgICAgICAgICB7J25hbWUnOiAndGhlVGVzdEZ1bmN0aW9u TmFtZScsCisgICAgICAgICAgICAgJ21vZGlmaWVyc19hbmRfcmV0dXJuX3R5cGUnOiAndm9pZCcs CisgICAgICAgICAgICAgJ2Z1bmN0aW9uX25hbWVfc3RhcnRfcG9zaXRpb24nOiAoMCwgNSksCisg ICAgICAgICAgICAgJ3BhcmFtZXRlcl9zdGFydF9wb3NpdGlvbic6ICgwLCAyNCksCisgICAgICAg ICAgICAgJ3BhcmFtZXRlcl9lbmRfcG9zaXRpb24nOiAoMCwgMzUpLAorICAgICAgICAgICAgICdi b2R5X3N0YXJ0X3Bvc2l0aW9uJzogKDAsIDQ0KSwKKyAgICAgICAgICAgICAnZW5kX3Bvc2l0aW9u JzogKDAsIDQ1KSwKKyAgICAgICAgICAgICAnaXNfZmluYWwnOiBGYWxzZSwKKyAgICAgICAgICAg ICAnaXNfb3ZlcnJpZGUnOiBUcnVlLAorICAgICAgICAgICAgICdpc192aXJ0dWFsJzogRmFsc2Us CisgICAgICAgICAgICAgJ2lzX3B1cmUnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfZGVjbGFy YXRpb24nOiBUcnVlfSkKKworICAgICAgICBzZWxmLnBlcmZvcm1fZnVuY3Rpb25fZGV0ZWN0aW9u KAorICAgICAgICAgICAgWyd2aXJ0dWFsIHZvaWQgdGhlVGVzdEZ1bmN0aW9uTmFtZShpbnQgb3Zl cnJpZGUpIGZpbmFsOyddLAorICAgICAgICAgICAgeyduYW1lJzogJ3RoZVRlc3RGdW5jdGlvbk5h bWUnLAorICAgICAgICAgICAgICdtb2RpZmllcnNfYW5kX3JldHVybl90eXBlJzogJ3ZpcnR1YWwg dm9pZCcsCisgICAgICAgICAgICAgJ2Z1bmN0aW9uX25hbWVfc3RhcnRfcG9zaXRpb24nOiAoMCwg MTMpLAorICAgICAgICAgICAgICdwYXJhbWV0ZXJfc3RhcnRfcG9zaXRpb24nOiAoMCwgMzIpLAor ICAgICAgICAgICAgICdwYXJhbWV0ZXJfZW5kX3Bvc2l0aW9uJzogKDAsIDQ2KSwKKyAgICAgICAg ICAgICAnYm9keV9zdGFydF9wb3NpdGlvbic6ICgwLCA1MiksCisgICAgICAgICAgICAgJ2VuZF9w b3NpdGlvbic6ICgwLCA1MyksCisgICAgICAgICAgICAgJ2lzX2ZpbmFsJzogVHJ1ZSwKKyAgICAg ICAgICAgICAnaXNfb3ZlcnJpZGUnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfdmlydHVhbCc6 IFRydWUsCisgICAgICAgICAgICAgJ2lzX3B1cmUnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNf ZGVjbGFyYXRpb24nOiBUcnVlfSkKKworICAgICAgICBzZWxmLnBlcmZvcm1fZnVuY3Rpb25fZGV0 ZWN0aW9uKAorICAgICAgICAgICAgWyd2b2lkIHRoZVRlc3RGdW5jdGlvbk5hbWUoKScsCisgICAg ICAgICAgICAgJ292ZXJyaWRlJywKKyAgICAgICAgICAgICAnZmluYWw7J10sCisgICAgICAgICAg ICB7J25hbWUnOiAndGhlVGVzdEZ1bmN0aW9uTmFtZScsCisgICAgICAgICAgICAgJ21vZGlmaWVy c19hbmRfcmV0dXJuX3R5cGUnOiAndm9pZCcsCisgICAgICAgICAgICAgJ2Z1bmN0aW9uX25hbWVf c3RhcnRfcG9zaXRpb24nOiAoMCwgNSksCisgICAgICAgICAgICAgJ3BhcmFtZXRlcl9zdGFydF9w b3NpdGlvbic6ICgwLCAyNCksCisgICAgICAgICAgICAgJ3BhcmFtZXRlcl9lbmRfcG9zaXRpb24n OiAoMCwgMjYpLAorICAgICAgICAgICAgICdib2R5X3N0YXJ0X3Bvc2l0aW9uJzogKDIsIDUpLAor ICAgICAgICAgICAgICdlbmRfcG9zaXRpb24nOiAoMiwgNiksCisgICAgICAgICAgICAgJ2lzX2Zp bmFsJzogVHJ1ZSwKKyAgICAgICAgICAgICAnaXNfb3ZlcnJpZGUnOiBUcnVlLAorICAgICAgICAg ICAgICdpc192aXJ0dWFsJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX3B1cmUnOiBGYWxzZSwK KyAgICAgICAgICAgICAnaXNfZGVjbGFyYXRpb24nOiBUcnVlfSkKKwogICAgIGRlZiB0ZXN0X2ln bm9yZV9tYWNyb3Moc2VsZik6CiAgICAgICAgIHNlbGYucGVyZm9ybV9mdW5jdGlvbl9kZXRlY3Rp b24oWyd2b2lkIGFGdW5jdGlvbk5hbWUoaW50KTsgXFwnXSwgTm9uZSkKIApAQCAtNTI1LDYgKzYx OCw5IEBAIGNsYXNzIEZ1bmN0aW9uRGV0ZWN0aW9uVGVzdChDcHBTdHlsZVRlc3RCYXNlKToKICAg ICAgICAgICAgICAncGFyYW1ldGVyX2VuZF9wb3NpdGlvbic6ICgyLCAxKSwKICAgICAgICAgICAg ICAnYm9keV9zdGFydF9wb3NpdGlvbic6ICgyLCAxKSwKICAgICAgICAgICAgICAnZW5kX3Bvc2l0 aW9uJzogKDIsIDIpLAorICAgICAgICAgICAgICdpc19maW5hbCc6IEZhbHNlLAorICAgICAgICAg ICAgICdpc19vdmVycmlkZSc6IEZhbHNlLAorICAgICAgICAgICAgICdpc192aXJ0dWFsJzogRmFs c2UsCiAgICAgICAgICAgICAgJ2lzX3B1cmUnOiBGYWxzZSwKICAgICAgICAgICAgICAnaXNfZGVj bGFyYXRpb24nOiBUcnVlfSkKIApAQCAtNTQyLDYgKzYzOCw5IEBAIGNsYXNzIEZ1bmN0aW9uRGV0 ZWN0aW9uVGVzdChDcHBTdHlsZVRlc3RCYXNlKToKICAgICAgICAgICAgICAncGFyYW1ldGVyX2Vu ZF9wb3NpdGlvbic6ICgwLCAxOSksCiAgICAgICAgICAgICAgJ2JvZHlfc3RhcnRfcG9zaXRpb24n OiAoMCwgMTkpLAogICAgICAgICAgICAgICdlbmRfcG9zaXRpb24nOiAoMCwgMjApLAorICAgICAg ICAgICAgICdpc19maW5hbCc6IEZhbHNlLAorICAgICAgICAgICAgICdpc19vdmVycmlkZSc6IEZh bHNlLAorICAgICAgICAgICAgICdpc192aXJ0dWFsJzogRmFsc2UsCiAgICAgICAgICAgICAgJ2lz X3B1cmUnOiBGYWxzZSwKICAgICAgICAgICAgICAnaXNfZGVjbGFyYXRpb24nOiBUcnVlLAogICAg ICAgICAgICAgICdwYXJhbWV0ZXJfbGlzdCc6ICgpfSkKQEAgLTU1Niw2ICs2NTUsOSBAQCBjbGFz cyBGdW5jdGlvbkRldGVjdGlvblRlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAgICAgICAg J3BhcmFtZXRlcl9lbmRfcG9zaXRpb24nOiAoMCwgMjIpLAogICAgICAgICAgICAgICdib2R5X3N0 YXJ0X3Bvc2l0aW9uJzogKDAsIDIyKSwKICAgICAgICAgICAgICAnZW5kX3Bvc2l0aW9uJzogKDAs IDIzKSwKKyAgICAgICAgICAgICAnaXNfZmluYWwnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNf b3ZlcnJpZGUnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfdmlydHVhbCc6IEZhbHNlLAogICAg ICAgICAgICAgICdpc19wdXJlJzogRmFsc2UsCiAgICAgICAgICAgICAgJ2lzX2RlY2xhcmF0aW9u JzogVHJ1ZSwKICAgICAgICAgICAgICAncGFyYW1ldGVyX2xpc3QnOgpAQCAtNTcxLDYgKzY3Myw5 IEBAIGNsYXNzIEZ1bmN0aW9uRGV0ZWN0aW9uVGVzdChDcHBTdHlsZVRlc3RCYXNlKToKICAgICAg ICAgICAgICAncGFyYW1ldGVyX2VuZF9wb3NpdGlvbic6ICgwLCA3NiksCiAgICAgICAgICAgICAg J2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoMCwgNzYpLAogICAgICAgICAgICAgICdlbmRfcG9zaXRp b24nOiAoMCwgNzcpLAorICAgICAgICAgICAgICdpc19maW5hbCc6IEZhbHNlLAorICAgICAgICAg ICAgICdpc19vdmVycmlkZSc6IEZhbHNlLAorICAgICAgICAgICAgICdpc192aXJ0dWFsJzogRmFs c2UsCiAgICAgICAgICAgICAgJ2lzX3B1cmUnOiBGYWxzZSwKICAgICAgICAgICAgICAnaXNfZGVj bGFyYXRpb24nOiBUcnVlLAogICAgICAgICAgICAgICdwYXJhbWV0ZXJfbGlzdCc6CkBAIC01ODks NiArNjk0LDkgQEAgY2xhc3MgRnVuY3Rpb25EZXRlY3Rpb25UZXN0KENwcFN0eWxlVGVzdEJhc2Up OgogICAgICAgICAgICAgICdwYXJhbWV0ZXJfZW5kX3Bvc2l0aW9uJzogKDAsIDE0NyksCiAgICAg ICAgICAgICAgJ2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoMCwgMTQ3KSwKICAgICAgICAgICAgICAn ZW5kX3Bvc2l0aW9uJzogKDAsIDE0OCksCisgICAgICAgICAgICAgJ2lzX2ZpbmFsJzogRmFsc2Us CisgICAgICAgICAgICAgJ2lzX292ZXJyaWRlJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX3Zp cnR1YWwnOiBUcnVlLAogICAgICAgICAgICAgICdpc19wdXJlJzogRmFsc2UsCiAgICAgICAgICAg ICAgJ2lzX2RlY2xhcmF0aW9uJzogVHJ1ZSwKICAgICAgICAgICAgICAncGFyYW1ldGVyX2xpc3Qn OgpAQCAtNjEzLDYgKzcyMSw5IEBAIGNsYXNzIEZ1bmN0aW9uRGV0ZWN0aW9uVGVzdChDcHBTdHls ZVRlc3RCYXNlKToKICAgICAgICAgICAgICAncGFyYW1ldGVyX2VuZF9wb3NpdGlvbic6ICg1LCAx NyksCiAgICAgICAgICAgICAgJ2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoNSwgMTcpLAogICAgICAg ICAgICAgICdlbmRfcG9zaXRpb24nOiAoNSwgMTgpLAorICAgICAgICAgICAgICdpc19maW5hbCc6 IEZhbHNlLAorICAgICAgICAgICAgICdpc19vdmVycmlkZSc6IEZhbHNlLAorICAgICAgICAgICAg ICdpc192aXJ0dWFsJzogVHJ1ZSwKICAgICAgICAgICAgICAnaXNfcHVyZSc6IEZhbHNlLAogICAg ICAgICAgICAgICdpc19kZWNsYXJhdGlvbic6IFRydWUsCiAgICAgICAgICAgICAgJ3BhcmFtZXRl cl9saXN0JzoK 272995 2016-03-04 09:03:25 -0800 2016-03-04 09:58:42 -0800 Patch bug-155017-20160304200310.patch text/plain 15880 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3NTYzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGVkMDRkOWNlYTYxYjNhZDdiYzk2NWYxMzdmN2MxN2Vl NWFkODU4OC4uNWY0OTc2YjMwN2JlY2E3ZDE0NzE4YzU2ZGNlYWU3NGMxMTZhZGQyNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDE2LTAzLTA0ICBLb25zdGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4K KworICAgICAgICBbY2hlY2std2Via2l0LXN0eWxlXSBBZGRlZCBjaGVja3MgZm9yIHJlZHVuZGFu dCB2aXJ0dWFsIHNwZWNpZmllcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTUwMTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGRlZCAzIG5ldyBjaGVja3MgcmVsYXRlZCB0byB2aXJ0dWFsLCBvdmVy cmlkZSwgYW5kIGZpbmFsIHNwZWNpZmllcnM6CisKKyAgICAgICAgMS4gV2hlbiAib3ZlcnJpZGUi IGlzIHByZXNlbnQsICJ2aXJ0dWFsIiBpcyByZWR1bmRhbnQuCisgICAgICAgIDIuIFdoZW4gImZp bmFsIiBpcyBwcmVzZW50LCAidmlydHVhbCIgaXMgcmVkdW5kYW50LgorICAgICAgICAzLiBXaGVu ICJmaW5hbCIgaXMgcHJlc2VudCwgIm92ZXJyaWRlIiBpcyByZWR1bmRhbnQuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weToKKyAgICAgICAgKF9GdW5j dGlvblN0YXRlLmJlZ2luKToKKyAgICAgICAgKF9GdW5jdGlvblN0YXRlLmlzX3ZpcnR1YWwpOgor ICAgICAgICAoX2NoZWNrX3BhcmFtZXRlcl9uYW1lX2FnYWluc3RfdGV4dCk6CisgICAgICAgIChf ZXJyb3JfcmVkdW5kYW50X3NwZWNpZmllcik6CisgICAgICAgIChjaGVja19mdW5jdGlvbl9kZWZp bml0aW9uKToKKyAgICAgICAgKENwcENoZWNrZXIpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5OgorICAgICAgICAoRnVuY3Rpb25EZXRl Y3Rpb25UZXN0LnBlcmZvcm1fZnVuY3Rpb25fZGV0ZWN0aW9uKToKKyAgICAgICAgKEZ1bmN0aW9u RGV0ZWN0aW9uVGVzdC50ZXN0X2Jhc2ljX2Z1bmN0aW9uX2RldGVjdGlvbik6CisgICAgICAgIChG dW5jdGlvbkRldGVjdGlvblRlc3QudGVzdF9mdW5jdGlvbl9kZWNsYXJhdGlvbl9kZXRlY3Rpb24p OgorICAgICAgICAoRnVuY3Rpb25EZXRlY3Rpb25UZXN0LnRlc3RfcHVyZV9mdW5jdGlvbl9kZXRl Y3Rpb24pOgorICAgICAgICAoRnVuY3Rpb25EZXRlY3Rpb25UZXN0LnRlc3Rfb3ZlcnJpZGVfYW5k X2ZpbmFsX2Z1bmN0aW9uX2RldGVjdGlvbik6CisgICAgICAgIChGdW5jdGlvbkRldGVjdGlvblRl c3QudGVzdF9ub25fZnVuY3Rpb25zKToKKyAgICAgICAgKEZ1bmN0aW9uRGV0ZWN0aW9uVGVzdC50 ZXN0X3BhcmFtZXRlcl9saXN0KToKKwogMjAxNi0wMy0wMyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBh cHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlICJ2aXJ0dWFsIiBmcm9tIGFsbCBsaW5lcyB0aGF0 IGhhdmUgYm90aCAidmlydHVhbCIgYW5kICJvdmVycmlkZSIuCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CmluZGV4IDQ3NTg2ZGM4NTNjOTkwOTZlNGNjZmIx NDM5MjRiNGMwMDk1YTQwNzUuLmM0NmFlMTBmNTU2OTRhOTI5YTAzMjhhYWZlNTcyMTY5OWUzNWRm M2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3Bw LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CkBA IC01MjksMTAgKzUyOSwxMyBAQCBjbGFzcyBfRnVuY3Rpb25TdGF0ZShvYmplY3QpOgogICAgICAg ICBzZWxmLmlzX2RlY2xhcmF0aW9uID0gY2xlYW5fbGluZXMuZWxpZGVkW2JvZHlfc3RhcnRfcG9z aXRpb24ucm93XVtib2R5X3N0YXJ0X3Bvc2l0aW9uLmNvbHVtbl0gPT0gJzsnCiAgICAgICAgIHNl bGYucGFyYW1ldGVyX3N0YXJ0X3Bvc2l0aW9uID0gcGFyYW1ldGVyX3N0YXJ0X3Bvc2l0aW9uCiAg ICAgICAgIHNlbGYucGFyYW1ldGVyX2VuZF9wb3NpdGlvbiA9IHBhcmFtZXRlcl9lbmRfcG9zaXRp b24KKyAgICAgICAgc2VsZi5pc19maW5hbCA9IEZhbHNlCisgICAgICAgIHNlbGYuaXNfb3ZlcnJp ZGUgPSBGYWxzZQogICAgICAgICBzZWxmLmlzX3B1cmUgPSBGYWxzZQotICAgICAgICBpZiBzZWxm LmlzX2RlY2xhcmF0aW9uOgotICAgICAgICAgICAgY2hhcmFjdGVyc19hZnRlcl9wYXJhbWV0ZXJz ID0gU2luZ2xlTGluZVZpZXcoY2xlYW5fbGluZXMuZWxpZGVkLCBwYXJhbWV0ZXJfZW5kX3Bvc2l0 aW9uLCBib2R5X3N0YXJ0X3Bvc2l0aW9uKS5zaW5nbGVfbGluZQotICAgICAgICAgICAgc2VsZi5p c19wdXJlID0gYm9vbChtYXRjaChyJ1xzKj1ccyowXHMqJywgY2hhcmFjdGVyc19hZnRlcl9wYXJh bWV0ZXJzKSkKKyAgICAgICAgY2hhcmFjdGVyc19hZnRlcl9wYXJhbWV0ZXJzID0gU2luZ2xlTGlu ZVZpZXcoY2xlYW5fbGluZXMuZWxpZGVkLCBwYXJhbWV0ZXJfZW5kX3Bvc2l0aW9uLCBib2R5X3N0 YXJ0X3Bvc2l0aW9uKS5zaW5nbGVfbGluZQorICAgICAgICBzZWxmLmlzX2ZpbmFsID0gYm9vbChz ZWFyY2gocidcYmZpbmFsXGInLCBjaGFyYWN0ZXJzX2FmdGVyX3BhcmFtZXRlcnMpKQorICAgICAg ICBzZWxmLmlzX292ZXJyaWRlID0gYm9vbChzZWFyY2gocidcYm92ZXJyaWRlXGInLCBjaGFyYWN0 ZXJzX2FmdGVyX3BhcmFtZXRlcnMpKQorICAgICAgICBzZWxmLmlzX3B1cmUgPSBib29sKG1hdGNo KHInXHMqPVxzKjBccyonLCBjaGFyYWN0ZXJzX2FmdGVyX3BhcmFtZXRlcnMpKQogICAgICAgICBz ZWxmLl9jbGVhbl9saW5lcyA9IGNsZWFuX2xpbmVzCiAgICAgICAgIHNlbGYuX3BhcmFtZXRlcl9s aXN0ID0gTm9uZQogCkBAIC01NDQsNiArNTQ3LDkgQEAgY2xhc3MgX0Z1bmN0aW9uU3RhdGUob2Jq ZWN0KToKICAgICAgICAgIHN0YXJ0X21vZGlmaWVycyA9IF9yZmluZF9pbl9saW5lcyhyJzt8XHt8 XH18KChwcml2YXRlfHB1YmxpY3xwcm90ZWN0ZWQpOil8KCMuKiknLCBlbGlkZWQsIHNlbGYucGFy YW1ldGVyX3N0YXJ0X3Bvc2l0aW9uLCBQb3NpdGlvbigwLCAwKSkKICAgICAgICAgIHJldHVybiBT aW5nbGVMaW5lVmlldyhlbGlkZWQsIHN0YXJ0X21vZGlmaWVycywgc2VsZi5mdW5jdGlvbl9uYW1l X3N0YXJ0X3Bvc2l0aW9uKS5zaW5nbGVfbGluZS5zdHJpcCgpCiAKKyAgICBkZWYgaXNfdmlydHVh bChzZWxmKToKKyAgICAgICAgcmV0dXJuIGJvb2woc2VhcmNoKHInXGJ2aXJ0dWFsXGInLCBzZWxm Lm1vZGlmaWVyc19hbmRfcmV0dXJuX3R5cGUoKSkpCisKICAgICBkZWYgcGFyYW1ldGVyX2xpc3Qo c2VsZik6CiAgICAgICAgIGlmIG5vdCBzZWxmLl9wYXJhbWV0ZXJfbGlzdDoKICAgICAgICAgICAg ICMgU3RvcmUgdGhlIGZpbmFsIHJlc3VsdCBhcyBhIHR1cGxlIHNpbmNlIHRoYXQgaXMgaW1tdXRh YmxlLgpAQCAtMTY0Miw2ICsxNjQ4LDEzIEBAIGRlZiBfY2hlY2tfcGFyYW1ldGVyX25hbWVfYWdh aW5zdF90ZXh0KHBhcmFtZXRlciwgdGV4dCwgZXJyb3IpOgogICAgICAgICByZXR1cm4gRmFsc2UK ICAgICByZXR1cm4gVHJ1ZQogCisKK2RlZiBfZXJyb3JfcmVkdW5kYW50X3NwZWNpZmllcihsaW5l X251bWJlciwgcmVkdW5kYW50X3NwZWNpZmllciwgZ29vZF9zcGVjaWZpZXIsIGVycm9yKToKKyAg ICBlcnJvcihsaW5lX251bWJlciwgJ3JlYWRhYmlsaXR5L2luaGVyaXRhbmNlJywgNCwKKyAgICAg ICAgICAnIiVzIiBpcyByZWR1bmRhbnQgc2luY2UgZnVuY3Rpb24gaXMgYWxyZWFkeSBkZWNsYXJl ZCBhcyAiJXMiJworICAgICAgICAgICUgKHJlZHVuZGFudF9zcGVjaWZpZXIsIGdvb2Rfc3BlY2lm aWVyKSkKKworCiBkZWYgY2hlY2tfZnVuY3Rpb25fZGVmaW5pdGlvbihmaWxlbmFtZSwgZmlsZV9l eHRlbnNpb24sIGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZnVuY3Rpb25fc3RhdGUsIGVycm9y KToKICAgICAiIiJDaGVjayB0aGF0IGZ1bmN0aW9uIGRlZmluaXRpb25zIGZvciBzdHlsZSBpc3N1 ZXMuCiAKQEAgLTE2NzQsNiArMTY4NywxNiBAQCBkZWYgY2hlY2tfZnVuY3Rpb25fZGVmaW5pdGlv bihmaWxlbmFtZSwgZmlsZV9leHRlbnNpb24sIGNsZWFuX2xpbmVzLCBsaW5lX251bWJlcgogICAg ICAgICBpZiBub3QgX2NoZWNrX3BhcmFtZXRlcl9uYW1lX2FnYWluc3RfdGV4dChwYXJhbWV0ZXIs IHBhcmFtZXRlci50eXBlLCBlcnJvcik6CiAgICAgICAgICAgICBjb250aW51ZSAgIyBTaW5jZSBh biBlcnJvciB3YXMgbm90ZWQgZm9yIHRoaXMgbmFtZSwgbW92ZSB0byB0aGUgbmV4dCBwYXJhbWV0 ZXIuCiAKKyAgICBpZiBmdW5jdGlvbl9zdGF0ZS5pc192aXJ0dWFsKCk6CisgICAgICAgIGlmIGZ1 bmN0aW9uX3N0YXRlLmlzX292ZXJyaWRlOgorICAgICAgICAgICAgX2Vycm9yX3JlZHVuZGFudF9z cGVjaWZpZXIobGluZV9udW1iZXIsICd2aXJ0dWFsJywgJ292ZXJyaWRlJywgZXJyb3IpCisKKyAg ICAgICAgaWYgZnVuY3Rpb25fc3RhdGUuaXNfZmluYWw6CisgICAgICAgICAgICBfZXJyb3JfcmVk dW5kYW50X3NwZWNpZmllcihsaW5lX251bWJlciwgJ3ZpcnR1YWwnLCAnZmluYWwnLCBlcnJvcikK KworICAgIGlmIGZ1bmN0aW9uX3N0YXRlLmlzX292ZXJyaWRlIGFuZCBmdW5jdGlvbl9zdGF0ZS5p c19maW5hbDoKKyAgICAgICAgX2Vycm9yX3JlZHVuZGFudF9zcGVjaWZpZXIobGluZV9udW1iZXIs ICdvdmVycmlkZScsICdmaW5hbCcsIGVycm9yKQorCiAKIGRlZiBjaGVja19mb3JfbGVha3lfcGF0 dGVybnMoY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBmdW5jdGlvbl9zdGF0ZSwgZXJyb3IpOgog ICAgICIiIkNoZWNrIGZvciBjb25zdHJ1Y3RzIGtub3duIHRvIGJlIGxlYWsgcHJvbmUuCkBAIC0z ODExLDYgKzM4MzQsNyBAQCBjbGFzcyBDcHBDaGVja2VyKG9iamVjdCk6CiAgICAgICAgICdyZWFk YWJpbGl0eS9lbnVtX2Nhc2luZycsCiAgICAgICAgICdyZWFkYWJpbGl0eS9mbl9zaXplJywKICAg ICAgICAgJ3JlYWRhYmlsaXR5L2Z1bmN0aW9uJywKKyAgICAgICAgJ3JlYWRhYmlsaXR5L2luaGVy aXRhbmNlJywKICAgICAgICAgJ3JlYWRhYmlsaXR5L211bHRpbGluZV9jb21tZW50JywKICAgICAg ICAgJ3JlYWRhYmlsaXR5L211bHRpbGluZV9zdHJpbmcnLAogICAgICAgICAncmVhZGFiaWxpdHkv cGFyYW1ldGVyX25hbWUnLApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHls ZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL2NwcF91bml0dGVzdC5weQppbmRleCA1YjgzN2NhMGE0NDNjMDM5NDI3NDRjMWJi NjQ4OGU5NDcwOWI1N2FjLi5jMjQ0NTk2NmE3NTI0NDdhNDlmMDQ5NTY2MzQwYmExN2Y2NTk2Mzll IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcF91 bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2Nw cF91bml0dGVzdC5weQpAQCAtMzc0LDcgKzM3NCwxMCBAQCBjbGFzcyBGdW5jdGlvbkRldGVjdGlv blRlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZnVuY3Rp b25fc3RhdGUuaW5fYV9mdW5jdGlvbiwgVHJ1ZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChm dW5jdGlvbl9zdGF0ZS5jdXJyZW50X2Z1bmN0aW9uLCBmdW5jdGlvbl9pbmZvcm1hdGlvblsnbmFt ZSddICsgJygpJykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChmdW5jdGlvbl9zdGF0ZS5tb2Rp ZmllcnNfYW5kX3JldHVybl90eXBlKCksIGZ1bmN0aW9uX2luZm9ybWF0aW9uWydtb2RpZmllcnNf YW5kX3JldHVybl90eXBlJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZnVuY3Rpb25fc3Rh dGUuaXNfZmluYWwsIGZ1bmN0aW9uX2luZm9ybWF0aW9uWydpc19maW5hbCddKQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGZ1bmN0aW9uX3N0YXRlLmlzX292ZXJyaWRlLCBmdW5jdGlvbl9pbmZv cm1hdGlvblsnaXNfb3ZlcnJpZGUnXSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChmdW5jdGlv bl9zdGF0ZS5pc19wdXJlLCBmdW5jdGlvbl9pbmZvcm1hdGlvblsnaXNfcHVyZSddKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGZ1bmN0aW9uX3N0YXRlLmlzX3ZpcnR1YWwoKSwgZnVuY3Rpb25f aW5mb3JtYXRpb25bJ2lzX3ZpcnR1YWwnXSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChmdW5j dGlvbl9zdGF0ZS5pc19kZWNsYXJhdGlvbiwgZnVuY3Rpb25faW5mb3JtYXRpb25bJ2lzX2RlY2xh cmF0aW9uJ10pCiAgICAgICAgIHNlbGYuYXNzZXJ0X3Bvc2l0aW9uc19lcXVhbChmdW5jdGlvbl9z dGF0ZS5mdW5jdGlvbl9uYW1lX3N0YXJ0X3Bvc2l0aW9uLCBmdW5jdGlvbl9pbmZvcm1hdGlvblsn ZnVuY3Rpb25fbmFtZV9zdGFydF9wb3NpdGlvbiddKQogICAgICAgICBzZWxmLmFzc2VydF9wb3Np dGlvbnNfZXF1YWwoZnVuY3Rpb25fc3RhdGUucGFyYW1ldGVyX3N0YXJ0X3Bvc2l0aW9uLCBmdW5j dGlvbl9pbmZvcm1hdGlvblsncGFyYW1ldGVyX3N0YXJ0X3Bvc2l0aW9uJ10pCkBAIC00MDMsNiAr NDA2LDkgQEAgY2xhc3MgRnVuY3Rpb25EZXRlY3Rpb25UZXN0KENwcFN0eWxlVGVzdEJhc2UpOgog ICAgICAgICAgICAgICdwYXJhbWV0ZXJfZW5kX3Bvc2l0aW9uJzogKDAsIDI5KSwKICAgICAgICAg ICAgICAnYm9keV9zdGFydF9wb3NpdGlvbic6ICgwLCAzMCksCiAgICAgICAgICAgICAgJ2VuZF9w b3NpdGlvbic6ICgxLCAxKSwKKyAgICAgICAgICAgICAnaXNfZmluYWwnOiBGYWxzZSwKKyAgICAg ICAgICAgICAnaXNfb3ZlcnJpZGUnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfdmlydHVhbCc6 IEZhbHNlLAogICAgICAgICAgICAgICdpc19wdXJlJzogRmFsc2UsCiAgICAgICAgICAgICAgJ2lz X2RlY2xhcmF0aW9uJzogRmFsc2V9KQogCkBAIC00MTYsNiArNDIyLDkgQEAgY2xhc3MgRnVuY3Rp b25EZXRlY3Rpb25UZXN0KENwcFN0eWxlVGVzdEJhc2UpOgogICAgICAgICAgICAgICdwYXJhbWV0 ZXJfZW5kX3Bvc2l0aW9uJzogKDAsIDIzKSwKICAgICAgICAgICAgICAnYm9keV9zdGFydF9wb3Np dGlvbic6ICgwLCAyMyksCiAgICAgICAgICAgICAgJ2VuZF9wb3NpdGlvbic6ICgwLCAyNCksCisg ICAgICAgICAgICAgJ2lzX2ZpbmFsJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX292ZXJyaWRl JzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX3ZpcnR1YWwnOiBGYWxzZSwKICAgICAgICAgICAg ICAnaXNfcHVyZSc6IEZhbHNlLAogICAgICAgICAgICAgICdpc19kZWNsYXJhdGlvbic6IFRydWV9 KQogCkBAIC00MjgsNiArNDM3LDkgQEAgY2xhc3MgRnVuY3Rpb25EZXRlY3Rpb25UZXN0KENwcFN0 eWxlVGVzdEJhc2UpOgogICAgICAgICAgICAgICdwYXJhbWV0ZXJfZW5kX3Bvc2l0aW9uJzogKDAs IDc2KSwKICAgICAgICAgICAgICAnYm9keV9zdGFydF9wb3NpdGlvbic6ICgwLCA3NiksCiAgICAg ICAgICAgICAgJ2VuZF9wb3NpdGlvbic6ICgwLCA3NyksCisgICAgICAgICAgICAgJ2lzX2ZpbmFs JzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX292ZXJyaWRlJzogRmFsc2UsCisgICAgICAgICAg ICAgJ2lzX3ZpcnR1YWwnOiBGYWxzZSwKICAgICAgICAgICAgICAnaXNfcHVyZSc6IEZhbHNlLAog ICAgICAgICAgICAgICdpc19kZWNsYXJhdGlvbic6IFRydWV9KQogCkBAIC00NDAsNiArNDUyLDkg QEAgY2xhc3MgRnVuY3Rpb25EZXRlY3Rpb25UZXN0KENwcFN0eWxlVGVzdEJhc2UpOgogICAgICAg ICAgICAgICdwYXJhbWV0ZXJfZW5kX3Bvc2l0aW9uJzogKDAsIDc2KSwKICAgICAgICAgICAgICAn Ym9keV9zdGFydF9wb3NpdGlvbic6ICgwLCA3NiksCiAgICAgICAgICAgICAgJ2VuZF9wb3NpdGlv bic6ICgwLCA3NyksCisgICAgICAgICAgICAgJ2lzX2ZpbmFsJzogRmFsc2UsCisgICAgICAgICAg ICAgJ2lzX292ZXJyaWRlJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX3ZpcnR1YWwnOiBGYWxz ZSwKICAgICAgICAgICAgICAnaXNfcHVyZSc6IEZhbHNlLAogICAgICAgICAgICAgICdpc19kZWNs YXJhdGlvbic6IFRydWV9KQogCkBAIC00NTIsNiArNDY3LDkgQEAgY2xhc3MgRnVuY3Rpb25EZXRl Y3Rpb25UZXN0KENwcFN0eWxlVGVzdEJhc2UpOgogICAgICAgICAgICAgICdwYXJhbWV0ZXJfZW5k X3Bvc2l0aW9uJzogKDAsIDc3KSwKICAgICAgICAgICAgICAnYm9keV9zdGFydF9wb3NpdGlvbic6 ICgwLCA3NyksCiAgICAgICAgICAgICAgJ2VuZF9wb3NpdGlvbic6ICgwLCA3OCksCisgICAgICAg ICAgICAgJ2lzX2ZpbmFsJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX292ZXJyaWRlJzogRmFs c2UsCisgICAgICAgICAgICAgJ2lzX3ZpcnR1YWwnOiBGYWxzZSwKICAgICAgICAgICAgICAnaXNf cHVyZSc6IEZhbHNlLAogICAgICAgICAgICAgICdpc19kZWNsYXJhdGlvbic6IFRydWV9KQogCkBA IC00NjQsNiArNDgyLDkgQEAgY2xhc3MgRnVuY3Rpb25EZXRlY3Rpb25UZXN0KENwcFN0eWxlVGVz dEJhc2UpOgogICAgICAgICAgICAgICdwYXJhbWV0ZXJfZW5kX3Bvc2l0aW9uJzogKDAsIDc2KSwK ICAgICAgICAgICAgICAnYm9keV9zdGFydF9wb3NpdGlvbic6ICgwLCA3NiksCiAgICAgICAgICAg ICAgJ2VuZF9wb3NpdGlvbic6ICgwLCA3NyksCisgICAgICAgICAgICAgJ2lzX2ZpbmFsJzogRmFs c2UsCisgICAgICAgICAgICAgJ2lzX292ZXJyaWRlJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lz X3ZpcnR1YWwnOiBGYWxzZSwKICAgICAgICAgICAgICAnaXNfcHVyZSc6IEZhbHNlLAogICAgICAg ICAgICAgICdpc19kZWNsYXJhdGlvbic6IFRydWV9KQogCkBAIC00NzcsNiArNDk4LDkgQEAgY2xh c3MgRnVuY3Rpb25EZXRlY3Rpb25UZXN0KENwcFN0eWxlVGVzdEJhc2UpOgogICAgICAgICAgICAg ICdwYXJhbWV0ZXJfZW5kX3Bvc2l0aW9uJzogKDAsIDQxKSwKICAgICAgICAgICAgICAnYm9keV9z dGFydF9wb3NpdGlvbic6ICgwLCA0MSksCiAgICAgICAgICAgICAgJ2VuZF9wb3NpdGlvbic6ICgw LCA0MiksCisgICAgICAgICAgICAgJ2lzX2ZpbmFsJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lz X292ZXJyaWRlJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX3ZpcnR1YWwnOiBUcnVlLAogICAg ICAgICAgICAgICdpc19wdXJlJzogRmFsc2UsCiAgICAgICAgICAgICAgJ2lzX2RlY2xhcmF0aW9u JzogVHJ1ZX0pCiAKQEAgLTQ4OSw2ICs1MTMsOSBAQCBjbGFzcyBGdW5jdGlvbkRldGVjdGlvblRl c3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAgICAgICAgJ3BhcmFtZXRlcl9lbmRfcG9zaXRp b24nOiAoMCwgMzcpLAogICAgICAgICAgICAgICdib2R5X3N0YXJ0X3Bvc2l0aW9uJzogKDAsIDQx KSwKICAgICAgICAgICAgICAnZW5kX3Bvc2l0aW9uJzogKDAsIDQyKSwKKyAgICAgICAgICAgICAn aXNfZmluYWwnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfb3ZlcnJpZGUnOiBGYWxzZSwKKyAg ICAgICAgICAgICAnaXNfdmlydHVhbCc6IFRydWUsCiAgICAgICAgICAgICAgJ2lzX3B1cmUnOiBU cnVlLAogICAgICAgICAgICAgICdpc19kZWNsYXJhdGlvbic6IFRydWV9KQogCkBAIC01MDQsOSAr NTMxLDkyIEBAIGNsYXNzIEZ1bmN0aW9uRGV0ZWN0aW9uVGVzdChDcHBTdHlsZVRlc3RCYXNlKToK ICAgICAgICAgICAgICAncGFyYW1ldGVyX2VuZF9wb3NpdGlvbic6ICgwLCAzNyksCiAgICAgICAg ICAgICAgJ2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoMiwgMyksCiAgICAgICAgICAgICAgJ2VuZF9w b3NpdGlvbic6ICgyLCA0KSwKKyAgICAgICAgICAgICAnaXNfZmluYWwnOiBGYWxzZSwKKyAgICAg ICAgICAgICAnaXNfb3ZlcnJpZGUnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfdmlydHVhbCc6 IFRydWUsCiAgICAgICAgICAgICAgJ2lzX3B1cmUnOiBUcnVlLAogICAgICAgICAgICAgICdpc19k ZWNsYXJhdGlvbic6IFRydWV9KQogCisgICAgZGVmIHRlc3Rfb3ZlcnJpZGVfYW5kX2ZpbmFsX2Z1 bmN0aW9uX2RldGVjdGlvbihzZWxmKToKKyAgICAgICAgc2VsZi5wZXJmb3JtX2Z1bmN0aW9uX2Rl dGVjdGlvbigKKyAgICAgICAgICAgIFsndm9pZCB0aGVUZXN0RnVuY3Rpb25OYW1lKGludCBvdmVy cmlkZSwgaW50IGZpbmFsKTsnXSwKKyAgICAgICAgICAgIHsnbmFtZSc6ICd0aGVUZXN0RnVuY3Rp b25OYW1lJywKKyAgICAgICAgICAgICAnbW9kaWZpZXJzX2FuZF9yZXR1cm5fdHlwZSc6ICd2b2lk JywKKyAgICAgICAgICAgICAnZnVuY3Rpb25fbmFtZV9zdGFydF9wb3NpdGlvbic6ICgwLCA1KSwK KyAgICAgICAgICAgICAncGFyYW1ldGVyX3N0YXJ0X3Bvc2l0aW9uJzogKDAsIDI0KSwKKyAgICAg ICAgICAgICAncGFyYW1ldGVyX2VuZF9wb3NpdGlvbic6ICgwLCA0OSksCisgICAgICAgICAgICAg J2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoMCwgNDkpLAorICAgICAgICAgICAgICdlbmRfcG9zaXRp b24nOiAoMCwgNTApLAorICAgICAgICAgICAgICdpc19maW5hbCc6IEZhbHNlLAorICAgICAgICAg ICAgICdpc19vdmVycmlkZSc6IEZhbHNlLAorICAgICAgICAgICAgICdpc192aXJ0dWFsJzogRmFs c2UsCisgICAgICAgICAgICAgJ2lzX3B1cmUnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfZGVj bGFyYXRpb24nOiBUcnVlfSkKKworICAgICAgICBzZWxmLnBlcmZvcm1fZnVuY3Rpb25fZGV0ZWN0 aW9uKAorICAgICAgICAgICAgWyd2b2lkIHRoZVRlc3RGdW5jdGlvbk5hbWUoaW50IGZpbmFsKSBv dmVycmlkZTsnXSwKKyAgICAgICAgICAgIHsnbmFtZSc6ICd0aGVUZXN0RnVuY3Rpb25OYW1lJywK KyAgICAgICAgICAgICAnbW9kaWZpZXJzX2FuZF9yZXR1cm5fdHlwZSc6ICd2b2lkJywKKyAgICAg ICAgICAgICAnZnVuY3Rpb25fbmFtZV9zdGFydF9wb3NpdGlvbic6ICgwLCA1KSwKKyAgICAgICAg ICAgICAncGFyYW1ldGVyX3N0YXJ0X3Bvc2l0aW9uJzogKDAsIDI0KSwKKyAgICAgICAgICAgICAn cGFyYW1ldGVyX2VuZF9wb3NpdGlvbic6ICgwLCAzNSksCisgICAgICAgICAgICAgJ2JvZHlfc3Rh cnRfcG9zaXRpb24nOiAoMCwgNDQpLAorICAgICAgICAgICAgICdlbmRfcG9zaXRpb24nOiAoMCwg NDUpLAorICAgICAgICAgICAgICdpc19maW5hbCc6IEZhbHNlLAorICAgICAgICAgICAgICdpc19v dmVycmlkZSc6IFRydWUsCisgICAgICAgICAgICAgJ2lzX3ZpcnR1YWwnOiBGYWxzZSwKKyAgICAg ICAgICAgICAnaXNfcHVyZSc6IEZhbHNlLAorICAgICAgICAgICAgICdpc19kZWNsYXJhdGlvbic6 IFRydWV9KQorCisgICAgICAgIHNlbGYucGVyZm9ybV9mdW5jdGlvbl9kZXRlY3Rpb24oCisgICAg ICAgICAgICBbJ3ZvaWQgdGhlVGVzdEZ1bmN0aW9uTmFtZShpbnQgZmluYWwpIGNvbnN0IG92ZXJy aWRlJywKKyAgICAgICAgICAgICAneycsCisgICAgICAgICAgICAgJ30nXSwKKyAgICAgICAgICAg IHsnbmFtZSc6ICd0aGVUZXN0RnVuY3Rpb25OYW1lJywKKyAgICAgICAgICAgICAnbW9kaWZpZXJz X2FuZF9yZXR1cm5fdHlwZSc6ICd2b2lkJywKKyAgICAgICAgICAgICAnZnVuY3Rpb25fbmFtZV9z dGFydF9wb3NpdGlvbic6ICgwLCA1KSwKKyAgICAgICAgICAgICAncGFyYW1ldGVyX3N0YXJ0X3Bv c2l0aW9uJzogKDAsIDI0KSwKKyAgICAgICAgICAgICAncGFyYW1ldGVyX2VuZF9wb3NpdGlvbic6 ICgwLCAzNSksCisgICAgICAgICAgICAgJ2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoMSwgMCksCisg ICAgICAgICAgICAgJ2VuZF9wb3NpdGlvbic6ICgyLCAxKSwKKyAgICAgICAgICAgICAnaXNfZmlu YWwnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfb3ZlcnJpZGUnOiBUcnVlLAorICAgICAgICAg ICAgICdpc192aXJ0dWFsJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX3B1cmUnOiBGYWxzZSwK KyAgICAgICAgICAgICAnaXNfZGVjbGFyYXRpb24nOiBGYWxzZX0pCisKKyAgICAgICAgc2VsZi5w ZXJmb3JtX2Z1bmN0aW9uX2RldGVjdGlvbigKKyAgICAgICAgICAgIFsndmlydHVhbCB2b2lkIHRo ZVRlc3RGdW5jdGlvbk5hbWUoaW50IG92ZXJyaWRlKSBmaW5hbDsnXSwKKyAgICAgICAgICAgIHsn bmFtZSc6ICd0aGVUZXN0RnVuY3Rpb25OYW1lJywKKyAgICAgICAgICAgICAnbW9kaWZpZXJzX2Fu ZF9yZXR1cm5fdHlwZSc6ICd2aXJ0dWFsIHZvaWQnLAorICAgICAgICAgICAgICdmdW5jdGlvbl9u YW1lX3N0YXJ0X3Bvc2l0aW9uJzogKDAsIDEzKSwKKyAgICAgICAgICAgICAncGFyYW1ldGVyX3N0 YXJ0X3Bvc2l0aW9uJzogKDAsIDMyKSwKKyAgICAgICAgICAgICAncGFyYW1ldGVyX2VuZF9wb3Np dGlvbic6ICgwLCA0NiksCisgICAgICAgICAgICAgJ2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoMCwg NTIpLAorICAgICAgICAgICAgICdlbmRfcG9zaXRpb24nOiAoMCwgNTMpLAorICAgICAgICAgICAg ICdpc19maW5hbCc6IFRydWUsCisgICAgICAgICAgICAgJ2lzX292ZXJyaWRlJzogRmFsc2UsCisg ICAgICAgICAgICAgJ2lzX3ZpcnR1YWwnOiBUcnVlLAorICAgICAgICAgICAgICdpc19wdXJlJzog RmFsc2UsCisgICAgICAgICAgICAgJ2lzX2RlY2xhcmF0aW9uJzogVHJ1ZX0pCisKKyAgICAgICAg c2VsZi5wZXJmb3JtX2Z1bmN0aW9uX2RldGVjdGlvbigKKyAgICAgICAgICAgIFsndm9pZCB0aGVU ZXN0RnVuY3Rpb25OYW1lKCknLAorICAgICAgICAgICAgICdvdmVycmlkZScsCisgICAgICAgICAg ICAgJ2ZpbmFsOyddLAorICAgICAgICAgICAgeyduYW1lJzogJ3RoZVRlc3RGdW5jdGlvbk5hbWUn LAorICAgICAgICAgICAgICdtb2RpZmllcnNfYW5kX3JldHVybl90eXBlJzogJ3ZvaWQnLAorICAg ICAgICAgICAgICdmdW5jdGlvbl9uYW1lX3N0YXJ0X3Bvc2l0aW9uJzogKDAsIDUpLAorICAgICAg ICAgICAgICdwYXJhbWV0ZXJfc3RhcnRfcG9zaXRpb24nOiAoMCwgMjQpLAorICAgICAgICAgICAg ICdwYXJhbWV0ZXJfZW5kX3Bvc2l0aW9uJzogKDAsIDI2KSwKKyAgICAgICAgICAgICAnYm9keV9z dGFydF9wb3NpdGlvbic6ICgyLCA1KSwKKyAgICAgICAgICAgICAnZW5kX3Bvc2l0aW9uJzogKDIs IDYpLAorICAgICAgICAgICAgICdpc19maW5hbCc6IFRydWUsCisgICAgICAgICAgICAgJ2lzX292 ZXJyaWRlJzogVHJ1ZSwKKyAgICAgICAgICAgICAnaXNfdmlydHVhbCc6IEZhbHNlLAorICAgICAg ICAgICAgICdpc19wdXJlJzogRmFsc2UsCisgICAgICAgICAgICAgJ2lzX2RlY2xhcmF0aW9uJzog VHJ1ZX0pCisKICAgICBkZWYgdGVzdF9pZ25vcmVfbWFjcm9zKHNlbGYpOgogICAgICAgICBzZWxm LnBlcmZvcm1fZnVuY3Rpb25fZGV0ZWN0aW9uKFsndm9pZCBhRnVuY3Rpb25OYW1lKGludCk7IFxc J10sIE5vbmUpCiAKQEAgLTUyNSw2ICs2MzUsOSBAQCBjbGFzcyBGdW5jdGlvbkRldGVjdGlvblRl c3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAgICAgICAgJ3BhcmFtZXRlcl9lbmRfcG9zaXRp b24nOiAoMiwgMSksCiAgICAgICAgICAgICAgJ2JvZHlfc3RhcnRfcG9zaXRpb24nOiAoMiwgMSks CiAgICAgICAgICAgICAgJ2VuZF9wb3NpdGlvbic6ICgyLCAyKSwKKyAgICAgICAgICAgICAnaXNf ZmluYWwnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfb3ZlcnJpZGUnOiBGYWxzZSwKKyAgICAg ICAgICAgICAnaXNfdmlydHVhbCc6IEZhbHNlLAogICAgICAgICAgICAgICdpc19wdXJlJzogRmFs c2UsCiAgICAgICAgICAgICAgJ2lzX2RlY2xhcmF0aW9uJzogVHJ1ZX0pCiAKQEAgLTU0Miw2ICs2 NTUsOSBAQCBjbGFzcyBGdW5jdGlvbkRldGVjdGlvblRlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAg ICAgICAgICAgICAgJ3BhcmFtZXRlcl9lbmRfcG9zaXRpb24nOiAoMCwgMTkpLAogICAgICAgICAg ICAgICdib2R5X3N0YXJ0X3Bvc2l0aW9uJzogKDAsIDE5KSwKICAgICAgICAgICAgICAnZW5kX3Bv c2l0aW9uJzogKDAsIDIwKSwKKyAgICAgICAgICAgICAnaXNfZmluYWwnOiBGYWxzZSwKKyAgICAg ICAgICAgICAnaXNfb3ZlcnJpZGUnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfdmlydHVhbCc6 IEZhbHNlLAogICAgICAgICAgICAgICdpc19wdXJlJzogRmFsc2UsCiAgICAgICAgICAgICAgJ2lz X2RlY2xhcmF0aW9uJzogVHJ1ZSwKICAgICAgICAgICAgICAncGFyYW1ldGVyX2xpc3QnOiAoKX0p CkBAIC01NTYsNiArNjcyLDkgQEAgY2xhc3MgRnVuY3Rpb25EZXRlY3Rpb25UZXN0KENwcFN0eWxl VGVzdEJhc2UpOgogICAgICAgICAgICAgICdwYXJhbWV0ZXJfZW5kX3Bvc2l0aW9uJzogKDAsIDIy KSwKICAgICAgICAgICAgICAnYm9keV9zdGFydF9wb3NpdGlvbic6ICgwLCAyMiksCiAgICAgICAg ICAgICAgJ2VuZF9wb3NpdGlvbic6ICgwLCAyMyksCisgICAgICAgICAgICAgJ2lzX2ZpbmFsJzog RmFsc2UsCisgICAgICAgICAgICAgJ2lzX292ZXJyaWRlJzogRmFsc2UsCisgICAgICAgICAgICAg J2lzX3ZpcnR1YWwnOiBGYWxzZSwKICAgICAgICAgICAgICAnaXNfcHVyZSc6IEZhbHNlLAogICAg ICAgICAgICAgICdpc19kZWNsYXJhdGlvbic6IFRydWUsCiAgICAgICAgICAgICAgJ3BhcmFtZXRl cl9saXN0JzoKQEAgLTU3MSw2ICs2OTAsOSBAQCBjbGFzcyBGdW5jdGlvbkRldGVjdGlvblRlc3Qo Q3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAgICAgICAgJ3BhcmFtZXRlcl9lbmRfcG9zaXRpb24n OiAoMCwgNzYpLAogICAgICAgICAgICAgICdib2R5X3N0YXJ0X3Bvc2l0aW9uJzogKDAsIDc2KSwK ICAgICAgICAgICAgICAnZW5kX3Bvc2l0aW9uJzogKDAsIDc3KSwKKyAgICAgICAgICAgICAnaXNf ZmluYWwnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfb3ZlcnJpZGUnOiBGYWxzZSwKKyAgICAg ICAgICAgICAnaXNfdmlydHVhbCc6IEZhbHNlLAogICAgICAgICAgICAgICdpc19wdXJlJzogRmFs c2UsCiAgICAgICAgICAgICAgJ2lzX2RlY2xhcmF0aW9uJzogVHJ1ZSwKICAgICAgICAgICAgICAn cGFyYW1ldGVyX2xpc3QnOgpAQCAtNTg5LDYgKzcxMSw5IEBAIGNsYXNzIEZ1bmN0aW9uRGV0ZWN0 aW9uVGVzdChDcHBTdHlsZVRlc3RCYXNlKToKICAgICAgICAgICAgICAncGFyYW1ldGVyX2VuZF9w b3NpdGlvbic6ICgwLCAxNDcpLAogICAgICAgICAgICAgICdib2R5X3N0YXJ0X3Bvc2l0aW9uJzog KDAsIDE0NyksCiAgICAgICAgICAgICAgJ2VuZF9wb3NpdGlvbic6ICgwLCAxNDgpLAorICAgICAg ICAgICAgICdpc19maW5hbCc6IEZhbHNlLAorICAgICAgICAgICAgICdpc19vdmVycmlkZSc6IEZh bHNlLAorICAgICAgICAgICAgICdpc192aXJ0dWFsJzogVHJ1ZSwKICAgICAgICAgICAgICAnaXNf cHVyZSc6IEZhbHNlLAogICAgICAgICAgICAgICdpc19kZWNsYXJhdGlvbic6IFRydWUsCiAgICAg ICAgICAgICAgJ3BhcmFtZXRlcl9saXN0JzoKQEAgLTYxMyw2ICs3MzgsOSBAQCBjbGFzcyBGdW5j dGlvbkRldGVjdGlvblRlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAgICAgICAgJ3BhcmFt ZXRlcl9lbmRfcG9zaXRpb24nOiAoNSwgMTcpLAogICAgICAgICAgICAgICdib2R5X3N0YXJ0X3Bv c2l0aW9uJzogKDUsIDE3KSwKICAgICAgICAgICAgICAnZW5kX3Bvc2l0aW9uJzogKDUsIDE4KSwK KyAgICAgICAgICAgICAnaXNfZmluYWwnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfb3ZlcnJp ZGUnOiBGYWxzZSwKKyAgICAgICAgICAgICAnaXNfdmlydHVhbCc6IFRydWUsCiAgICAgICAgICAg ICAgJ2lzX3B1cmUnOiBGYWxzZSwKICAgICAgICAgICAgICAnaXNfZGVjbGFyYXRpb24nOiBUcnVl LAogICAgICAgICAgICAgICdwYXJhbWV0ZXJfbGlzdCc6Cg==