193356 2019-01-11 11:37:56 -0800 webkitpy: Incorporate device type into baseline search path 2019-01-11 14:26:14 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap commit-queue ews-watchlist glenn lforschler ryanhaddad webkit-bug-importer oldest_to_newest 1493724 0 jbedard 2019-01-11 11:37:56 -0800 Baseline search paths should be capable of including device type information as well. Note that this bug will not track actually use the feature during instantiations of run-webkit-tests, that will be implemented in <https://bugs.webkit.org/show_bug.cgi?id=192162>. 1493725 1 webkit-bug-importer 2019-01-11 11:38:38 -0800 <rdar://problem/47215515> 1493732 2 358921 jbedard 2019-01-11 11:47:28 -0800 Created attachment 358921 Patch 1493820 3 358921 commit-queue 2019-01-11 14:26:12 -0800 Comment on attachment 358921 Patch Clearing flags on attachment: 358921 Committed r239875: <https://trac.webkit.org/changeset/239875> 1493821 4 commit-queue 2019-01-11 14:26:14 -0800 All reviewed patches have been landed. Closing bug. 358921 2019-01-11 11:47:28 -0800 2019-01-11 14:26:12 -0800 Patch bug-193356-20190111114727.patch text/plain 24063 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzOTg2NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM0IEBACisyMDE5LTAxLTExICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogSW5jb3Jwb3JhdGUgZGV2aWNlIHR5cGUgaW50byBiYXNl bGluZSBzZWFyY2ggcGF0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTkzMzU2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzIxNTUxNT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBuZWVkIGEgd2F5 IHRvIGluY2x1ZGUgZGV2aWNlIHR5cGUgaW4gdGhlIGJhc2VsaW5lIHNlYXJjaCBwYXRoIGZvciBp T1MgdG8gc3VwcG9ydCBkZXZpY2Ugc3BlY2lmaWMgdGVzdCBleHBlY3RhdGlvbnMuCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQuZGVmYXVs dF9iYXNlbGluZV9zZWFyY2hfcGF0aCk6IEFsbG93IGRldmljZSB0eXBlIHRvIGJlIHBhc3NlZCBp bi4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrLnB5OgorICAgICAgICAoR3Rr UG9ydC5kZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKTogSWdub3JlIGRldmljZSB0eXBlLgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHk6CisgICAgICAgIChJT1NQb3J0 LmRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgpOiBPcHRpb25hbGx5IGFsbG93IGRldmljZSB0 eXBlIHRvIGJlIGluY29ycG9yYXRlZCBpbnRvIHRoZSBiYXNlbGluZSBzZWFyY2ggcGF0aC4KKyAg ICAgICAgKElPU1BvcnQudGVzdF9leHBlY3RhdGlvbnNfZmlsZV9wb3NpdGlvbik6IFVwZGF0ZSBp bmRleCBmb3IgdGhlIGFkZGl0aW9uYWwgZGV2aWNlLXR5cGUgc3BlY2lmaWMgYmFzZWxpbmUgc2Vh cmNoIHBhdGguCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2VfdW5p dHRlc3QucHk6CisgICAgICAgIChJT1NEZXZpY2VUZXN0KToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3BvcnQvaW9zX3NpbXVsYXRvcl91bml0dGVzdC5weToKKyAgICAgICAgKElPU1NpbXVs YXRvclRlc3QpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHk6CisgICAg ICAgIChNYWNQb3J0LmRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgpOiBJZ25vcmUgZGV2aWNl IHR5cGUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3dhdGNoLnB5OgorICAgICAg ICAoV2F0Y2hQb3J0LmRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgpOiBEaXR0by4KKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5OgorICAgICAgICAoV2luUG9ydC5kZWZh dWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKTogRGl0dG8uCisgICAgICAgIChXaW5DYWlyb1BvcnQu ZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aCk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvcG9ydC93cGUucHk6CisgICAgICAgIChXUEVQb3J0LmRlZmF1bHRfYmFzZWxpbmVf c2VhcmNoX3BhdGgpOiBEaXR0by4KKwogMjAxOS0wMS0xMSAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBJbnRyb2R1Y2UgSURMIGZpbGVzIGZvciBydW50 aW1lLWVuYWJsZWQgVW5kb01hbmFnZXIgYW5kIFVuZG9JdGVtIEphdmFTY3JpcHQgQVBJCkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkocmV2aXNpb24gMjM5ODYzKQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHdvcmtpbmcgY29weSkKQEAgLTIxMSw3 ICsyMTEsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgZGVmIGJhc2VsaW5lX3NlYXJjaF9w YXRoKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5nZXRfb3B0aW9uKCdhZGRpdGlvbmFsX3Bs YXRmb3JtX2RpcmVjdG9yeScsIFtdKSArIHNlbGYuX2NvbXBhcmVfYmFzZWxpbmUoKSArIHNlbGYu ZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aCgpCiAKLSAgICBkZWYgZGVmYXVsdF9iYXNlbGlu ZV9zZWFyY2hfcGF0aChzZWxmKToKKyAgICBkZWYgZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0 aChzZWxmLCBkZXZpY2VfdHlwZT1Ob25lKToKICAgICAgICAgIiIiUmV0dXJuIGEgbGlzdCBvZiBh YnNvbHV0ZSBwYXRocyB0byBkaXJlY3RvcmllcyB0byBzZWFyY2ggdW5kZXIgZm9yCiAgICAgICAg IGJhc2VsaW5lcy4gVGhlIGRpcmVjdG9yaWVzIGFyZSBzZWFyY2hlZCBpbiBvcmRlci4iIiIKICAg ICAgICAgc2VhcmNoX3BhdGhzID0gW10KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9ndGsucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5w eQkocmV2aXNpb24gMjM5ODYzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5w eQkod29ya2luZyBjb3B5KQpAQCAtMjEwLDcgKzIxMCw3IEBAIGNsYXNzIEd0a1BvcnQoUG9ydCk6 CiAgICAgICAgIHNlYXJjaF9wYXRocy5leHRlbmQoc2VsZi5nZXRfb3B0aW9uKCJhZGRpdGlvbmFs X3BsYXRmb3JtX2RpcmVjdG9yeSIsIFtdKSkKICAgICAgICAgcmV0dXJuIHNlYXJjaF9wYXRocwog Ci0gICAgZGVmIGRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CisgICAgZGVmIGRl ZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZiwgKiprd2FyZ3MpOgogICAgICAgICByZXR1 cm4gbWFwKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWxmLl9zZWFyY2hfcGF0aHMoKSkK IAogICAgIGRlZiBfcG9ydF9zcGVjaWZpY19leHBlY3RhdGlvbnNfZmlsZXMoc2VsZik6CkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHkJKHJldmlzaW9uIDIzOTg2MykKKysrIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHkJKHdvcmtpbmcgY29weSkKQEAgLTUzLDcgKzUz LDcgQEAgY2xhc3MgSU9TUG9ydChEZXZpY2VQb3J0KToKICAgICAgICAgcmV0dXJuIFZlcnNpb25O YW1lTWFwLm1hcChzZWxmLmhvc3QucGxhdGZvcm0pLnRvX25hbWUoc2VsZi5fb3NfdmVyc2lvbiwg cGxhdGZvcm09SU9TUG9ydC5wb3J0X25hbWUpCiAKICAgICBAbWVtb2l6ZWQKLSAgICBkZWYgZGVm YXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKKyAgICBkZWYgZGVmYXVsdF9iYXNlbGlu ZV9zZWFyY2hfcGF0aChzZWxmLCBkZXZpY2VfdHlwZT1Ob25lKToKICAgICAgICAgd2tfc3RyaW5n ID0gJ3drMScKICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXIn KToKICAgICAgICAgICAgIHdrX3N0cmluZyA9ICd3azInCkBAIC03MCw0MCArNzAsNDIgQEAgY2xh c3MgSU9TUG9ydChEZXZpY2VQb3J0KToKICAgICAgICAgICAgICAgICBlbHNlOgogICAgICAgICAg ICAgICAgICAgICB0ZW1wX3ZlcnNpb24ubWFqb3IgLT0gMQogCi0gICAgICAgIGV4cGVjdGF0aW9u cyA9IFtdCi0gICAgICAgIGZvciB2ZXJzaW9uIGluIHZlcnNpb25zX3RvX2ZhbGxiYWNrOgotICAg ICAgICAgICAgYXBwbGVfbmFtZSA9IE5vbmUKLSAgICAgICAgICAgIGlmIGFwcGxlX2FkZGl0aW9u cygpOgotICAgICAgICAgICAgICAgIGFwcGxlX25hbWUgPSBWZXJzaW9uTmFtZU1hcC5tYXAoc2Vs Zi5ob3N0LnBsYXRmb3JtKS50b19uYW1lKHZlcnNpb24sIHBsYXRmb3JtPUlPU1BvcnQucG9ydF9u YW1lLCB0YWJsZT1JTlRFUk5BTF9UQUJMRSkKKyAgICAgICAgcnVudGltZV90eXBlID0gJ3NpbXVs YXRvcicgaWYgJ3NpbXVsYXRvcicgaW4gc2VsZi5TREsgZWxzZSAnZGV2aWNlJworICAgICAgICBo YXJkd2FyZV9mYW1pbHkgPSBkZXZpY2VfdHlwZS5oYXJkd2FyZV9mYW1pbHkubG93ZXIoKSBpZiBk ZXZpY2VfdHlwZSBhbmQgZGV2aWNlX3R5cGUuaGFyZHdhcmVfZmFtaWx5IGVsc2UgTm9uZQorICAg ICAgICBoYXJkd2FyZV90eXBlID0gZGV2aWNlX3R5cGUuaGFyZHdhcmVfdHlwZS5sb3dlcigpIGlm IGRldmljZV90eXBlIGFuZCBkZXZpY2VfdHlwZS5oYXJkd2FyZV90eXBlIGVsc2UgTm9uZQorCisg ICAgICAgIGJhc2VfdmFyaWFudHMgPSBbXQorICAgICAgICBpZiBoYXJkd2FyZV9mYW1pbHkgYW5k IGhhcmR3YXJlX3R5cGU6CisgICAgICAgICAgICBiYXNlX3ZhcmlhbnRzLmFwcGVuZCgne30te30t e30nLmZvcm1hdChoYXJkd2FyZV9mYW1pbHksIGhhcmR3YXJlX3R5cGUsIHJ1bnRpbWVfdHlwZSkp CisgICAgICAgIGlmIGhhcmR3YXJlX2ZhbWlseToKKyAgICAgICAgICAgIGJhc2VfdmFyaWFudHMu YXBwZW5kKCd7fS17fScuZm9ybWF0KGhhcmR3YXJlX2ZhbWlseSwgcnVudGltZV90eXBlKSkKKyAg ICAgICAgYmFzZV92YXJpYW50cy5hcHBlbmQoJ3t9LXt9Jy5mb3JtYXQoSU9TUG9ydC5wb3J0X25h bWUsIHJ1bnRpbWVfdHlwZSkpCisgICAgICAgIGlmIGhhcmR3YXJlX2ZhbWlseSBhbmQgaGFyZHdh cmVfdHlwZToKKyAgICAgICAgICAgIGJhc2VfdmFyaWFudHMuYXBwZW5kKCd7fS17fScuZm9ybWF0 KGhhcmR3YXJlX2ZhbWlseSwgaGFyZHdhcmVfdHlwZSkpCisgICAgICAgIGlmIGhhcmR3YXJlX2Zh bWlseToKKyAgICAgICAgICAgIGJhc2VfdmFyaWFudHMuYXBwZW5kKGhhcmR3YXJlX2ZhbWlseSkK KyAgICAgICAgYmFzZV92YXJpYW50cy5hcHBlbmQoSU9TUG9ydC5wb3J0X25hbWUpCiAKLSAgICAg ICAgICAgIGlmIGFwcGxlX25hbWU6Ci0gICAgICAgICAgICAgICAgZXhwZWN0YXRpb25zLmFwcGVu ZChzZWxmLl9hcHBsZV9iYXNlbGluZV9wYXRoKCd7fS17fS17fScuZm9ybWF0KHNlbGYucG9ydF9u YW1lLCBhcHBsZV9uYW1lLmxvd2VyKCkucmVwbGFjZSgnICcsICcnKSwgd2tfc3RyaW5nKSkpCi0g ICAgICAgICAgICBleHBlY3RhdGlvbnMuYXBwZW5kKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRo KCd7fS17fS17fScuZm9ybWF0KHNlbGYucG9ydF9uYW1lLCB2ZXJzaW9uLm1ham9yLCB3a19zdHJp bmcpKSkKLSAgICAgICAgICAgIGlmIGFwcGxlX25hbWU6Ci0gICAgICAgICAgICAgICAgZXhwZWN0 YXRpb25zLmFwcGVuZChzZWxmLl9hcHBsZV9iYXNlbGluZV9wYXRoKCd7fS17fScuZm9ybWF0KHNl bGYucG9ydF9uYW1lLCBhcHBsZV9uYW1lLmxvd2VyKCkucmVwbGFjZSgnICcsICcnKSkpKQotICAg ICAgICAgICAgZXhwZWN0YXRpb25zLmFwcGVuZChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCgn e30te30nLmZvcm1hdChzZWxmLnBvcnRfbmFtZSwgdmVyc2lvbi5tYWpvcikpKQotCi0gICAgICAg IGlmIGFwcGxlX2FkZGl0aW9ucygpOgotICAgICAgICAgICAgZXhwZWN0YXRpb25zLmFwcGVuZChz ZWxmLl9hcHBsZV9iYXNlbGluZV9wYXRoKCd7fS17fScuZm9ybWF0KHNlbGYucG9ydF9uYW1lLCB3 a19zdHJpbmcpKSkKLSAgICAgICAgZXhwZWN0YXRpb25zLmFwcGVuZChzZWxmLl93ZWJraXRfYmFz ZWxpbmVfcGF0aCgne30te30nLmZvcm1hdChzZWxmLnBvcnRfbmFtZSwgd2tfc3RyaW5nKSkpCi0g ICAgICAgIGlmIGFwcGxlX2FkZGl0aW9ucygpOgotICAgICAgICAgICAgZXhwZWN0YXRpb25zLmFw cGVuZChzZWxmLl9hcHBsZV9iYXNlbGluZV9wYXRoKHNlbGYucG9ydF9uYW1lKSkKLSAgICAgICAg ZXhwZWN0YXRpb25zLmFwcGVuZChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aChzZWxmLnBvcnRf bmFtZSkpCisgICAgICAgIGV4cGVjdGF0aW9ucyA9IFtdCisgICAgICAgIGZvciB2YXJpYW50IGlu IGJhc2VfdmFyaWFudHM6CisgICAgICAgICAgICBmb3IgdmVyc2lvbiBpbiB2ZXJzaW9uc190b19m YWxsYmFjazoKKyAgICAgICAgICAgICAgICBhcHBsZV9uYW1lID0gTm9uZQorICAgICAgICAgICAg ICAgIGlmIGFwcGxlX2FkZGl0aW9ucygpOgorICAgICAgICAgICAgICAgICAgICBhcHBsZV9uYW1l ID0gVmVyc2lvbk5hbWVNYXAubWFwKHNlbGYuaG9zdC5wbGF0Zm9ybSkudG9fbmFtZSh2ZXJzaW9u LCBwbGF0Zm9ybT1JT1NQb3J0LnBvcnRfbmFtZSwgdGFibGU9SU5URVJOQUxfVEFCTEUpCisKKyAg ICAgICAgICAgICAgICBpZiBhcHBsZV9uYW1lOgorICAgICAgICAgICAgICAgICAgICBleHBlY3Rh dGlvbnMuYXBwZW5kKHNlbGYuX2FwcGxlX2Jhc2VsaW5lX3BhdGgoJ3t9LXt9LXt9Jy5mb3JtYXQo dmFyaWFudCwgYXBwbGVfbmFtZS5sb3dlcigpLnJlcGxhY2UoJyAnLCAnJyksIHdrX3N0cmluZykp KQorICAgICAgICAgICAgICAgIGV4cGVjdGF0aW9ucy5hcHBlbmQoc2VsZi5fd2Via2l0X2Jhc2Vs aW5lX3BhdGgoJ3t9LXt9LXt9Jy5mb3JtYXQodmFyaWFudCwgdmVyc2lvbi5tYWpvciwgd2tfc3Ry aW5nKSkpCisgICAgICAgICAgICAgICAgaWYgYXBwbGVfbmFtZToKKyAgICAgICAgICAgICAgICAg ICAgZXhwZWN0YXRpb25zLmFwcGVuZChzZWxmLl9hcHBsZV9iYXNlbGluZV9wYXRoKCd7fS17fScu Zm9ybWF0KHZhcmlhbnQsIGFwcGxlX25hbWUubG93ZXIoKS5yZXBsYWNlKCcgJywgJycpKSkpCisg ICAgICAgICAgICAgICAgZXhwZWN0YXRpb25zLmFwcGVuZChzZWxmLl93ZWJraXRfYmFzZWxpbmVf cGF0aCgne30te30nLmZvcm1hdCh2YXJpYW50LCB2ZXJzaW9uLm1ham9yKSkpCiAKLSAgICAgICAg Zm9yIHZlcnNpb24gaW4gdmVyc2lvbnNfdG9fZmFsbGJhY2s6Ci0gICAgICAgICAgICBhcHBsZV9u YW1lID0gTm9uZQogICAgICAgICAgICAgaWYgYXBwbGVfYWRkaXRpb25zKCk6Ci0gICAgICAgICAg ICAgICAgYXBwbGVfbmFtZSA9IFZlcnNpb25OYW1lTWFwLm1hcChzZWxmLmhvc3QucGxhdGZvcm0p LnRvX25hbWUodmVyc2lvbiwgcGxhdGZvcm09SU9TUG9ydC5wb3J0X25hbWUsIHRhYmxlPUlOVEVS TkFMX1RBQkxFKQotICAgICAgICAgICAgaWYgYXBwbGVfbmFtZToKLSAgICAgICAgICAgICAgICBl eHBlY3RhdGlvbnMuYXBwZW5kKHNlbGYuX2FwcGxlX2Jhc2VsaW5lX3BhdGgoJ3t9LXt9Jy5mb3Jt YXQoSU9TUG9ydC5wb3J0X25hbWUsIGFwcGxlX25hbWUubG93ZXIoKS5yZXBsYWNlKCcgJywgJycp KSkpCi0gICAgICAgICAgICBleHBlY3RhdGlvbnMuYXBwZW5kKHNlbGYuX3dlYmtpdF9iYXNlbGlu ZV9wYXRoKCd7fS17fScuZm9ybWF0KElPU1BvcnQucG9ydF9uYW1lLCB2ZXJzaW9uLm1ham9yKSkp Ci0KLSAgICAgICAgaWYgYXBwbGVfYWRkaXRpb25zKCk6Ci0gICAgICAgICAgICBleHBlY3RhdGlv bnMuYXBwZW5kKHNlbGYuX2FwcGxlX2Jhc2VsaW5lX3BhdGgoJ3t9LXt9Jy5mb3JtYXQoSU9TUG9y dC5wb3J0X25hbWUsIHdrX3N0cmluZykpKQotICAgICAgICBleHBlY3RhdGlvbnMuYXBwZW5kKHNl bGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCd7fS17fScuZm9ybWF0KElPU1BvcnQucG9ydF9uYW1l LCB3a19zdHJpbmcpKSkKLSAgICAgICAgaWYgYXBwbGVfYWRkaXRpb25zKCk6Ci0gICAgICAgICAg ICBleHBlY3RhdGlvbnMuYXBwZW5kKHNlbGYuX2FwcGxlX2Jhc2VsaW5lX3BhdGgoSU9TUG9ydC5w b3J0X25hbWUpKQotICAgICAgICBleHBlY3RhdGlvbnMuYXBwZW5kKHNlbGYuX3dlYmtpdF9iYXNl bGluZV9wYXRoKElPU1BvcnQucG9ydF9uYW1lKSkKKyAgICAgICAgICAgICAgICBleHBlY3RhdGlv bnMuYXBwZW5kKHNlbGYuX2FwcGxlX2Jhc2VsaW5lX3BhdGgoJ3t9LXt9Jy5mb3JtYXQodmFyaWFu dCwgd2tfc3RyaW5nKSkpCisgICAgICAgICAgICBleHBlY3RhdGlvbnMuYXBwZW5kKHNlbGYuX3dl YmtpdF9iYXNlbGluZV9wYXRoKCd7fS17fScuZm9ybWF0KHZhcmlhbnQsIHdrX3N0cmluZykpKQor ICAgICAgICAgICAgaWYgYXBwbGVfYWRkaXRpb25zKCk6CisgICAgICAgICAgICAgICAgZXhwZWN0 YXRpb25zLmFwcGVuZChzZWxmLl9hcHBsZV9iYXNlbGluZV9wYXRoKHZhcmlhbnQpKQorICAgICAg ICAgICAgZXhwZWN0YXRpb25zLmFwcGVuZChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCh2YXJp YW50KSkKIAogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicp OgogICAgICAgICAgICAgZXhwZWN0YXRpb25zLmFwcGVuZChzZWxmLl93ZWJraXRfYmFzZWxpbmVf cGF0aCgnd2syJykpCkBAIC0xMTEsNCArMTEzLDQgQEAgY2xhc3MgSU9TUG9ydChEZXZpY2VQb3J0 KToKICAgICAgICAgcmV0dXJuIGV4cGVjdGF0aW9ucwogCiAgICAgZGVmIHRlc3RfZXhwZWN0YXRp b25zX2ZpbGVfcG9zaXRpb24oc2VsZik6Ci0gICAgICAgIHJldHVybiA0CisgICAgICAgIHJldHVy biA1CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZV91bml0dGVz dC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2Rldmlj ZV91bml0dGVzdC5weQkocmV2aXNpb24gMjM5ODYzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2lvc19kZXZpY2VfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4 LDcgQEAgZnJvbSB3ZWJraXRweS5jb21tb24udmVyc2lvbiBpbXBvcnQgVmVycwogZnJvbSB3ZWJr aXRweS5wb3J0Lmlvc19kZXZpY2UgaW1wb3J0IElPU0RldmljZVBvcnQKIGZyb20gd2Via2l0cHku cG9ydCBpbXBvcnQgaW9zX3Rlc3RjYXNlCiBmcm9tIHdlYmtpdHB5LnBvcnQgaW1wb3J0IHBvcnRf dGVzdGNhc2UKK2Zyb20gd2Via2l0cHkueGNvZGUuZGV2aWNlX3R5cGUgaW1wb3J0IERldmljZVR5 cGUKIAogCiBjbGFzcyBJT1NEZXZpY2VUZXN0KGlvc190ZXN0Y2FzZS5JT1NUZXN0KToKQEAgLTg4 LDMwICs4OSw3MSBAQCBjbGFzcyBJT1NEZXZpY2VUZXN0KGlvc190ZXN0Y2FzZS5JT1NUZXN0CiAg ICAgZGVmIHRlc3RfbGF5b3V0X3Rlc3Rfc2VhcmNocGF0aF93aXRoX2FwcGxlX2FkZGl0aW9ucyhz ZWxmKToKICAgICAgICAgd2l0aCBwb3J0X3Rlc3RjYXNlLmJpbmRfbW9ja19hcHBsZV9hZGRpdGlv bnMoKToKICAgICAgICAgICAgIHNlYXJjaF9wYXRoID0gc2VsZi5tYWtlX3BvcnQoKS5kZWZhdWx0 X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hf cGF0aFswXSwgJy9hZGRpdGlvbmFsX3Rlc3RpbmdfcGF0aC9pb3MtZGV2aWNlLWFkZC1pb3MxMS13 azEnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzFdLCAnL21vY2stY2hl Y2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLWRldmljZS0xMS13azEnKQotICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzJdLCAnL2FkZGl0aW9uYWxfdGVzdGluZ19wYXRo L2lvcy1kZXZpY2UtYWRkLWlvczExJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hf cGF0aFszXSwgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1kZXZpY2Ut MTEnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzRdLCAnL2FkZGl0aW9u YWxfdGVzdGluZ19wYXRoL2lvcy1kZXZpY2Utd2sxJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChzZWFyY2hfcGF0aFs1XSwgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lv cy1kZXZpY2Utd2sxJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aFs2XSwg Jy9hZGRpdGlvbmFsX3Rlc3RpbmdfcGF0aC9pb3MtZGV2aWNlJykKLSAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChzZWFyY2hfcGF0aFs3XSwgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRm b3JtL2lvcy1kZXZpY2UnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzhd LCAnL2FkZGl0aW9uYWxfdGVzdGluZ19wYXRoL2lvcy1hZGQtaW9zMTEnKQotICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzldLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMv cGxhdGZvcm0vaW9zLTExJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aFsx MF0sICcvYWRkaXRpb25hbF90ZXN0aW5nX3BhdGgvaW9zLXdrMScpCi0gICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoc2VhcmNoX3BhdGhbMTFdLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxh dGZvcm0vaW9zLXdrMScpCisKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aCwg WworICAgICAgICAgICAgJy9hZGRpdGlvbmFsX3Rlc3RpbmdfcGF0aC9pb3MtZGV2aWNlLWFkZC1p b3MxMS13azEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRm b3JtL2lvcy1kZXZpY2UtMTEtd2sxJywKKyAgICAgICAgICAgICcvYWRkaXRpb25hbF90ZXN0aW5n X3BhdGgvaW9zLWRldmljZS1hZGQtaW9zMTEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0 L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1kZXZpY2UtMTEnLAorICAgICAgICAgICAgJy9hZGRp dGlvbmFsX3Rlc3RpbmdfcGF0aC9pb3MtZGV2aWNlLXdrMScsCisgICAgICAgICAgICAnL21vY2st Y2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLWRldmljZS13azEnLAorICAgICAgICAg ICAgJy9hZGRpdGlvbmFsX3Rlc3RpbmdfcGF0aC9pb3MtZGV2aWNlJywKKyAgICAgICAgICAgICcv bW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MtZGV2aWNlJywKKyAgICAgICAg ICAgICcvYWRkaXRpb25hbF90ZXN0aW5nX3BhdGgvaW9zLWFkZC1pb3MxMS13azEnLAorICAgICAg ICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy0xMS13azEnLAor ICAgICAgICAgICAgJy9hZGRpdGlvbmFsX3Rlc3RpbmdfcGF0aC9pb3MtYWRkLWlvczExJywKKyAg ICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MtMTEnLAor ICAgICAgICAgICAgJy9hZGRpdGlvbmFsX3Rlc3RpbmdfcGF0aC9pb3Mtd2sxJywKKyAgICAgICAg ICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2sxJywKKyAgICAg ICAgICAgICcvYWRkaXRpb25hbF90ZXN0aW5nX3BhdGgvaW9zJywKKyAgICAgICAgICAgICcvbW9j ay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MnLAorICAgICAgICBdKQogCiAgICAg ZGVmIHRlc3RfbGF5b3V0X3Rlc3Rfc2VhcmNocGF0aF93aXRob3V0X2FwcGxlX2FkZGl0aW9ucyhz ZWxmKToKICAgICAgICAgc2VhcmNoX3BhdGggPSBzZWxmLm1ha2VfcG9ydChwb3J0X25hbWU9J2lv cy1kZXZpY2Utd2syJywgb3NfdmVyc2lvbj1WZXJzaW9uKDEyKSkuZGVmYXVsdF9iYXNlbGluZV9z ZWFyY2hfcGF0aCgpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aFswXSwg Jy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1kZXZpY2UtMTItd2syJykK LSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aFsxXSwgJy9tb2NrLWNoZWNrb3V0 L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1kZXZpY2UtMTInKQotICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHNlYXJjaF9wYXRoWzJdLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZv cm0vaW9zLWRldmljZS13azInKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRo WzNdLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLWRldmljZScpCi0g ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VhcmNoX3BhdGhbNF0sICcvbW9jay1jaGVja291dC9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MtMTInKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNl YXJjaF9wYXRoWzVdLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdr MicpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VhcmNoX3BhdGhbNl0sICcvbW9jay1jaGVj a291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHNlYXJjaF9wYXRoWzddLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2sy JykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aCwgWworICAgICAgICAgICAg Jy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1kZXZpY2UtMTItd2syJywK KyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MtZGV2 aWNlLTEyJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9pb3MtZGV2aWNlLXdrMicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVz dHMvcGxhdGZvcm0vaW9zLWRldmljZScsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vaW9zLTEyLXdrMicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tv dXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLTEyJywKKyAgICAgICAgICAgICcvbW9jay1jaGVj a291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2syJywKKyAgICAgICAgICAgICcvbW9jay1j aGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MnLAorICAgICAgICAgICAgJy9tb2NrLWNo ZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3drMicsCisgICAgICAgIF0pCisKKyAgICBkZWYg dGVzdF9sYXlvdXRfc2VhcmNocGF0aF93aWhfZGV2aWNlX3R5cGUoc2VsZik6CisgICAgICAgIHNl YXJjaF9wYXRoID0gc2VsZi5tYWtlX3BvcnQocG9ydF9uYW1lPSdpb3MtZGV2aWNlLXdrMicsIG9z X3ZlcnNpb249VmVyc2lvbigxMikpLmRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoRGV2aWNl VHlwZS5mcm9tX3N0cmluZygnaVBob25lIFNFJykpCisKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChzZWFyY2hfcGF0aCwgWworICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3Rz L3BsYXRmb3JtL2lwaG9uZS1zZS1kZXZpY2UtMTItd2syJywKKyAgICAgICAgICAgICcvbW9jay1j aGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pcGhvbmUtc2UtZGV2aWNlLTEyJywKKyAgICAg ICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pcGhvbmUtc2UtZGV2 aWNlLXdrMicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZv cm0vaXBob25lLXNlLWRldmljZScsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vaXBob25lLWRldmljZS0xMi13azInLAorICAgICAgICAgICAgJy9tb2Nr LWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lwaG9uZS1kZXZpY2UtMTInLAorICAgICAg ICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lwaG9uZS1kZXZpY2Ut d2syJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9p cGhvbmUtZGV2aWNlJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9pb3MtZGV2aWNlLTEyLXdrMicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQv TGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLWRldmljZS0xMicsCisgICAgICAgICAgICAnL21vY2st Y2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLWRldmljZS13azInLAorICAgICAgICAg ICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1kZXZpY2UnLAorICAg ICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lwaG9uZS1zZS0x Mi13azInLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3Jt L2lwaG9uZS1zZS0xMicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMv cGxhdGZvcm0vaXBob25lLXNlLXdrMicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vaXBob25lLXNlJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291 dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pcGhvbmUtMTItd2syJywKKyAgICAgICAgICAgICcvbW9j ay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pcGhvbmUtMTInLAorICAgICAgICAgICAg Jy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lwaG9uZS13azInLAorICAgICAg ICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lwaG9uZScsCisgICAg ICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLTEyLXdrMics CisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLTEy JywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mt d2syJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9p b3MnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3dr MicsCisgICAgICAgIF0pCiAKICAgICBkZWYgdGVzdF9tYXhfY2hpbGRfcHJvY2Vzc2VzKHNlbGYp OgogICAgICAgICBwYXNzCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX3Np bXVsYXRvcl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvaW9zX3NpbXVsYXRvcl91bml0dGVzdC5weQkocmV2aXNpb24gMjM5ODYzKQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19zaW11bGF0b3JfdW5pdHRlc3QucHkJKHdvcmtp bmcgY29weSkKQEAgLTkyLDMwICs5Miw3MSBAQCBjbGFzcyBJT1NTaW11bGF0b3JUZXN0KGlvc190 ZXN0Y2FzZS5JT1NUCiAgICAgZGVmIHRlc3RfbGF5b3V0X3Rlc3Rfc2VhcmNocGF0aF93aXRoX2Fw cGxlX2FkZGl0aW9ucyhzZWxmKToKICAgICAgICAgd2l0aCBwb3J0X3Rlc3RjYXNlLmJpbmRfbW9j a19hcHBsZV9hZGRpdGlvbnMoKToKICAgICAgICAgICAgIHNlYXJjaF9wYXRoID0gc2VsZi5tYWtl X3BvcnQoKS5kZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKCkKLSAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChzZWFyY2hfcGF0aFswXSwgJy9hZGRpdGlvbmFsX3Rlc3RpbmdfcGF0aC9pb3Mtc2lt dWxhdG9yLWFkZC1pb3MxMS13azEnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9w YXRoWzFdLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRv ci0xMS13azEnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzJdLCAnL2Fk ZGl0aW9uYWxfdGVzdGluZ19wYXRoL2lvcy1zaW11bGF0b3ItYWRkLWlvczExJykKLSAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aFszXSwgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRl c3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3ItMTEnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHNlYXJjaF9wYXRoWzRdLCAnL2FkZGl0aW9uYWxfdGVzdGluZ19wYXRoL2lvcy1zaW11bGF0b3It d2sxJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aFs1XSwgJy9tb2NrLWNo ZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3Itd2sxJykKLSAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aFs2XSwgJy9hZGRpdGlvbmFsX3Rlc3RpbmdfcGF0 aC9pb3Mtc2ltdWxhdG9yJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aFs3 XSwgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3InKQot ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzhdLCAnL2FkZGl0aW9uYWxfdGVz dGluZ19wYXRoL2lvcy1hZGQtaW9zMTEnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJj aF9wYXRoWzldLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLTExJykK LSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aFsxMF0sICcvYWRkaXRpb25hbF90 ZXN0aW5nX3BhdGgvaW9zLXdrMScpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VhcmNoX3Bh dGhbMTFdLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdrMScpCisK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aCwgWworICAgICAgICAgICAgJy9h ZGRpdGlvbmFsX3Rlc3RpbmdfcGF0aC9pb3Mtc2ltdWxhdG9yLWFkZC1pb3MxMS13azEnLAorICAg ICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0 b3ItMTEtd2sxJywKKyAgICAgICAgICAgICcvYWRkaXRpb25hbF90ZXN0aW5nX3BhdGgvaW9zLXNp bXVsYXRvci1hZGQtaW9zMTEnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRl c3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3ItMTEnLAorICAgICAgICAgICAgJy9hZGRpdGlvbmFs X3Rlc3RpbmdfcGF0aC9pb3Mtc2ltdWxhdG9yLXdrMScsCisgICAgICAgICAgICAnL21vY2stY2hl Y2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRvci13azEnLAorICAgICAgICAg ICAgJy9hZGRpdGlvbmFsX3Rlc3RpbmdfcGF0aC9pb3Mtc2ltdWxhdG9yJywKKyAgICAgICAgICAg ICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yJywKKyAg ICAgICAgICAgICcvYWRkaXRpb25hbF90ZXN0aW5nX3BhdGgvaW9zLWFkZC1pb3MxMS13azEnLAor ICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy0xMS13 azEnLAorICAgICAgICAgICAgJy9hZGRpdGlvbmFsX3Rlc3RpbmdfcGF0aC9pb3MtYWRkLWlvczEx JywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mt MTEnLAorICAgICAgICAgICAgJy9hZGRpdGlvbmFsX3Rlc3RpbmdfcGF0aC9pb3Mtd2sxJywKKyAg ICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2sxJywK KyAgICAgICAgICAgICcvYWRkaXRpb25hbF90ZXN0aW5nX3BhdGgvaW9zJywKKyAgICAgICAgICAg ICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MnLAorICAgICAgICBdKQog CiAgICAgZGVmIHRlc3RfbGF5b3V0X3Rlc3Rfc2VhcmNocGF0aF93aXRob3V0X2FwcGxlX2FkZGl0 aW9ucyhzZWxmKToKICAgICAgICAgc2VhcmNoX3BhdGggPSBzZWxmLm1ha2VfcG9ydChwb3J0X25h bWU9J2lvcy1zaW11bGF0b3Itd2syJywgb3NfdmVyc2lvbj1WZXJzaW9uKDEyKSkuZGVmYXVsdF9i YXNlbGluZV9zZWFyY2hfcGF0aCgpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hf cGF0aFswXSwgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0 b3ItMTItd2syJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aFsxXSwgJy9t b2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3ItMTInKQotICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzJdLCAnL21vY2stY2hlY2tvdXQvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRvci13azInKQotICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHNlYXJjaF9wYXRoWzNdLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZv cm0vaW9zLXNpbXVsYXRvcicpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VhcmNoX3BhdGhb NF0sICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MtMTInKQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzVdLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vaW9zLXdrMicpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VhcmNo X3BhdGhbNl0sICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MnKQotICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzddLCAnL21vY2stY2hlY2tvdXQvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vd2syJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hf cGF0aCwgWworICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3Jt L2lvcy1zaW11bGF0b3ItMTItd2syJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yLTEyJywKKyAgICAgICAgICAgICcvbW9jay1j aGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yLXdrMicsCisgICAgICAg ICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRvcics CisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLTEy LXdrMicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0v aW9zLTEyJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9pb3Mtd2syJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9pb3MnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRm b3JtL3drMicsCisgICAgICAgIF0pCisKKyAgICBkZWYgdGVzdF9sYXlvdXRfc2VhcmNocGF0aF93 aWhfZGV2aWNlX3R5cGUoc2VsZik6CisgICAgICAgIHNlYXJjaF9wYXRoID0gc2VsZi5tYWtlX3Bv cnQocG9ydF9uYW1lPSdpb3Mtc2ltdWxhdG9yLXdrMicsIG9zX3ZlcnNpb249VmVyc2lvbigxMikp LmRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoRGV2aWNlVHlwZS5mcm9tX3N0cmluZygnaVBo b25lIFNFJykpCisKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWFyY2hfcGF0aCwgWworICAg ICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lwaG9uZS1zZS1z aW11bGF0b3ItMTItd2syJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9pcGhvbmUtc2Utc2ltdWxhdG9yLTEyJywKKyAgICAgICAgICAgICcvbW9jay1j aGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pcGhvbmUtc2Utc2ltdWxhdG9yLXdrMicsCisg ICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaXBob25lLXNl LXNpbXVsYXRvcicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxh dGZvcm0vaXBob25lLXNpbXVsYXRvci0xMi13azInLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNr b3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lwaG9uZS1zaW11bGF0b3ItMTInLAorICAgICAgICAg ICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lwaG9uZS1zaW11bGF0b3It d2syJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9p cGhvbmUtc2ltdWxhdG9yJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yLTEyLXdrMicsCisgICAgICAgICAgICAnL21vY2stY2hl Y2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRvci0xMicsCisgICAgICAgICAg ICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRvci13azIn LAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1z aW11bGF0b3InLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRm b3JtL2lwaG9uZS1zZS0xMi13azInLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91 dFRlc3RzL3BsYXRmb3JtL2lwaG9uZS1zZS0xMicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tv dXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaXBob25lLXNlLXdrMicsCisgICAgICAgICAgICAnL21v Y2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaXBob25lLXNlJywKKyAgICAgICAgICAg ICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pcGhvbmUtMTItd2syJywKKyAg ICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pcGhvbmUtMTIn LAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL2lwaG9u ZS13azInLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3Jt L2lwaG9uZScsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZv cm0vaW9zLTEyLXdrMicsCisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMv cGxhdGZvcm0vaW9zLTEyJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9pb3Mtd2syJywKKyAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9pb3MnLAorICAgICAgICAgICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRl c3RzL3BsYXRmb3JtL3drMicsCisgICAgICAgIF0pCiAKICAgICBkZWYgdGVzdF9tYXhfY2hpbGRf cHJvY2Vzc2VzKHNlbGYpOgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQpJbmRleDog VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjLnB5CShyZXZpc2lvbiAyMzk4NjMpCisrKyBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjLnB5CSh3b3JraW5nIGNvcHkpCkBAIC03MCw3ICs3MCw3 IEBAIGNsYXNzIE1hY1BvcnQoRGFyd2luUG9ydCk6CiAgICAgICAgIHJldHVybiBbJ0FSQ0hTPWkz ODYnXSBpZiBzZWxmLmFyY2hpdGVjdHVyZSgpID09ICd4ODYnIGVsc2UgW10KIAogICAgIEBtZW1v aXplZAotICAgIGRlZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgorICAgIGRl ZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYsICoqa3dhcmdzKToKICAgICAgICAg dmVyc2lvbnNfdG9fZmFsbGJhY2sgPSBbXQogICAgICAgICB2ZXJzaW9uX25hbWVfbWFwID0gVmVy c2lvbk5hbWVNYXAubWFwKHNlbGYuaG9zdC5wbGF0Zm9ybSkKIApJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L3dhdGNoLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC93YXRjaC5weQkocmV2aXNpb24gMjM5ODYzKQorKysgVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L3dhdGNoLnB5CSh3b3JraW5nIGNvcHkpCkBAIC01OSw3ICs1OSw3IEBAIGNs YXNzIFdhdGNoUG9ydChEZXZpY2VQb3J0KToKICAgICAgICAgcmV0dXJuIDQKIAogICAgIEBtZW1v aXplZAotICAgIGRlZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgorICAgIGRl ZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYsICoqa3dhcmdzKToKICAgICAgICAg dmVyc2lvbnNfdG9fZmFsbGJhY2sgPSBbXQogICAgICAgICBpZiBzZWxmLmRldmljZV92ZXJzaW9u KCkgPT0gc2VsZi5DVVJSRU5UX1ZFUlNJT046CiAgICAgICAgICAgICB2ZXJzaW9uc190b19mYWxs YmFjayA9IFtzZWxmLkNVUlJFTlRfVkVSU0lPTl0KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC93aW4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L3dpbi5weQkocmV2aXNpb24gMjM5ODYzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L3dpbi5weQkod29ya2luZyBjb3B5KQpAQCAtMTEwLDcgKzExMCw3IEBAIGNsYXNzIFdpblBvcnQo QXBwbGVQb3J0KToKICAgICAgICAgYWN0dWFsX3RleHQgPSBkZWxlZ2F0ZV9yZWdleHAuc3ViKCIi LCBhY3R1YWxfdGV4dCkKICAgICAgICAgcmV0dXJuIGV4cGVjdGVkX3RleHQgIT0gYWN0dWFsX3Rl eHQKIAotICAgIGRlZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgorICAgIGRl ZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYsICoqa3dhcmdzKToKICAgICAgICAg dmVyc2lvbl9uYW1lX21hcCA9IFZlcnNpb25OYW1lTWFwLm1hcChzZWxmLmhvc3QucGxhdGZvcm0p CiAgICAgICAgIGlmIHNlbGYuX29zX3ZlcnNpb24gPCBzZWxmLlZFUlNJT05fTUlOIG9yIHNlbGYu X29zX3ZlcnNpb24gPiBzZWxmLlZFUlNJT05fTUFYOgogICAgICAgICAgICAgZmFsbGJhY2tfdmVy c2lvbnMgPSBbc2VsZi5fb3NfdmVyc2lvbl0KQEAgLTQ4MCw3ICs0ODAsNyBAQCBjbGFzcyBXaW5D YWlyb1BvcnQoV2luUG9ydCk6CiAKICAgICBERUZBVUxUX0FSQ0hJVEVDVFVSRSA9ICd4ODZfNjQn CiAKLSAgICBkZWYgZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKKyAgICBkZWYg ZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmLCAqKmt3YXJncyk6CiAgICAgICAgIHZl cnNpb25fbmFtZV9tYXAgPSBWZXJzaW9uTmFtZU1hcC5tYXAoc2VsZi5ob3N0LnBsYXRmb3JtKQog ICAgICAgICBpZiBzZWxmLl9vc192ZXJzaW9uIDwgc2VsZi5WRVJTSU9OX01JTiBvciBzZWxmLl9v c192ZXJzaW9uID4gc2VsZi5WRVJTSU9OX01BWDoKICAgICAgICAgICAgIGZhbGxiYWNrX3ZlcnNp b25zID0gW3NlbGYuX29zX3ZlcnNpb25dCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvd3BlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUu cHkJKHJldmlzaW9uIDIzOTg2MykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUu cHkJKHdvcmtpbmcgY29weSkKQEAgLTEwMiw3ICsxMDIsNyBAQCBjbGFzcyBXUEVQb3J0KFBvcnQp OgogICAgIGRlZiBfc2VhcmNoX3BhdGhzKHNlbGYpOgogICAgICAgICByZXR1cm4gW3NlbGYucG9y dF9uYW1lLCAnd2syJ10gKyBzZWxmLmdldF9vcHRpb24oImFkZGl0aW9uYWxfcGxhdGZvcm1fZGly ZWN0b3J5IiwgW10pCiAKLSAgICBkZWYgZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aChzZWxm KToKKyAgICBkZWYgZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmLCAqKmt3YXJncyk6 CiAgICAgICAgIHJldHVybiBtYXAoc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIHNlbGYuX3Nl YXJjaF9wYXRocygpKQogCiAgICAgZGVmIF9wb3J0X3NwZWNpZmljX2V4cGVjdGF0aW9uc19maWxl cyhzZWxmKToK