193196 2019-01-07 07:54:22 -0800 [ews-build] Use update-webkit script in Style EWS 2019-08-27 04:21:07 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=201179 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap commit-queue ews-watchlist jbedard lforschler ryanhaddad oldest_to_newest 1492254 0 aakash_jain 2019-01-07 07:54:22 -0800 We should use clean-webkit and update-webkit scripts to clean and update the webkit checkout. These scripts are more reliable than Buildbot default method. Buildbot updates the repo in a weird manner, and doesn't update the source completely. It only does a 'git fetch', not 'git pull'. It results in origin/master never being updated. Therefore 'git status' shows: "Your branch is ahead of 'origin/master' by x commits." This cause the Style checker to check for style error in all those past x commits and therefore failing. For e.g.: https://ews-build.webkit-uat.org/#/builders/5/builds/1001 fails with 18 style errors, even though that patch(358478) did not had any style error. 1555542 1 374821 aakash_jain 2019-07-24 15:49:21 -0700 Created attachment 374821 Patch 1555543 2 ews-watchlist 2019-07-24 15:52:12 -0700 Attachment 374821 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:170: [UpdateWorkingDirectory.__init__] Use of super on an old style class [pylint/E1002] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1448: [TestUpdateWorkingDirectory.test_success] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1448: [TestUpdateWorkingDirectory.test_success] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1461: [TestUpdateWorkingDirectory.test_failure] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1461: [TestUpdateWorkingDirectory.test_failure] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] Total errors found: 5 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1555549 3 374825 aakash_jain 2019-07-24 16:12:09 -0700 Created attachment 374825 Patch 1555550 4 ews-watchlist 2019-07-24 16:14:24 -0700 Attachment 374825 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:170: [UpdateWorkingDirectory.__init__] Use of super on an old style class [pylint/E1002] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:520: [CheckStyle.__init__] Use of super on an old style class [pylint/E1002] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1453: [TestUpdateWorkingDirectory.test_success] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1453: [TestUpdateWorkingDirectory.test_success] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1466: [TestUpdateWorkingDirectory.test_failure] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1466: [TestUpdateWorkingDirectory.test_failure] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] Total errors found: 6 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1555552 5 aakash_jain 2019-07-24 16:18:45 -0700 Sample runs: Style failure: https://ews-build.webkit-uat.org/#/builders/5/builds/4959 Pass: https://ews-build.webkit-uat.org/#/builders/5/builds/4958 1556200 6 374825 commit-queue 2019-07-26 12:22:10 -0700 Comment on attachment 374825 Patch Clearing flags on attachment: 374825 Committed r247871: <https://trac.webkit.org/changeset/247871> 1556201 7 commit-queue 2019-07-26 12:22:11 -0700 All reviewed patches have been landed. Closing bug. 1556579 8 webkit-bug-importer 2019-07-29 09:19:25 -0700 <rdar://problem/53664345> 374821 2019-07-24 15:49:21 -0700 2019-07-24 16:12:07 -0700 Patch bug-193196-20190724184920.patch text/plain 6167 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0Nzc5MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE5LTA3LTI0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBVc2UgdXBkYXRlLXdlYmtpdCBzY3JpcHQgaW4gU3R5 bGUgRVdTCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTMxOTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHk6CisgICAgICAgIChTdHls ZUZhY3RvcnkpOiBVcGRhdGVkIHRvIHVzZSBDaGVja091dFNvdXJjZSBzdGVwIGFzIHdlbGwuCisg ICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OiBBZGRlZCBidWls ZC1zdGVwIHRvIFVwZGF0ZVdvcmtpbmdEaXJlY3RvcnkuCisgICAgICAgICogQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OiBBZGRlZCB1bml0LXRlc3RzLgorCiAy MDE5LTA3LTI0ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KIAogICAgICAg ICBydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMgd29uJ3QgcmVwb3J0IHRlc3QgcmVzdWx0cyBmb3Ig dGVzdG1hc20sIHRlc3RhaXIsIHRlc3RiMywgdGVzdGRmZyBhbmQgdGVzdCBhcGkKSW5kZXg6IFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQkocmV2aXNp b24gMjQ3NzkyKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmll cy5weQkod29ya2luZyBjb3B5KQpAQCAtMjksNyArMjksNyBAQCBmcm9tIHN0ZXBzIGltcG9ydCAo QXBwbHlQYXRjaCwgQ2hlY2tPdXRTCiAgICAgICAgICAgICAgICAgICAgRG93bmxvYWRCdWlsdFBy b2R1Y3QsIEV4dHJhY3RCdWlsdFByb2R1Y3QsIEluc3RhbGxHdGtEZXBlbmRlbmNpZXMsIEluc3Rh bGxXcGVEZXBlbmRlbmNpZXMsIEtpbGxPbGRQcm9jZXNzZXMsCiAgICAgICAgICAgICAgICAgICAg UHJpbnRDb25maWd1cmF0aW9uLCBSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMsIFJ1bkFQSVRlc3Rz LCBSdW5CaW5kaW5nc1Rlc3RzLCBSdW5FV1NCdWlsZGJvdENoZWNrQ29uZmlnLCBSdW5FV1NVbml0 VGVzdHMsCiAgICAgICAgICAgICAgICAgICAgUnVuSmF2YVNjcmlwdENvcmVUZXN0cywgUnVuSmF2 YVNjcmlwdENvcmVUZXN0c1RvVCwgUnVuV2ViS2l0MVRlc3RzLCBSdW5XZWJLaXRQZXJsVGVzdHMs Ci0gICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0UHlUZXN0cywgUnVuV2ViS2l0VGVzdHMsIFVu QXBwbHlQYXRjaElmUmVxdWlyZWQsIFZhbGlkYXRlUGF0Y2gpCisgICAgICAgICAgICAgICAgICAg UnVuV2ViS2l0UHlUZXN0cywgUnVuV2ViS2l0VGVzdHMsIFVuQXBwbHlQYXRjaElmUmVxdWlyZWQs IFVwZGF0ZVdvcmtpbmdEaXJlY3RvcnksIFZhbGlkYXRlUGF0Y2gpCiAKIAogY2xhc3MgRmFjdG9y eShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CkBAIC00OCw5ICs0OCwxNSBAQCBjbGFzcyBGYWN0b3J5 KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKICAgICAgICAgc2VsZi5hZGRTdGVwKEFwcGx5UGF0Y2go KSkKIAogCi1jbGFzcyBTdHlsZUZhY3RvcnkoRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5pdF9fKHNl bGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYWRk aXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6Ci0gICAgICAgIEZhY3RvcnkuX19pbml0 X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCBh ZGRpdGlvbmFsQXJndW1lbnRzKQorY2xhc3MgU3R5bGVGYWN0b3J5KGZhY3RvcnkuQnVpbGRGYWN0 b3J5KToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Tm9u ZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRz PU5vbmUsICoqa3dhcmdzKToKKyAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19pbml0X18o c2VsZikKKyAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkKHBsYXRmb3JtLCBjb25m aWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1 bWVudHMpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoVmFsaWRhdGVQYXRjaCgpKQorICAgICAgICBz ZWxmLmFkZFN0ZXAoUHJpbnRDb25maWd1cmF0aW9uKCkpCisgICAgICAgIHNlbGYuYWRkU3RlcChD aGVja091dFNvdXJjZSgpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoVXBkYXRlV29ya2luZ0RpcmVj dG9yeSgpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoQXBwbHlQYXRjaCgpKQogICAgICAgICBzZWxm LmFkZFN0ZXAoQ2hlY2tTdHlsZSgpKQogCiAKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvc3RlcHMucHkJKHJldmlzaW9uIDI0Nzc5MikKKysrIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMTU5LDYgKzE1 OSwxOCBAQCBjbGFzcyBDbGVhbldvcmtpbmdEaXJlY3Rvcnkoc2hlbGwuU2hlbGxDCiAgICAgICAg IHN1cGVyKENsZWFuV29ya2luZ0RpcmVjdG9yeSwgc2VsZikuX19pbml0X18obG9nRW52aXJvbj1G YWxzZSwgKiprd2FyZ3MpCiAKIAorY2xhc3MgVXBkYXRlV29ya2luZ0RpcmVjdG9yeShzaGVsbC5T aGVsbENvbW1hbmQpOgorICAgIG5hbWUgPSAndXBkYXRlLXdvcmtpbmctZGlyZWN0b3J5JworICAg IGRlc2NyaXB0aW9uID0gWyd1cGRhdGUtd29ya3JpbmctZGlyZWN0b3J5IHJ1bm5pbmcnXQorICAg IGRlc2NyaXB0aW9uRG9uZSA9IFsnVXBkYXRlZCB3b3JraW5nIGRpcmVjdG9yeSddCisgICAgZmx1 bmtPbkZhaWx1cmUgPSBUcnVlCisgICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKKyAgICBjb21tYW5k ID0gWydweXRob24nLCAnVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0J10KKworICAgIGRlZiBf X2luaXRfXyhzZWxmLCAqKmt3YXJncyk6CisgICAgICAgIHN1cGVyKFVwZGF0ZVdvcmtpbmdEaXJl Y3RvcnksIHNlbGYpLl9faW5pdF9fKGxvZ0Vudmlyb249RmFsc2UsICoqa3dhcmdzKQorCisKIGNs YXNzIEFwcGx5UGF0Y2goc2hlbGwuU2hlbGxDb21tYW5kLCBDb21wb3NpdGVTdGVwTWl4aW4pOgog ICAgIG5hbWUgPSAnYXBwbHktcGF0Y2gnCiAgICAgZGVzY3JpcHRpb24gPSBbJ2FwcGx5aW5nLXBh dGNoJ10KSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0 dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQv c3RlcHNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI0Nzc5MikKKysrIFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNDEs NyArNDEsNyBAQCBmcm9tIHN0ZXBzIGltcG9ydCAoQW5hbHl6ZUFQSVRlc3RzUmVzdWx0CiAgICAg ICAgICAgICAgICAgICAgUHJpbnRDb25maWd1cmF0aW9uLCBSZVJ1bkFQSVRlc3RzLCBSZVJ1bkph dmFTY3JpcHRDb3JlVGVzdHMsIFJlUnVuV2ViS2l0VGVzdHMsIFJ1bkFQSVRlc3RzLCBSdW5BUElU ZXN0c1dpdGhvdXRQYXRjaCwKICAgICAgICAgICAgICAgICAgICBSdW5CaW5kaW5nc1Rlc3RzLCBS dW5FV1NCdWlsZGJvdENoZWNrQ29uZmlnLCBSdW5FV1NVbml0VGVzdHMsIFJ1bkphdmFTY3JpcHRD b3JlVGVzdHMsIFJ1bkphdmFTY3JpcHRDb3JlVGVzdHNUb1QsIFJ1bldlYktpdDFUZXN0cywKICAg ICAgICAgICAgICAgICAgICBSdW5XZWJLaXRQZXJsVGVzdHMsIFJ1bldlYktpdFB5VGVzdHMsIFJ1 bldlYktpdFRlc3RzLCBUZXN0V2l0aEZhaWx1cmVDb3VudCwgVHJpZ2dlciwgVHJhbnNmZXJUb1Mz LCBVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkLAotICAgICAgICAgICAgICAgICAgIFVwbG9hZEJ1aWx0 UHJvZHVjdCwgVXBsb2FkVGVzdFJlc3VsdHMsIFZhbGlkYXRlUGF0Y2gpCisgICAgICAgICAgICAg ICAgICAgVXBkYXRlV29ya2luZ0RpcmVjdG9yeSwgVXBsb2FkQnVpbHRQcm9kdWN0LCBVcGxvYWRU ZXN0UmVzdWx0cywgVmFsaWRhdGVQYXRjaCkKIAogIyBXb3JrYXJvdW5kIGZvciBodHRwczovL2dp dGh1Yi5jb20vYnVpbGRib3QvYnVpbGRib3QvaXNzdWVzLzQ2NjkKIGZyb20gYnVpbGRib3QudGVz dC5mYWtlLmZha2VidWlsZCBpbXBvcnQgRmFrZUJ1aWxkCkBAIC0xNDI4LDYgKzE0MjgsNDAgQEAg Y2xhc3MgVGVzdENsZWFuV29ya2luZ0RpcmVjdG9yeShCdWlsZFN0ZQogICAgICAgICByZXR1cm4g c2VsZi5ydW5TdGVwKCkKIAogCitjbGFzcyBUZXN0VXBkYXRlV29ya2luZ0RpcmVjdG9yeShCdWls ZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgorICAgIGRlZiBzZXRVcChz ZWxmKToKKyAgICAgICAgc2VsZi5sb25nTWVzc2FnZSA9IFRydWUKKyAgICAgICAgcmV0dXJuIHNl bGYuc2V0VXBCdWlsZFN0ZXAoKQorCisgICAgZGVmIHRlYXJEb3duKHNlbGYpOgorICAgICAgICBy ZXR1cm4gc2VsZi50ZWFyRG93bkJ1aWxkU3RlcCgpCisKKyAgICBkZWYgdGVzdF9zdWNjZXNzKHNl bGYpOgorICAgICAgICBzZWxmLnNldHVwU3RlcChVcGRhdGVXb3JraW5nRGlyZWN0b3J5KCkpCisg ICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAgICBFeHBlY3RTaGVs bCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZpcm9uPUZh bHNlLAorICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbicsICdUb29scy9T Y3JpcHRzL3VwZGF0ZS13ZWJraXQnXSwKKyAgICAgICAgICAgICAgICAgICAgICAgICkKKyAgICAg ICAgICAgICsgMCwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0 PVNVQ0NFU1MsIHN0YXRlX3N0cmluZz0nVXBkYXRlZCB3b3JraW5nIGRpcmVjdG9yeScpCisgICAg ICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQorCisgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToK KyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoVXBkYXRlV29ya2luZ0RpcmVjdG9yeSgpKQorICAgICAg ICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAorICAgICAgICAgICAgRXhwZWN0U2hlbGwod29y a2Rpcj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwK KyAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvU2NyaXB0 cy91cGRhdGUtd2Via2l0J10sCisgICAgICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAg ICArIEV4cGVjdFNoZWxsLmxvZygnc3RkaW8nLCBzdGRvdXQ9J1VuZXhwZWN0ZWQgZmFpbHVyZS4n KQorICAgICAgICAgICAgKyAyLAorICAgICAgICApCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29t ZShyZXN1bHQ9RkFJTFVSRSwgc3RhdGVfc3RyaW5nPSdVcGRhdGVkIHdvcmtpbmcgZGlyZWN0b3J5 IChmYWlsdXJlKScpCisgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQorCisKIGNsYXNzIFRl c3RVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkKEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgZGVmIHNldFVwKHNlbGYpOgogICAgICAgICBzZWxmLmxvbmdNZXNz YWdlID0gVHJ1ZQo= 374825 2019-07-24 16:12:09 -0700 2019-07-26 12:22:10 -0700 Patch bug-193196-20190724191207.patch text/plain 8394 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0Nzc5MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE5LTA3LTI0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBVc2UgdXBkYXRlLXdlYmtpdCBzY3JpcHQgaW4gU3R5 bGUgRVdTCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTMxOTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHk6CisgICAgICAgIChTdHls ZUZhY3RvcnkpOiBVcGRhdGVkIHRvIHVzZSBDaGVja091dFNvdXJjZSBzdGVwIGFzIHdlbGwuCisg ICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OiBBZGRlZCBidWls ZC1zdGVwIHRvIFVwZGF0ZVdvcmtpbmdEaXJlY3RvcnkuCisgICAgICAgICogQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OiBBZGRlZCB1bml0LXRlc3RzLgorCiAy MDE5LTA3LTI0ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KIAogICAgICAg ICBydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMgd29uJ3QgcmVwb3J0IHRlc3QgcmVzdWx0cyBmb3Ig dGVzdG1hc20sIHRlc3RhaXIsIHRlc3RiMywgdGVzdGRmZyBhbmQgdGVzdCBhcGkKSW5kZXg6IFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQkocmV2aXNp b24gMjQ3NzkyKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmll cy5weQkod29ya2luZyBjb3B5KQpAQCAtMjksNyArMjksNyBAQCBmcm9tIHN0ZXBzIGltcG9ydCAo QXBwbHlQYXRjaCwgQ2hlY2tPdXRTCiAgICAgICAgICAgICAgICAgICAgRG93bmxvYWRCdWlsdFBy b2R1Y3QsIEV4dHJhY3RCdWlsdFByb2R1Y3QsIEluc3RhbGxHdGtEZXBlbmRlbmNpZXMsIEluc3Rh bGxXcGVEZXBlbmRlbmNpZXMsIEtpbGxPbGRQcm9jZXNzZXMsCiAgICAgICAgICAgICAgICAgICAg UHJpbnRDb25maWd1cmF0aW9uLCBSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMsIFJ1bkFQSVRlc3Rz LCBSdW5CaW5kaW5nc1Rlc3RzLCBSdW5FV1NCdWlsZGJvdENoZWNrQ29uZmlnLCBSdW5FV1NVbml0 VGVzdHMsCiAgICAgICAgICAgICAgICAgICAgUnVuSmF2YVNjcmlwdENvcmVUZXN0cywgUnVuSmF2 YVNjcmlwdENvcmVUZXN0c1RvVCwgUnVuV2ViS2l0MVRlc3RzLCBSdW5XZWJLaXRQZXJsVGVzdHMs Ci0gICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0UHlUZXN0cywgUnVuV2ViS2l0VGVzdHMsIFVu QXBwbHlQYXRjaElmUmVxdWlyZWQsIFZhbGlkYXRlUGF0Y2gpCisgICAgICAgICAgICAgICAgICAg UnVuV2ViS2l0UHlUZXN0cywgUnVuV2ViS2l0VGVzdHMsIFVuQXBwbHlQYXRjaElmUmVxdWlyZWQs IFVwZGF0ZVdvcmtpbmdEaXJlY3RvcnksIFZhbGlkYXRlUGF0Y2gpCiAKIAogY2xhc3MgRmFjdG9y eShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CkBAIC00OCw5ICs0OCwxNSBAQCBjbGFzcyBGYWN0b3J5 KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKICAgICAgICAgc2VsZi5hZGRTdGVwKEFwcGx5UGF0Y2go KSkKIAogCi1jbGFzcyBTdHlsZUZhY3RvcnkoRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5pdF9fKHNl bGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYWRk aXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6Ci0gICAgICAgIEZhY3RvcnkuX19pbml0 X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCBh ZGRpdGlvbmFsQXJndW1lbnRzKQorY2xhc3MgU3R5bGVGYWN0b3J5KGZhY3RvcnkuQnVpbGRGYWN0 b3J5KToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Tm9u ZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRz PU5vbmUsICoqa3dhcmdzKToKKyAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19pbml0X18o c2VsZikKKyAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkKHBsYXRmb3JtLCBjb25m aWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1 bWVudHMpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoVmFsaWRhdGVQYXRjaCgpKQorICAgICAgICBz ZWxmLmFkZFN0ZXAoUHJpbnRDb25maWd1cmF0aW9uKCkpCisgICAgICAgIHNlbGYuYWRkU3RlcChD aGVja091dFNvdXJjZSgpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoVXBkYXRlV29ya2luZ0RpcmVj dG9yeSgpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoQXBwbHlQYXRjaCgpKQogICAgICAgICBzZWxm LmFkZFN0ZXAoQ2hlY2tTdHlsZSgpKQogCiAKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvc3RlcHMucHkJKHJldmlzaW9uIDI0Nzc5MikKKysrIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMTU5LDYgKzE1 OSwxOCBAQCBjbGFzcyBDbGVhbldvcmtpbmdEaXJlY3Rvcnkoc2hlbGwuU2hlbGxDCiAgICAgICAg IHN1cGVyKENsZWFuV29ya2luZ0RpcmVjdG9yeSwgc2VsZikuX19pbml0X18obG9nRW52aXJvbj1G YWxzZSwgKiprd2FyZ3MpCiAKIAorY2xhc3MgVXBkYXRlV29ya2luZ0RpcmVjdG9yeShzaGVsbC5T aGVsbENvbW1hbmQpOgorICAgIG5hbWUgPSAndXBkYXRlLXdvcmtpbmctZGlyZWN0b3J5JworICAg IGRlc2NyaXB0aW9uID0gWyd1cGRhdGUtd29ya3JpbmctZGlyZWN0b3J5IHJ1bm5pbmcnXQorICAg IGRlc2NyaXB0aW9uRG9uZSA9IFsnVXBkYXRlZCB3b3JraW5nIGRpcmVjdG9yeSddCisgICAgZmx1 bmtPbkZhaWx1cmUgPSBUcnVlCisgICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKKyAgICBjb21tYW5k ID0gWydwZXJsJywgJ1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdCddCisKKyAgICBkZWYgX19p bml0X18oc2VsZiwgKiprd2FyZ3MpOgorICAgICAgICBzdXBlcihVcGRhdGVXb3JraW5nRGlyZWN0 b3J5LCBzZWxmKS5fX2luaXRfXyhsb2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJncykKKworCiBjbGFz cyBBcHBseVBhdGNoKHNoZWxsLlNoZWxsQ29tbWFuZCwgQ29tcG9zaXRlU3RlcE1peGluKToKICAg ICBuYW1lID0gJ2FwcGx5LXBhdGNoJwogICAgIGRlc2NyaXB0aW9uID0gWydhcHBseWluZy1wYXRj aCddCkBAIC01MDUsNiArNTE3LDkgQEAgY2xhc3MgQ2hlY2tTdHlsZShUZXN0V2l0aEZhaWx1cmVD b3VudCk6CiAgICAgZmFpbGVkVGVzdHNGb3JtYXRTdHJpbmcgPSAnJWQgc3R5bGUgZXJyb3IlcycK ICAgICBjb21tYW5kID0gWydweXRob24nLCAnVG9vbHMvU2NyaXB0cy9jaGVjay13ZWJraXQtc3R5 bGUnXQogCisgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToKKyAgICAgICAgc3VwZXIo Q2hlY2tTdHlsZSwgc2VsZikuX19pbml0X18obG9nRW52aXJvbj1GYWxzZSwgKiprd2FyZ3MpCisK ICAgICBkZWYgY291bnRGYWlsdXJlcyhzZWxmLCBjbWQpOgogICAgICAgICBsb2dfdGV4dCA9IHNl bGYubG9nX29ic2VydmVyLmdldFN0ZG91dCgpICsgc2VsZi5sb2dfb2JzZXJ2ZXIuZ2V0U3RkZXJy KCkKIApJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0 ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9z dGVwc191bml0dGVzdC5weQkocmV2aXNpb24gMjQ3NzkyKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MSw3 ICs0MSw3IEBAIGZyb20gc3RlcHMgaW1wb3J0IChBbmFseXplQVBJVGVzdHNSZXN1bHQKICAgICAg ICAgICAgICAgICAgICBQcmludENvbmZpZ3VyYXRpb24sIFJlUnVuQVBJVGVzdHMsIFJlUnVuSmF2 YVNjcmlwdENvcmVUZXN0cywgUmVSdW5XZWJLaXRUZXN0cywgUnVuQVBJVGVzdHMsIFJ1bkFQSVRl c3RzV2l0aG91dFBhdGNoLAogICAgICAgICAgICAgICAgICAgIFJ1bkJpbmRpbmdzVGVzdHMsIFJ1 bkVXU0J1aWxkYm90Q2hlY2tDb25maWcsIFJ1bkVXU1VuaXRUZXN0cywgUnVuSmF2YVNjcmlwdENv cmVUZXN0cywgUnVuSmF2YVNjcmlwdENvcmVUZXN0c1RvVCwgUnVuV2ViS2l0MVRlc3RzLAogICAg ICAgICAgICAgICAgICAgIFJ1bldlYktpdFBlcmxUZXN0cywgUnVuV2ViS2l0UHlUZXN0cywgUnVu V2ViS2l0VGVzdHMsIFRlc3RXaXRoRmFpbHVyZUNvdW50LCBUcmlnZ2VyLCBUcmFuc2ZlclRvUzMs IFVuQXBwbHlQYXRjaElmUmVxdWlyZWQsCi0gICAgICAgICAgICAgICAgICAgVXBsb2FkQnVpbHRQ cm9kdWN0LCBVcGxvYWRUZXN0UmVzdWx0cywgVmFsaWRhdGVQYXRjaCkKKyAgICAgICAgICAgICAg ICAgICBVcGRhdGVXb3JraW5nRGlyZWN0b3J5LCBVcGxvYWRCdWlsdFByb2R1Y3QsIFVwbG9hZFRl c3RSZXN1bHRzLCBWYWxpZGF0ZVBhdGNoKQogCiAjIFdvcmthcm91bmQgZm9yIGh0dHBzOi8vZ2l0 aHViLmNvbS9idWlsZGJvdC9idWlsZGJvdC9pc3N1ZXMvNDY2OQogZnJvbSBidWlsZGJvdC50ZXN0 LmZha2UuZmFrZWJ1aWxkIGltcG9ydCBGYWtlQnVpbGQKQEAgLTIxNCw2ICsyMTQsNyBAQCBjbGFz cyBUZXN0Q2hlY2tTdHlsZShCdWlsZFN0ZXBNaXhpbkFkZGl0CiAKICAgICAgICAgc2VsZi5leHBl Y3RSZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGly JywKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCiAgICAgICAgICAg ICAgICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvY2hlY2std2Vi a2l0LXN0eWxlJ10sCiAgICAgICAgICAgICAgICAgICAgICAgICApCiAgICAgICAgICAgICArIDAs CkBAIC0yMjksNiArMjMwLDcgQEAgY2xhc3MgVGVzdENoZWNrU3R5bGUoQnVpbGRTdGVwTWl4aW5B ZGRpdAogCiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCiAgICAgICAgICAgICBF eHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dF bnZpcm9uPUZhbHNlLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbics ICdUb29scy9TY3JpcHRzL2NoZWNrLXdlYmtpdC1zdHlsZSddLAogICAgICAgICAgICAgICAgICAg ICAgICAgKQogICAgICAgICAgICAgKyAyLApAQCAtMjQ0LDYgKzI0Niw3IEBAIGNsYXNzIFRlc3RD aGVja1N0eWxlKEJ1aWxkU3RlcE1peGluQWRkaXQKIAogICAgICAgICBzZWxmLmV4cGVjdFJlbW90 ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAg ICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvU2NyaXB0cy9jaGVjay13ZWJraXQtc3R5 bGUnXSwKICAgICAgICAgICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICsgRXhwZWN0U2hl bGwubG9nKCdzdGRpbycsIHN0ZG91dD0nJydFUlJPUjogU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zs b2F0aW5nQ29udGV4dC5jcHA6MzY6ICBDb2RlIGluc2lkZSBhIG5hbWVzcGFjZSBzaG91bGQgbm90 IGJlIGluZGVudGVkLiAgW3doaXRlc3BhY2UvaW5kZW50XSBbNF0KQEAgLTI2Niw2ICsyNjksNyBA QCBUb3RhbCBlcnJvcnMgZm91bmQ6IDggaW4gNDggZmlsZXMnJycpCiAKICAgICAgICAgc2VsZi5l eHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3dr ZGlyJywKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCiAgICAgICAg ICAgICAgICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvY2hlY2st d2Via2l0LXN0eWxlJ10sCiAgICAgICAgICAgICAgICAgICAgICAgICApCiAgICAgICAgICAgICAr IEV4cGVjdFNoZWxsLmxvZygnc3RkaW8nLCBzdGRvdXQ9J1RvdGFsIGVycm9ycyBmb3VuZDogMCBp biA2IGZpbGVzJykKQEAgLTI4Miw2ICsyODYsNyBAQCBUb3RhbCBlcnJvcnMgZm91bmQ6IDggaW4g NDggZmlsZXMnJycpCiAKICAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAg ICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKKyAgICAgICAgICAgICAgICAgICAg ICAgIGxvZ0Vudmlyb249RmFsc2UsCiAgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsn cHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvY2hlY2std2Via2l0LXN0eWxlJ10sCiAgICAgICAgICAg ICAgICAgICAgICAgICApCiAgICAgICAgICAgICArIEV4cGVjdFNoZWxsLmxvZygnc3RkaW8nLCBz dGRvdXQ9J1RvdGFsIGVycm9ycyBmb3VuZDogMCBpbiAwIGZpbGVzJykKQEAgLTE0MjgsNiArMTQz Myw0MCBAQCBjbGFzcyBUZXN0Q2xlYW5Xb3JraW5nRGlyZWN0b3J5KEJ1aWxkU3RlCiAgICAgICAg IHJldHVybiBzZWxmLnJ1blN0ZXAoKQogCiAKK2NsYXNzIFRlc3RVcGRhdGVXb3JraW5nRGlyZWN0 b3J5KEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6CisgICAgZGVm IHNldFVwKHNlbGYpOgorICAgICAgICBzZWxmLmxvbmdNZXNzYWdlID0gVHJ1ZQorICAgICAgICBy ZXR1cm4gc2VsZi5zZXRVcEJ1aWxkU3RlcCgpCisKKyAgICBkZWYgdGVhckRvd24oc2VsZik6Cisg ICAgICAgIHJldHVybiBzZWxmLnRlYXJEb3duQnVpbGRTdGVwKCkKKworICAgIGRlZiB0ZXN0X3N1 Y2Nlc3Moc2VsZik6CisgICAgICAgIHNlbGYuc2V0dXBTdGVwKFVwZGF0ZVdvcmtpbmdEaXJlY3Rv cnkoKSkKKyAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKKyAgICAgICAgICAgIEV4 cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vu dmlyb249RmFsc2UsCisgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsncGVybCcsICdU b29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQnXSwKKyAgICAgICAgICAgICAgICAgICAgICAgICkK KyAgICAgICAgICAgICsgMCwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUo cmVzdWx0PVNVQ0NFU1MsIHN0YXRlX3N0cmluZz0nVXBkYXRlZCB3b3JraW5nIGRpcmVjdG9yeScp CisgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQorCisgICAgZGVmIHRlc3RfZmFpbHVyZShz ZWxmKToKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoVXBkYXRlV29ya2luZ0RpcmVjdG9yeSgpKQor ICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAorICAgICAgICAgICAgRXhwZWN0U2hl bGwod29ya2Rpcj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1G YWxzZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydwZXJsJywgJ1Rvb2xzL1Nj cmlwdHMvdXBkYXRlLXdlYmtpdCddLAorICAgICAgICAgICAgICAgICAgICAgICAgKQorICAgICAg ICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdVbmV4cGVjdGVkIGZhaWx1 cmUuJykKKyAgICAgICAgICAgICsgMiwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdE91 dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nVXBkYXRlZCB3b3JraW5nIGRpcmVj dG9yeSAoZmFpbHVyZSknKQorICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKworCiBjbGFz cyBUZXN0VW5BcHBseVBhdGNoSWZSZXF1aXJlZChCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5p dHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBzZXRVcChzZWxmKToKICAgICAgICAgc2VsZi5sb25n TWVzc2FnZSA9IFRydWUK