215072 2020-08-01 21:37:48 -0700 Improve the check-for-duplicated-platform-test-results script 2020-08-03 13:33:01 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=215069 https://bugs.webkit.org/show_bug.cgi?id=176686 InRadar P2 Normal --- 1 simon.fraser simon.fraser cgarcia darin ews-watchlist glenn jbedard ryanhaddad simon.fraser webkit-bug-importer oldest_to_newest 1677202 0 simon.fraser 2020-08-01 21:37:48 -0700 Improve the check-for-duplicated-platform-test-results script 1677203 1 405806 simon.fraser 2020-08-01 21:43:39 -0700 Created attachment 405806 Patch 1677226 2 darin 2020-08-02 12:25:32 -0700 I haven’t studied the relationship between the two, but I would love it if the rules for search path in run-webkit-tests was the same as in this script. So if it changed, the two would continue to share the same behavior. Seems possible given all the library things we do with Python. 1677250 3 simon.fraser 2020-08-02 23:22:41 -0700 (In reply to Darin Adler from comment #2) > I haven’t studied the relationship between the two, but I would love it if > the rules for search path in run-webkit-tests was the same as in this > script. So if it changed, the two would continue to share the same behavior. > Seems possible given all the library things we do with Python. I think this script gets its search path rules from webkitpy, so they should be the same. What's odd about this script is that it creates Ports for platforms which are not the current platform, which never happens with run-webkit-tests. That probably results in some differences. 1677251 4 ews-feeder 2020-08-02 23:41:50 -0700 Committed r265191: <https://trac.webkit.org/changeset/265191> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405806. 1677390 5 webkit-bug-importer 2020-08-03 13:33:01 -0700 <rdar://problem/66489056> 405806 2020-08-01 21:43:39 -0700 2020-08-02 23:41:51 -0700 Patch bug-215072-20200801214338.patch text/plain 14761 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MTc2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzllZmRlOWNkMWM0MTg3ZmQ0ODYzNzY0ODlkZjFhOGI3 MmUwZWI3Yy4uNDY5YmQwMTJmZjIzYTIzZDlkZWVkY2JkN2U5YTY2MTFmOWE4YmEyYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5 IEBACisyMDIwLTA4LTAxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIEltcHJvdmUgdGhlIGNoZWNrLWZvci1kdXBsaWNhdGVkLXBsYXRmb3JtLXRlc3Qt cmVzdWx0cyBzY3JpcHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNTA3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAg ICAgICAKKyAgICAgICAgY2hlY2stZm9yLWR1cGxpY2F0ZWQtcGxhdGZvcm0tdGVzdC1yZXN1bHRz IGhhZCBzb21lIHByb2JsZW1zLgorICAgICAgICAKKyAgICAgICAgRmlyc3QsIGl0IGRlZmF1bHRl ZCB0byAtd2sxIHJlc3VsdHMgZGlyZWN0b3JpZXMsIGFuZCBkaWRuJ3QgY2hlY2sgLXdrMiBkaXJl Y3Rvcmllcywgc28KKyAgICAgICAgcnVuIHRoZSBsb2dpYyB0d2ljZSwgd2l0aCBvcHRpb25zLndl YmtpdF90ZXN0X3J1bm5lciBUcnVlIGFuZCBGYWxzZS4KKyAgICAgICAgU2Vjb25kLCBpdCBvbmx5 IGxvb2tlZCBmb3IgcmVzdWx0cyBpbiB0aGUgbW9zdCBzcGVjaWZpYyBmYWxsYmFjayBkaXJlY3Rv cnksIHNvCisgICAgICAgIHdpdGggYSBmYWxsYmFjayBwYXRoIGxpa2UgJ21hYy1tb2phdmUtd2sx IC0+IG1hYy1tb2phdmUgLT4gbWFjLXdrMSAtPiBtYWMgLT4gZ2VuZXJpYycKKyAgICAgICAgaXQg d291bGQgb25seSByZW1vdmUgcmVzdWx0cyBpbiBtYWMtbW9qYXZlLXdrMSwgbm90IGluICdtYWMt bW9qYXZlJy4KKyAgICAgICAgQWxzbyBhZGQgc29tZSBsb2dnaW5nIHRvIHRoZSBzY3JpcHQuCisK KyAgICAgICAgKiBTY3JpcHRzL2NoZWNrLWZvci1kdXBsaWNhdGVkLXBsYXRmb3JtLXRlc3QtcmVz dWx0czoKKyAgICAgICAgKHJlbW92ZV9sYXlvdXRfdGVzdF9wYXRoX3ByZWZpeCk6CisgICAgICAg IChjaGVja19kdXBsaWNhdGUuc2hhMSk6CisgICAgICAgIChjaGVja19kdXBsaWNhdGUpOgorICAg ICAgICAocGxhdGZvcm1fbGlzdCk6CisgICAgICAgIChmaW5kX2R1cGxpY2F0ZXNfaW5fcGF0aCk6 CisgICAgICAgIChmaW5kX2R1cGxpY2F0ZXNfaW5fcGF0aC5maW5kX2R1cGxpY2F0ZXMpOgorICAg ICAgICAoY2hlY2tfcGxhdGZvcm0pOgorICAgICAgICAobWFpbik6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQb3J0LnN1cHBvcnRzX2xheW91dF90 ZXN0cyk6IFNvbWUgcG9ydHMgKGlPUyBhbmQgd2F0Y2ggZGV2aWNlIHBvcnRzKSBkb24ndCBzdXBw b3J0CisgICAgICAgIHRlc3Rpbmcgd2l0aCBubyBhc3NvY2lhdGVkIGRldmljZS4gTmVlZCB0byBm aXggZXJyb3JzIHRocm93biBmcm9tIGRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoKS4KKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZS5weToKKyAgICAgICAgKElP U0RldmljZVBvcnQuc3VwcG9ydHNfbGF5b3V0X3Rlc3RzKToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3BvcnQvd2F0Y2hfZGV2aWNlLnB5OgorICAgICAgICAoV2F0Y2hEZXZpY2VQb3J0LnN1 cHBvcnRzX2xheW91dF90ZXN0cyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3dp bi5weTogc2VsZi5fb3NfdmVyc2lvbiBpcyBOb25lIHdoZW4gcnVuIG9uIGFub3RoZXIgcGxhdGZv cm0uCisgICAgICAgIChXaW5Qb3J0LmRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgpOgorICAg ICAgICAoV2luQ2Fpcm9Qb3J0Ll9zZWFyY2hfcGF0aHMpOgorCiAyMDIwLTA3LTMxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXNlIG1vcmUg aW5jbHVzaXZlIHRlcm1pbm9sb2d5IGluIFRvb2xzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L2NoZWNrLWZvci1kdXBsaWNhdGVkLXBsYXRmb3JtLXRlc3QtcmVzdWx0cyBiL1Rvb2xzL1Njcmlw dHMvY2hlY2stZm9yLWR1cGxpY2F0ZWQtcGxhdGZvcm0tdGVzdC1yZXN1bHRzCmluZGV4IDA0YmFi MjA5YTcyZmIxNGY0Nzc5YzgzYjcyNTk2ZjJiMDFkMTc5YTkuLmU4NTViNWNmNGE5ZTk3Nzc0MWQx ZWEzM2U0YTk5Y2QwNjc2MDI2MWUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvY2hlY2stZm9y LWR1cGxpY2F0ZWQtcGxhdGZvcm0tdGVzdC1yZXN1bHRzCisrKyBiL1Rvb2xzL1NjcmlwdHMvY2hl Y2stZm9yLWR1cGxpY2F0ZWQtcGxhdGZvcm0tdGVzdC1yZXN1bHRzCkBAIC0xOCw5ICsxOCwxNCBA QAogIyBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KIAogaW1wb3J0IGhhc2hsaWIKK2ltcG9y dCBsb2dnaW5nCiBpbXBvcnQgb3B0cGFyc2UKIGltcG9ydCBvcworaW1wb3J0IHN5cwogZnJvbSB3 ZWJraXRweS5jb21tb24uaG9zdCBpbXBvcnQgSG9zdAorZnJvbSB3ZWJraXRweS5jb21tb24uc3lz dGVtLmxvZ3V0aWxzIGltcG9ydCBjb25maWd1cmVfbG9nZ2luZworCitfbG9nID0gbG9nZ2luZy5n ZXRMb2dnZXIoX19uYW1lX18pCiAKIGhvc3QgPSBIb3N0KCkKIGhvc3QuaW5pdGlhbGl6ZV9zY20o KQpAQCAtMjgsMTIgKzMzLDIyIEBAIGNoZWNrb3V0X3Jvb3QgPSBob3N0LnNjbSgpLmNoZWNrb3V0 X3Jvb3QKIGxheW91dF90ZXN0c19kaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4oY2hlY2tvdXRfcm9v dCwgJ0xheW91dFRlc3RzJykKIHBsYXRmb3JtX2RpcmVjdG9yeSA9IG9zLnBhdGguam9pbihsYXlv dXRfdGVzdHNfZGlyZWN0b3J5LCAncGxhdGZvcm0nKQogCitJR05PUkVEX0ZJTEVfTkFNRVMgPSB7 CisgICAgJ1Rlc3RFeHBlY3RhdGlvbnMnLAorICAgICcuRFNfU3RvcmUnCit9CisKKworZGVmIHJl bW92ZV9sYXlvdXRfdGVzdF9wYXRoX3ByZWZpeChmdWxsX3BhdGgpOgorICAgIHJldHVybiBvcy5w YXRoLnJlbHBhdGgoZnVsbF9wYXRoLCBsYXlvdXRfdGVzdHNfZGlyZWN0b3J5KQogCiBkZWYgY2hl Y2tfZHVwbGljYXRlKHBsYXRmb3JtLCBiYXNlbGluZV9zZWFyY2hfcGF0aCwgcGxhdGZvcm1fdGVz dF9yZXN1bHQpOgogICAgIGRlZiBzaGExKHBhdGgpOgogICAgICAgICB3aXRoIGZpbGUocGF0aCwg J3JiJykgYXMgZjoKICAgICAgICAgICAgIHJldHVybiBoYXNobGliLnNoYTEoZi5yZWFkKCkpLmhl eGRpZ2VzdCgpCiAKKyAgICBfbG9nLmRlYnVnKCcgICBMb29raW5nIGZvciBkdXBsaWNhdGVzIG9m IHswfSBpbiB7MX0nLmZvcm1hdChyZW1vdmVfbGF5b3V0X3Rlc3RfcGF0aF9wcmVmaXgocGxhdGZv cm1fdGVzdF9yZXN1bHQpLCBzdHIoYmFzZWxpbmVfc2VhcmNoX3BhdGgpKSkKKwogICAgIHByZWZp eF9sZW4gPSBsZW4ob3MucGF0aC5qb2luKHBsYXRmb3JtX2RpcmVjdG9yeSwgcGxhdGZvcm0pKSAr IDEKICAgICB0ZXN0X3Jlc3VsdF9maWxlbmFtZSA9IHBsYXRmb3JtX3Rlc3RfcmVzdWx0W3ByZWZp eF9sZW46XQogICAgIHBsYXRmb3JtX3Rlc3RfcmVzdWx0X3NpemUgPSBOb25lCkBAIC00MywyMSAr NTgsMjggQEAgZGVmIGNoZWNrX2R1cGxpY2F0ZShwbGF0Zm9ybSwgYmFzZWxpbmVfc2VhcmNoX3Bh dGgsIHBsYXRmb3JtX3Rlc3RfcmVzdWx0KToKICAgICBmb3IgYmFzZWxpbmVfcGF0aCBpbiBiYXNl bGluZV9zZWFyY2hfcGF0aDoKICAgICAgICAgYmFzZWxpbmVfdGVzdF9yZXN1bHQgPSBvcy5wYXRo LmpvaW4oYmFzZWxpbmVfcGF0aCwgdGVzdF9yZXN1bHRfZmlsZW5hbWUpCiAgICAgICAgIGlmIG5v dCBvcy5wYXRoLmlzZmlsZShiYXNlbGluZV90ZXN0X3Jlc3VsdCk6CisgICAgICAgICAgICBfbG9n LmRlYnVnKCcgICAgTm8gcmVzdWx0IGF0IHswfScuZm9ybWF0KHJlbW92ZV9sYXlvdXRfdGVzdF9w YXRoX3ByZWZpeChiYXNlbGluZV90ZXN0X3Jlc3VsdCkpKQogICAgICAgICAgICAgY29udGludWUK IAorICAgICAgICBfbG9nLmRlYnVnKCcgICAgQ29tcGFyaW5nIHdpdGggezB9Jy5mb3JtYXQocmVt b3ZlX2xheW91dF90ZXN0X3BhdGhfcHJlZml4KGJhc2VsaW5lX3Rlc3RfcmVzdWx0KSkpCisKICAg ICAgICAgYmFzZWxpbmVfZm91bmQgPSBUcnVlCiAgICAgICAgIGlmIHBsYXRmb3JtX3Rlc3RfcmVz dWx0X3NpemUgaXMgTm9uZToKICAgICAgICAgICAgIHBsYXRmb3JtX3Rlc3RfcmVzdWx0X3NpemUg PSBvcy5wYXRoLmdldHNpemUocGxhdGZvcm1fdGVzdF9yZXN1bHQpCiAgICAgICAgIGJhc2VsaW5l X3Rlc3RfcmVzdWx0X3NpemUgPSBvcy5wYXRoLmdldHNpemUoYmFzZWxpbmVfdGVzdF9yZXN1bHQp CiAgICAgICAgIGlmIHBsYXRmb3JtX3Rlc3RfcmVzdWx0X3NpemUgIT0gYmFzZWxpbmVfdGVzdF9y ZXN1bHRfc2l6ZToKKyAgICAgICAgICAgIF9sb2cuZGVidWcoJyAgICBGaWxlIHNpemUgaXMgZGlm ZmVyZW50JykKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogCiAgICAgICAgIGlmIHBsYXRmb3Jt X3Rlc3RfcmVzdWx0X3NoYTEgaXMgTm9uZToKICAgICAgICAgICAgIHBsYXRmb3JtX3Rlc3RfcmVz dWx0X3NoYTEgPSBzaGExKHBsYXRmb3JtX3Rlc3RfcmVzdWx0KQogICAgICAgICBiYXNlbGluZV90 ZXN0X3Jlc3VsdF9zaGExID0gc2hhMShiYXNlbGluZV90ZXN0X3Jlc3VsdCkKICAgICAgICAgaWYg cGxhdGZvcm1fdGVzdF9yZXN1bHRfc2hhMSAhPSBiYXNlbGluZV90ZXN0X3Jlc3VsdF9zaGExOgor ICAgICAgICAgICAgX2xvZy5kZWJ1ZygnICAgIEZpbGUgaGFzaCBpcyBkaWZmZXJlbnQnKQogICAg ICAgICAgICAgcmV0dXJuIEZhbHNlCiAKKyAgICAgICAgX2xvZy5kZWJ1ZygnICAgRHVwbGljYXRl IGZvdW5kOiB7MH0gYW5kIHsxfScuZm9ybWF0KHJlbW92ZV9sYXlvdXRfdGVzdF9wYXRoX3ByZWZp eChwbGF0Zm9ybV90ZXN0X3Jlc3VsdCksIHJlbW92ZV9sYXlvdXRfdGVzdF9wYXRoX3ByZWZpeChi YXNlbGluZV90ZXN0X3Jlc3VsdCkpKQorCiAgICAgcmV0dXJuIGJhc2VsaW5lX2ZvdW5kCiAKIApA QCAtNjgsNTAgKzkwLDEwNCBAQCBkZWYgcGxhdGZvcm1fbGlzdChwbGF0Zm9ybSk6CiAgICAgICAg IHJldHVybiBbcGxhdGZvcm1dCiAgICAgcmV0dXJuIFtdCiAKK2RlZiBmaW5kX2R1cGxpY2F0ZXNf aW5fcGF0aChiYXNlbGluZV9zZWFyY2hfcGF0aCk6CisgICAgZHVwbGljYXRlcyA9IFtdCisgICAg cmVtYWluaW5nX3BhdGhzID0gYmFzZWxpbmVfc2VhcmNoX3BhdGgKIAotb3B0aW9uX3BhcnNlciA9 IG9wdHBhcnNlLk9wdGlvblBhcnNlcih1c2FnZT0ndXNhZ2U6ICVwcm9nIFtvcHRpb25zXScpCi1v cHRpb25fcGFyc2VyLmFkZF9vcHRpb24oJy1wJywgJy0tcGxhdGZvcm0nLAotICAgICAgICAgICAg ICAgICAgICAgICAgIGFjdGlvbj0nc3RvcmUnLCBkZXN0PSdwbGF0Zm9ybScsIGRlZmF1bHQ9J2Fs bCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0nUGxhdGZvcm0gdG8gY2hlY2sgZm9y IGR1cGxpY2F0ZWQgcmVzdWx0cy4gQnkgdGhlIGRlZmF1bHQgYWxsIHBsYXRmb3JtIGFyZSBjaGVj a2VkJykKLW9wdGlvbl9wYXJzZXIuYWRkX29wdGlvbignLW4nLCAnLS1uby1kZWxldGUnLAotICAg ICAgICAgICAgICAgICAgICAgICAgIGFjdGlvbj0nc3RvcmVfdHJ1ZScsIGRlc3Q9J25vX2RlbGV0 ZScsCi0gICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0nRG8gbm90IGRlbGV0ZSB0aGUgZHVw bGljYXRlZCByZXN1bHRzIGZvdW5kIGZyb20gdGhlIHJlcG9zaXRvcnksIGxpc3QgdGhlbSBpbnN0 ZWFkJykKLW9wdGlvbnMsIGFyZ3MgPSBvcHRpb25fcGFyc2VyLnBhcnNlX2FyZ3MoKQotCi10b3Rh bCA9IDAKLWJhc2VsaW5lX3NlYXJjaF9wYXRoc19jaGVja2VkID0gc2V0KCkKLWZvciBwbGF0Zm9y bSBpbiBwbGF0Zm9ybV9saXN0KG9wdGlvbnMucGxhdGZvcm0pOgotICAgIHRyeToKLSAgICAgICAg cG9ydCA9IGhvc3QucG9ydF9mYWN0b3J5LmdldChwbGF0Zm9ybSkKLSAgICAgICAgYmFzZWxpbmVf c2VhcmNoX3BhdGggPSB0dXBsZShbcCBmb3IgcCBpbiBwb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRo KCkgaWYgb3MucGF0aC5pc2RpcihwKV0gKyBbbGF5b3V0X3Rlc3RzX2RpcmVjdG9yeV0pCi0gICAg ZXhjZXB0OgotICAgICAgICBjb250aW51ZQotCi0gICAgaWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgg aW4gYmFzZWxpbmVfc2VhcmNoX3BhdGhzX2NoZWNrZWQ6Ci0gICAgICAgIGNvbnRpbnVlCi0gICAg YmFzZWxpbmVfc2VhcmNoX3BhdGhzX2NoZWNrZWQuYWRkKGJhc2VsaW5lX3NlYXJjaF9wYXRoKQor ICAgIGRlZiBmaW5kX2R1cGxpY2F0ZXMoKToKKyAgICAgICAgX2xvZy5kZWJ1ZygnIGNvbXBhcmlu ZyBmaWxlcyBpbiB7MH0gYW5kIHsxfScuZm9ybWF0KHJlbW92ZV9sYXlvdXRfdGVzdF9wYXRoX3By ZWZpeChyZW1haW5pbmdfcGF0aHNbMF0pLCByZW1vdmVfbGF5b3V0X3Rlc3RfcGF0aF9wcmVmaXgo cmVtYWluaW5nX3BhdGhzWzFdKSkpCisgICAgICAgIGZvciByb290LCBkaXJzLCBmaWxlcyBpbiBv cy53YWxrKHJlbWFpbmluZ19wYXRoc1swXSk6CisgICAgICAgICAgICBmb3IgZmlsZV9uYW1lIGlu IGZpbGVzOgorICAgICAgICAgICAgICAgIGlmIGZpbGVfbmFtZSBpbiBJR05PUkVEX0ZJTEVfTkFN RVM6CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAKLSAgICBkdXBsaWNhdGVzID0gW10K LSAgICBmb3Igcm9vdCwgZGlycywgZmlsZXMgaW4gb3Mud2FsayhiYXNlbGluZV9zZWFyY2hfcGF0 aFswXSk6Ci0gICAgICAgIGZvciBmaWxlX25hbWUgaW4gZmlsZXM6Ci0gICAgICAgICAgICBwbGF0 Zm9ybV90ZXN0X3Jlc3VsdCA9IG9zLnBhdGguam9pbihyb290LCBmaWxlX25hbWUpCi0gICAgICAg ICAgICBpZiBjaGVja19kdXBsaWNhdGUoYmFzZWxpbmVfc2VhcmNoX3BhdGhbMF0sIGJhc2VsaW5l X3NlYXJjaF9wYXRoWzE6XSwgcGxhdGZvcm1fdGVzdF9yZXN1bHQpOgotICAgICAgICAgICAgICAg IGR1cGxpY2F0ZXMuYXBwZW5kKHBsYXRmb3JtX3Rlc3RfcmVzdWx0KQotCi0gICAgaWYgbm90IGR1 cGxpY2F0ZXM6Ci0gICAgICAgIGNvbnRpbnVlCi0gICAgaWYgb3B0aW9ucy5ub19kZWxldGU6Ci0g ICAgICAgIHByaW50ICJcbiIuam9pbihkdXBsaWNhdGVzKQotICAgIGVsc2U6Ci0gICAgICAgIGhv c3Quc2NtKCkuZGVsZXRlX2xpc3QoZHVwbGljYXRlcykKKyAgICAgICAgICAgICAgICBwbGF0Zm9y bV90ZXN0X3Jlc3VsdCA9IG9zLnBhdGguam9pbihyb290LCBmaWxlX25hbWUpCisgICAgICAgICAg ICAgICAgaWYgY2hlY2tfZHVwbGljYXRlKHJlbWFpbmluZ19wYXRoc1swXSwgcmVtYWluaW5nX3Bh dGhzWzE6XSwgcGxhdGZvcm1fdGVzdF9yZXN1bHQpOgorICAgICAgICAgICAgICAgICAgICBkdXBs aWNhdGVzLmFwcGVuZChwbGF0Zm9ybV90ZXN0X3Jlc3VsdCkKKworICAgIHdoaWxlIGxlbihyZW1h aW5pbmdfcGF0aHMpID4gMToKKyAgICAgICAgZmluZF9kdXBsaWNhdGVzKCkKKyAgICAgICAgcmVt YWluaW5nX3BhdGhzID0gcmVtYWluaW5nX3BhdGhzWzE6XQogCi0gICAgZHVwbGljYXRlc19sZW4g PSBsZW4oZHVwbGljYXRlcykKLSAgICB0b3RhbCArPSBkdXBsaWNhdGVzX2xlbgotICAgIHByaW50 ICclZCBmb3VuZCBpbiAlcyAtPiBnZW5lcmljJyAlIChkdXBsaWNhdGVzX2xlbiwgJyAtPiAnLmpv aW4oW29zLnBhdGguYmFzZW5hbWUocCkgZm9yIHAgaW4gYmFzZWxpbmVfc2VhcmNoX3BhdGhbOi0x XV0pKQorICAgIHJldHVybiBkdXBsaWNhdGVzCiAKLWlmIHRvdGFsOgotICAgIGlmIG5vdCBvcHRp b25zLm5vX2RlbGV0ZToKLSAgICAgICAgcHJpbnQgJyVkIGZpbGVzIGhhdmUgYmVlbiByZW1vdmVk IGZyb20gdGhlIHJlcG9zaXRvcnksIGNoZWNrIHRoZSBzdGF0dXMgYW5kIGNvbW1pdCBpZiBldmVy eXRoaW5nIGlzIGNvcnJlY3QnICUgKHRvdGFsKQotZWxzZToKLSAgICBwcmludCAnTm8gZHVwbGlj YXRlZCByZXN1bHRzIGZvdW5kJwogCitkZWYgY2hlY2tfcGxhdGZvcm0ob3B0aW9ucywgYmFzZWxp bmVfc2VhcmNoX3BhdGhzX2NoZWNrZWQpOgorICAgIHRvdGFsID0gMAorCisgICAgZm9yIHBsYXRm b3JtIGluIHBsYXRmb3JtX2xpc3Qob3B0aW9ucy5wbGF0Zm9ybSk6CisgICAgICAgIHRyeToKKyAg ICAgICAgICAgIF9sb2cuZGVidWcoJ1RyeWluZyB0byBjcmVhdGUgcG9ydCBmb3IgcGxhdGZvcm0g ezB9Jy5mb3JtYXQocGxhdGZvcm0pKQorICAgICAgICAgICAgcG9ydCA9IGhvc3QucG9ydF9mYWN0 b3J5LmdldChwbGF0Zm9ybSwgb3B0aW9ucykKKyAgICAgICAgZXhjZXB0OgorICAgICAgICAgICAg X2xvZy5kZWJ1ZygnRmFpbGVkIHRvIGNyZWF0ZSBwb3J0IG9iamVjdCBmb3IgezB9Jy5mb3JtYXQo cGxhdGZvcm0pKQorICAgICAgICAgICAgY29udGludWUKKworICAgICAgICBpZiBub3QgcG9ydC5z dXBwb3J0c19sYXlvdXRfdGVzdHMoKToKKyAgICAgICAgICAgIGNvbnRpbnVlCisKKyAgICAgICAg dHJ5OgorICAgICAgICAgICAgYmFzZWxpbmVfc2VhcmNoX3BhdGggPSB0dXBsZShbcCBmb3IgcCBp biBwb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRoKCkgaWYgb3MucGF0aC5pc2RpcihwKV0gKyBbbGF5 b3V0X3Rlc3RzX2RpcmVjdG9yeV0pCisgICAgICAgIGV4Y2VwdDoKKyAgICAgICAgICAgIF9sb2cu d2FybignRXJyb3IgY29tcHV0aW5nIGJhc2VsaW5lIHNlYXJjaCBwYXRocyBmcm9tIHswfScuZm9y bWF0KHBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKSkpCisgICAgICAgICAgICBjb250aW51ZQor CisgICAgICAgIF9sb2cuaW5mbygnQ2hlY2tpbmcgc2VhcmNoIHBhdGhzIFt7MH1dJy5mb3JtYXQo JywgJy5qb2luKHJlbW92ZV9sYXlvdXRfdGVzdF9wYXRoX3ByZWZpeChwKSBmb3IgcCBpbiBiYXNl bGluZV9zZWFyY2hfcGF0aFs6LTFdKSkpCisKKyAgICAgICAgaWYgYmFzZWxpbmVfc2VhcmNoX3Bh dGggaW4gYmFzZWxpbmVfc2VhcmNoX3BhdGhzX2NoZWNrZWQ6CisgICAgICAgICAgICBjb250aW51 ZQorCisgICAgICAgIGJhc2VsaW5lX3NlYXJjaF9wYXRoc19jaGVja2VkLmFkZChiYXNlbGluZV9z ZWFyY2hfcGF0aCkKKworICAgICAgICBkdXBsaWNhdGVzID0gZmluZF9kdXBsaWNhdGVzX2luX3Bh dGgoYmFzZWxpbmVfc2VhcmNoX3BhdGgpCisgICAgICAgIGlmIG5vdCBkdXBsaWNhdGVzOgorICAg ICAgICAgICAgY29udGludWUKKworICAgICAgICBpZiBvcHRpb25zLm5vX2RlbGV0ZToKKyAgICAg ICAgICAgIF9sb2cuaW5mbygnRm91bmQgdGhlIGZvbGxvd2luZyBkdXBsaWNhdGUgcmVzdWx0czon KQorICAgICAgICAgICAgX2xvZy5pbmZvKCdcbicuam9pbihyZW1vdmVfbGF5b3V0X3Rlc3RfcGF0 aF9wcmVmaXgocCkgZm9yIHAgaW4gZHVwbGljYXRlcykpCisgICAgICAgIGVsc2U6CisgICAgICAg ICAgICBob3N0LnNjbSgpLmRlbGV0ZV9saXN0KGR1cGxpY2F0ZXMpCisKKyAgICAgICAgZHVwbGlj YXRlc19sZW4gPSBsZW4oZHVwbGljYXRlcykKKyAgICAgICAgdG90YWwgKz0gZHVwbGljYXRlc19s ZW4KKyAgICAgICAgX2xvZy5pbmZvKCd7MH0gZm91bmQgaW4gezF9IC0+IGdlbmVyaWNcbicuZm9y bWF0KGR1cGxpY2F0ZXNfbGVuLCAnIC0+ICcuam9pbihbb3MucGF0aC5iYXNlbmFtZShwKSBmb3Ig cCBpbiBiYXNlbGluZV9zZWFyY2hfcGF0aFs6LTFdXSkpKQorICAgIAorICAgIHJldHVybiB0b3Rh bAorCitkZWYgbWFpbigpOgorICAgIG9wdGlvbl9wYXJzZXIgPSBvcHRwYXJzZS5PcHRpb25QYXJz ZXIodXNhZ2U9J3VzYWdlOiAlcHJvZyBbb3B0aW9uc10nKQorICAgIG9wdGlvbl9wYXJzZXIuYWRk X29wdGlvbignLXAnLCAnLS1wbGF0Zm9ybScsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGFjdGlvbj0nc3RvcmUnLCBkZXN0PSdwbGF0Zm9ybScsIGRlZmF1bHQ9J2FsbCcsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J1BsYXRmb3JtIHRvIGNoZWNrIGZvciBkdXBsaWNh dGVkIHJlc3VsdHMuIEJ5IHRoZSBkZWZhdWx0IGFsbCBwbGF0Zm9ybSBhcmUgY2hlY2tlZCcpCisg ICAgb3B0aW9uX3BhcnNlci5hZGRfb3B0aW9uKCctbicsICctLW5vLWRlbGV0ZScsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGFjdGlvbj0nc3RvcmVfdHJ1ZScsIGRlc3Q9J25vX2RlbGV0 ZScsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J0RvIG5vdCBkZWxldGUgdGhl IGR1cGxpY2F0ZWQgcmVzdWx0cyBmb3VuZCBmcm9tIHRoZSByZXBvc2l0b3J5LCBsaXN0IHRoZW0g aW5zdGVhZCcpCisgICAgb3B0aW9uX3BhcnNlci5hZGRfb3B0aW9uKCctdicsICctLXZlcmJvc2Un LCBhY3Rpb249J3N0b3JlX3RydWUnLCBkZWZhdWx0PUZhbHNlLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBoZWxwPSdFbmFibGUgdmVyYm9zZSBwcmludGluZycpLAorCisgICAgb3B0aW9u cywgYXJncyA9IG9wdGlvbl9wYXJzZXIucGFyc2VfYXJncygpCisKKyAgICBjb25maWd1cmVfbG9n Z2luZyhsb2dnZXI9X2xvZykKKyAgICBfbG9nLnNldExldmVsKGxvZ2dpbmcuREVCVUcgaWYgb3B0 aW9ucy52ZXJib3NlIGVsc2UgbG9nZ2luZy5JTkZPKQorCisgICAgdG90YWwgPSAwCisgICAgYmFz ZWxpbmVfc2VhcmNoX3BhdGhzX2NoZWNrZWQgPSBzZXQoKQorCisgICAgb3B0aW9ucy53ZWJraXRf dGVzdF9ydW5uZXIgPSBGYWxzZQorICAgIHRvdGFsICs9IGNoZWNrX3BsYXRmb3JtKG9wdGlvbnMs IGJhc2VsaW5lX3NlYXJjaF9wYXRoc19jaGVja2VkKQorCisgICAgb3B0aW9ucy53ZWJraXRfdGVz dF9ydW5uZXIgPSBUcnVlCisgICAgdG90YWwgKz0gY2hlY2tfcGxhdGZvcm0ob3B0aW9ucywgYmFz ZWxpbmVfc2VhcmNoX3BhdGhzX2NoZWNrZWQpCisKKyAgICBpZiB0b3RhbDoKKyAgICAgICAgaWYg b3B0aW9ucy5ub19kZWxldGU6CisgICAgICAgICAgICAjIEZJWE1FOiBXaXRob3V0IGRlbGV0aW9u IHRoZSB0b3RhbCBpc24ndCBhY2N1cmF0ZSwgYmVjYXVzZSBkaXJlY3RvcmllcyB3aGljaCBhcmUg cGFyZW50cyBvZiB3azEgYW5kIHdrMiBkaXJzIHdpbGwgYmUgdGVzdGVkIHR3aWNlLgorICAgICAg ICAgICAgX2xvZy5pbmZvKCdGb3VuZCB7MH0gZHVwbGljYXRlIHJlc3VsdHMuJy5mb3JtYXQodG90 YWwpKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgX2xvZy5pbmZvKCd7MH0gZmlsZXMgaGF2 ZSBiZWVuIHJlbW92ZWQgZnJvbSB0aGUgcmVwb3NpdG9yeS4gQ2hlY2sgdGhlIHN0YXR1cyBhbmQg Y29tbWl0IGlmIGV2ZXJ5dGhpbmcgaXMgY29ycmVjdCcuZm9ybWF0KHRvdGFsKSkKKyAgICBlbHNl OgorICAgICAgICBfbG9nLmluZm8oJ05vIGR1cGxpY2F0ZWQgcmVzdWx0cyBmb3VuZC4nKQorCitp ZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgorICAgIHN5cy5leGl0KG1haW4oKSkKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L2Jhc2UucHkKaW5kZXggZmRkYjE0MDViMzJhODE2OGU0ODJiNzc0ZWUxYjJk YjI4OTE1MjZmMC4uMGMwYzljZGQyNWRkY2RkMWYyYTI5MGYxODk5NTI2ZjA2MjBmNzMwOCAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKQEAgLTE1Myw2ICsxNTMsOSBAQCBjbGFzcyBQ b3J0KG9iamVjdCk6CiAgICAgZGVmIHN1cHBvcnRzX3Blcl90ZXN0X3RpbWVvdXQoc2VsZik6CiAg ICAgICAgIHJldHVybiBUcnVlCiAKKyAgICBkZWYgc3VwcG9ydHNfbGF5b3V0X3Rlc3RzKHNlbGYp OgorICAgICAgICByZXR1cm4gVHJ1ZQorCiAgICAgZGVmIGRlZmF1bHRfcGl4ZWxfdGVzdHMoc2Vs Zik6CiAgICAgICAgICMgRklYTUU6IERpc2FibGUgdW50aWwgdGhleSBhcmUgcnVuIGJ5IGRlZmF1 bHQgb24gYnVpbGQud2Via2l0Lm9yZy4KICAgICAgICAgcmV0dXJuIEZhbHNlCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZS5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlLnB5CmluZGV4IDA0ZDdiY2ExOGExNWEzZTY4OTJh NGEzYWQ5YWY2NWU3MjQ0ZGZkNDQuLjIxNzFlNDllMjk5ZTc1Y2Q4MmVlMWU4NTJkYjQ4ZTkwNjM3 ZWNlMzkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNl LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlLnB5CkBAIC04 Miw2ICs4Miw5IEBAIGNsYXNzIElPU0RldmljZVBvcnQoSU9TUG9ydCk6CiAgICAgICAgICAgICAg ICAgcmV0dXJuIChzdGRlcnIsIGNyYXNobG9nKQogICAgICAgICByZXR1cm4gKHN0ZGVyciwgTm9u ZSkKIAorICAgIGRlZiBzdXBwb3J0c19sYXlvdXRfdGVzdHMoc2VsZik6CisgICAgICAgIHJldHVy biBzZWxmLkRFVklDRV9NQU5BR0VSIGlzIG5vdCBOb25lCisKICAgICBAbWVtb2l6ZWQKICAgICBk ZWYgZGV2aWNlX3ZlcnNpb24oc2VsZik6CiAgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbigndmVy c2lvbicpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dhdGNoX2Rl dmljZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93YXRjaF9kZXZpY2UucHkKaW5k ZXggMjczZjUyZTNkMTI2MjNiNTk1ZjgwZGE1ZWEzOTU1MGM3NmRjYmRkZS4uYWQ4Mjg5NTNkYzI3 MDI5N2ZiODRiY2UyN2QxYmRhOGZkYzZmNmU5NCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L3dhdGNoX2RldmljZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvd2F0Y2hfZGV2aWNlLnB5CkBAIC04MCw2ICs4MCw5IEBAIGNsYXNzIFdhdGNoRGV2aWNl UG9ydChXYXRjaFBvcnQpOgogICAgICAgICAgICAgICAgIHJldHVybiAoc3RkZXJyLCBjcmFzaGxv ZykKICAgICAgICAgcmV0dXJuIChzdGRlcnIsIE5vbmUpCiAKKyAgICBkZWYgc3VwcG9ydHNfbGF5 b3V0X3Rlc3RzKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5ERVZJQ0VfTUFOQUdFUiBpcyBu b3QgTm9uZQorCiAgICAgQG1lbW9pemVkCiAgICAgZGVmIGRldmljZV92ZXJzaW9uKHNlbGYpOgog ICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3ZlcnNpb24nKToKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvd2luLnB5CmluZGV4IDI4ZWNlNDA1MjMxOTI3MjJkYmJkMmU0ZmJiNWIxMWU5ODUzZTgwNDAu LjcwMzljYjUyYzNkMWVmNzNhZWFkZjJkMTMyNmEzMmZlNWViNDdhMjIgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L3dpbi5weQpAQCAtMTE5LDEwICsxMTksMTEgQEAgY2xhc3MgV2luUG9ydChBcHBs ZVBvcnQpOgogICAgIGRlZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYsICoqa3dh cmdzKToKICAgICAgICAgdmVyc2lvbl9uYW1lX21hcCA9IFZlcnNpb25OYW1lTWFwLm1hcChzZWxm Lmhvc3QucGxhdGZvcm0pCiAgICAgICAgIGlmIHNlbGYuX29zX3ZlcnNpb24gPCBzZWxmLlZFUlNJ T05fTUlOIG9yIHNlbGYuX29zX3ZlcnNpb24gPiBzZWxmLlZFUlNJT05fTUFYOgotICAgICAgICAg ICAgZmFsbGJhY2tfdmVyc2lvbnMgPSBbc2VsZi5fb3NfdmVyc2lvbl0KKyAgICAgICAgICAgIGZh bGxiYWNrX3ZlcnNpb25zID0gW3NlbGYuX29zX3ZlcnNpb25dIGlmIHNlbGYuX29zX3ZlcnNpb24g ZWxzZSBbXQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgc29ydGVkX3ZlcnNpb25zID0gc29y dGVkKHZlcnNpb25fbmFtZV9tYXAubWFwcGluZ19mb3JfcGxhdGZvcm0ocGxhdGZvcm09c2VsZi5w b3J0X25hbWUpLnZhbHVlcygpKQogICAgICAgICAgICAgZmFsbGJhY2tfdmVyc2lvbnMgPSBzb3J0 ZWRfdmVyc2lvbnNbc29ydGVkX3ZlcnNpb25zLmluZGV4KHNlbGYuX29zX3ZlcnNpb24pOl0KKwog ICAgICAgICBmYWxsYmFja19uYW1lcyA9IFsnd2luLScgKyB2ZXJzaW9uX25hbWVfbWFwLnRvX25h bWUodmVyc2lvbiwgcGxhdGZvcm09c2VsZi5wb3J0X25hbWUpLmxvd2VyKCkucmVwbGFjZSgnICcs ICcnKSBmb3IgdmVyc2lvbiBpbiBmYWxsYmFja192ZXJzaW9uc10KICAgICAgICAgZmFsbGJhY2tf bmFtZXMuYXBwZW5kKCd3aW4nKQogCkBAIC00NzUsNyArNDc2LDcgQEAgY2xhc3MgV2luQ2Fpcm9Q b3J0KFdpblBvcnQpOgogICAgICAgICBwYXRocyA9IFtdCiAgICAgICAgIHZlcnNpb25fbmFtZV9t YXAgPSBWZXJzaW9uTmFtZU1hcC5tYXAoc2VsZi5ob3N0LnBsYXRmb3JtKQogICAgICAgICBpZiBz ZWxmLl9vc192ZXJzaW9uIDwgc2VsZi5WRVJTSU9OX01JTiBvciBzZWxmLl9vc192ZXJzaW9uID4g c2VsZi5WRVJTSU9OX01BWDoKLSAgICAgICAgICAgIHZlcnNpb25zID0gW3NlbGYuX29zX3ZlcnNp b25dCisgICAgICAgICAgICB2ZXJzaW9ucyA9IFtzZWxmLl9vc192ZXJzaW9uXSBpZiBzZWxmLl9v c192ZXJzaW9uIGVsc2UgW10KICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNvcnRlZF92ZXJz aW9ucyA9IHNvcnRlZCh2ZXJzaW9uX25hbWVfbWFwLm1hcHBpbmdfZm9yX3BsYXRmb3JtKHBsYXRm b3JtPXNlbGYucG9ydF9uYW1lKS52YWx1ZXMoKSkKICAgICAgICAgICAgIHZlcnNpb25zID0gc29y dGVkX3ZlcnNpb25zW3NvcnRlZF92ZXJzaW9ucy5pbmRleChzZWxmLl9vc192ZXJzaW9uKTpdCg==