237030 2022-02-22 03:46:59 -0800 [JSC] Make runner should only schedule tests on live remotes 2022-03-09 05:32:21 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 angelos angelos aperez fujii jbedard webkit-bug-importer ysuzuki oldest_to_newest 1844628 0 angelos 2022-02-22 03:46:59 -0800 [JSC] Make runner should only schedule tests on live remotes 1844631 1 452851 angelos 2022-02-22 03:48:30 -0800 Created attachment 452851 Patch 1846986 2 webkit-bug-importer 2022-03-01 03:47:16 -0800 <rdar://problem/89611629> 1849171 3 452851 aperez 2022-03-08 02:24:56 -0800 Comment on attachment 452851 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452851&action=review > Tools/Scripts/run-jsc-stress-tests:2584 > + "sysctl -n hw.activecpu 2>/dev/null || nproc --all 2>/dev/null" I remember we chatted about using “getconf _NPROCESSORS_ONLN” here as one last resort option, so you might want to add that before landing. Nevertheless, given that it's not currently needed for the runners where this has to work, feel free to land the patch as-is. 1849613 4 454222 angelos 2022-03-09 03:53:38 -0800 Created attachment 454222 Patch 1849615 5 angelos 2022-03-09 03:55:34 -0800 (In reply to Adrian Perez from comment #3) > Comment on attachment 452851 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=452851&action=review > > > Tools/Scripts/run-jsc-stress-tests:2584 > > + "sysctl -n hw.activecpu 2>/dev/null || nproc --all 2>/dev/null" > > I remember we chatted about using “getconf _NPROCESSORS_ONLN” here as one > last > resort option, so you might want to add that before landing. Nevertheless, > given > that it's not currently needed for the runners where this has to work, feel > free > to land the patch as-is. Yup. This patch predates our discussion re: getconf. Uploaded a new version that uses it if all else has failed. 1849656 6 ews-feeder 2022-03-09 05:32:17 -0800 Committed r291045 (248219@main): <https://commits.webkit.org/248219@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454222. 452851 2022-02-22 03:48:30 -0800 2022-03-09 03:53:33 -0800 Patch bug-237030-20220222114828.patch text/plain 10788 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjk5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGRmNTZiYWQzZTVlYWQxMmY3ZGM5YjVkMTI0NDk3MDc3 Nzk3NDg3MS4uOTVjNTdjOTYwNGI1OGVhYjBkMTBhMTczNmM2ODA4NzE4OGE0M2I5OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3 IEBACisyMDIyLTAyLTIyICBBbmdlbG9zIE9pa29ub21vcG91bG9zICA8YW5nZWxvc0BpZ2FsaWEu Y29tPgorCisgICAgICAgIFtKU0NdIE1ha2UgcnVubmVyIHNob3VsZCBvbmx5IHNjaGVkdWxlIHRl c3RzIG9uIGxpdmUgcmVtb3RlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjM3MDMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIG1ha2UgcnVubmVyIGRvZXMgc3RhdGljIHNjaGVkdWxpbmcgb2YgdGVz dHMsIGkuZS4gaXQgd2lsbAorICAgICAgICBhc3NpZ24gdGVzdHMgdG8gYWxsIGtub3duIHJlbW90 ZXMuIEluIHByYWN0aWNlLCB0aGlzIG1lYW5zIHRoYXQKKyAgICAgICAgZXZlbiB0aG91Z2ggdGhl IG1ha2UgcnVubmVyIHBhcnRpY2lwYXRlcyBpbiB0aGUgcmV0cnkgbG9vcCwgaXQKKyAgICAgICAg d2lsbCBhbHdheXMgZW5kIHVwIHNjaGVkdWxpbmcgYW55IHRlc3RzIHRoYXQgZmFpbGVkIHRvIHJ1 bgorICAgICAgICAoZS5nLiBiZWNhdXNlIHRoZSByZW1vdGUgd2FzIGRvd24gb24gc3RhcnR1cCBv ciB3ZW50IGF3YXkgZHVyaW5nCisgICAgICAgIHRlc3RpbmcpIG9uIGFsbCByZW1vdGVzLCBpbmNs dWRpbmcgb25lcyB0aGF0IGFyZSBrbm93biB0byBiZSBkb3duLgorCisgICAgICAgIFRoaXMgcGF0 Y2ggbWFrZXMgaXQgc2xpZ2h0bHkgbW9yZSByb2J1c3QgYnkgaW50cm9kdWNpbmcgYSBsaXZlbmVz cworICAgICAgICBjaGVjayAoZ2V0TGl2ZVJlbW90ZUhvc3RzKSBiZWZvcmUgdGhlIHN0YXRpYyBz Y2hlZHVsaW5nLCBpLmUuCisgICAgICAgIDEuIGluIHRoZSBpbml0aWFsIHByZXBhcmF0aW9uIG9m IHRoZSB0ZXN0cyB0byBydW4gKHByZXBhcmVBcnRpZmFjdHMpIGFuZAorICAgICAgICAyLiBpbiBy ZWZyZXNoRXhlY3V0aW9uLgorCisgICAgICAgIEl0IHJldXNlcyB0aGUgY29tbWFuZCB0byBnZXQg dGhlIG51bWJlciBvZiBwcm9jZXNzb3JzIGFzIHRoZQorICAgICAgICBsaXZlbmVzcyBjaGVjayAo aXQncyBhIGNvbW1hbmQgd2Uga25vdyBjdXJyZW5seSB3b3JrcyBpbiBhbGwKKyAgICAgICAgc3Vw cG9ydGVkIHJlbW90ZXMpLCBzbyBmbGlwcyBudW1iZXJPZlByb2Nlc3NvcnMgaW5zaWRlLW91dC4K KworICAgICAgICBUaGlzIGRvZXMgbm90IG1lYW4gdGhhdCB0aGUgbWFrZSBydW5uZXIgaXMgbm93 IHJvYnVzdCBhZ2FpbnN0CisgICAgICAgIGZsYWt5IHJlbW90ZXMuIEF0IHRoZSB2ZXJ5IGxlYXN0 LCBpdCdzIHN0aWxsIG1pc3NpbmcgYW4gc3NoCisgICAgICAgIHRpbWVvdXQgKHNvIGl0IHdvbid0 IGhhbmcgZS5nLiB3aGVuIGhvc3RzIGdvIGF3YXkgYWZ0ZXIgdGhlCisgICAgICAgIGluaXRpYWwg Y29ubmVjdGlvbiBpcyBlc3RhYmxpc2hlZCkgYW5kIGNoaWxkIGNsZWFudXAgKGUuZy4gd2hlbgor ICAgICAgICBiYWlsaW5nIGVhcmx5IGZyb20gb25lIHJlbW90ZSBpbiBmb3JFYWNoUmVtb3RlLCBp dCBuZWVkcyB0byBraWxsCisgICAgICAgIGFsbCBjaGlsZHJlbiBmb3Igb3RoZXIgcmVtb3Rlcywg b3Igd2UgbWlnaHQgZW5kIHVwIHJldHJ5aW5nIHdoaWxlCisgICAgICAgIHRoZSBvbGQgam9icyBh cmUgc3RpbGwgcnVubmluZykuIEJ1dCBpdCdzIGdldHRpbmcgdGhlcmUuCisKKyAgICAgICAgUTog QnV0IGlzbid0IHRoZSBHTlUgcGFyYWxsZWwgcnVubmVyIG11Y2ggYmV0dGVyIHN1aXRlZCBmb3IK KyAgICAgICAgaGFuZGxpbmcgZmxha3kgcmVtb3Rlcz8KKworICAgICAgICBBOiBZZXMuIEhvd2V2 ZXIsIHRoZSBtYWtlIHJ1bm5lciBpcyAoc29tZXdoYXQpIGJldHRlciBhdCBrZWVwaW5nCisgICAg ICAgIHRoZSByZW1vdGUgQ1BVcyBidXN5IHdpdGggImZhc3QiIHJlbW90ZXMsIHNvIHdlIG1heSBz dGlsbCB3YW50IHRvCisgICAgICAgIHVzZSBpdCB3aGVuIHRoZSByZW1vdGVzIGFyZSBib3RoIGZh c3QgYW5kIHN0YWJsZSBlbm91Z2guIFRoYXQKKyAgICAgICAgc2FpZCwgaXQgc3RpbGwgbmVlZHMg dG8gYmUgYWJsZSB0byByZWNvdmVyIGZyb20gdGhlIG9jY2FzaW9uYWwKKyAgICAgICAgZmFpbGVk IHJlbW90ZSB3aXRob3V0IHByb2R1Y2luZyBmYWxzZSB0ZXN0IGZhaWx1cmVzLgorCisgICAgICAg ICogU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0czoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHJ1YnkvanNjLXN0cmVzcy10ZXN0L2V4ZWN1dG9yLnJiOgorICAgICAgICBNYWtlIHJlbW90ZUhv c3RzIGF2YWlsYWJsZSB0byByZWZyZXNoRXhlY3V0aW9uLgorCiAyMDIyLTAyLTIyICBBbmdlbG9z IE9pa29ub21vcG91bG9zICA8YW5nZWxvc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtKU0NdIEd1 YXJkIGFnYWluc3QgZGVhZCByZW1vdGVzIGluIG51bWJlck9mUHJvY2Vzc29ycwpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVu LWpzYy1zdHJlc3MtdGVzdHMKaW5kZXggM2Q2YWQzMWQyYjQxNjQ4ODk0MTYzNjJkZTNlZTk1NzI5 NTExMzMwYS4uNTZjYTMyZWUyNjk1YTg2ZGQ1YThiNzZjNzdlMGI3ZWRmMTI0YTIyOSAxMDA3NTUK LS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cworKysgYi9Ub29scy9TY3Jp cHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCkBAIC0yNTc3LDE1ICsyNTc3LDE5IEBAIGRlZiBydW5D b21tYW5kT25UZXN0ZXIoY21kKQogICAgIGAje2NtZH1gCiBlbmQKIAotZGVmIG51bWJlck9mUHJv Y2Vzc29ycworZGVmIGNvbW1hbmRUb0dldE51bWJlck9mUHJvY2Vzc29ycwogICAgIGlmICRob3N0 T1MgPT0gIndpbmRvd3MiCi0gICAgICAgIG51bVByb2Nlc3NvcnMgPSBydW5Db21tYW5kT25UZXN0 ZXIoImNtZCAvYyBlY2hvICVOVU1CRVJfT0ZfUFJPQ0VTU09SUyUiKS50b19pCisgICAgICAgICJj bWQgL2MgZWNobyAlTlVNQkVSX09GX1BST0NFU1NPUlMlIgogICAgIGVsc2UKLSAgICAgICAgYmVn aW4KLSAgICAgICAgICAgIG51bVByb2Nlc3NvcnMgPSBydW5Db21tYW5kT25UZXN0ZXIoInN5c2N0 bCAtbiBody5hY3RpdmVjcHUgMj4vZGV2L251bGwgfHwgbnByb2MgLS1hbGwgMj4vZGV2L251bGwi KS50b19pCi0gICAgICAgIHJlc2N1ZQotICAgICAgICAgICAgbnVtUHJvY2Vzc29ycyA9IDAKLSAg ICAgICAgZW5kCisgICAgICAgICJzeXNjdGwgLW4gaHcuYWN0aXZlY3B1IDI+L2Rldi9udWxsIHx8 IG5wcm9jIC0tYWxsIDI+L2Rldi9udWxsIgorICAgIGVuZAorZW5kCisKK2RlZiBudW1iZXJPZlBy b2Nlc3NvcnMKKyAgICBiZWdpbgorICAgICAgICBudW1Qcm9jZXNzb3JzID0gcnVuQ29tbWFuZE9u VGVzdGVyKGNvbW1hbmRUb0dldE51bWJlck9mUHJvY2Vzc29ycykudG9faQorICAgIHJlc2N1ZQor ICAgICAgICBudW1Qcm9jZXNzb3JzID0gMAogICAgIGVuZAogCiAgICAgaWYgbnVtUHJvY2Vzc29y cyA9PSAwCkBAIC0yNzE1LDEyICsyNzE5LDggQEAgZGVmIHJ1blRlc3RSdW5uZXIodGVzdFJ1bm5l ciwgcmVtb3RlSG9zdHMsIHJlbW90ZUluZGV4PTApCiAgICAgaWYgbm90IHJlbW90ZUhvc3RzLm5p bD8KICAgICAgICAgcmVtb3RlSG9zdCA9IHJlbW90ZUhvc3RzW3JlbW90ZUluZGV4XQogICAgICAg ICBnZXRSZW1vdGVEaXJlY3RvcnlJZk5lZWRlZChyZW1vdGVIb3N0KQotICAgICAgICBjb3B5QnVu ZGxlVG9SZW1vdGUocmVtb3RlSG9zdCkKICAgICAgICAgcmVtb3RlU2NyaXB0ID0gIlwiIgotICAg ICAgICByZW1vdGVTY3JpcHQgKz0gImNkICN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rvcnl9ICYm ICIKLSAgICAgICAgcmVtb3RlU2NyaXB0ICs9ICJybSAtcmYgI3skb3V0cHV0RGlyLmJhc2VuYW1l fSAmJiAiCi0gICAgICAgIHJlbW90ZVNjcmlwdCArPSAidGFyIHh6ZiAjeyR0YXJGaWxlTmFtZX0g JiYgIgotICAgICAgICByZW1vdGVTY3JpcHQgKz0gImNkICN7JG91dHB1dERpci5iYXNlbmFtZX0v LnJ1bm5lciAmJiAiCisgICAgICAgIHJlbW90ZVNjcmlwdCArPSAiY2QgI3tyZW1vdGVIb3N0LnJl bW90ZURpcmVjdG9yeX0vI3skb3V0cHV0RGlyLmJhc2VuYW1lfS8ucnVubmVyICYmICIKICAgICAg ICAgcmVtb3RlU2NyaXB0ICs9IGV4cG9ydEJhc2VFbnZpcm9ubWVudFZhcmlhYmxlcyh0cnVlKQog ICAgICAgICAkZW52VmFycy5lYWNoIHsgfHZhcnwgcmVtb3RlU2NyaXB0ICs9ICJleHBvcnQgIiA8 PCB2YXIgPDwgIlxuIiB9CiAgICAgICAgIHJlbW90ZVNjcmlwdCArPSAiI3t0ZXN0UnVubmVyLmNv bW1hbmQocmVtb3RlSW5kZXgpfVwiIgpAQCAtMzA0Niw3ICszMDQ2LDcgQEAgZGVmIHdpdGhHbnVQ YXJhbGxlbFNzaExvZ2luRmlsZShyZW1vdGVIb3N0cywgJmJsaykKICAgICB9CiBlbmQKIAotZGVm IHVucGFja0J1bmRsZUdudVBhcmFsbGVsKHJlbW90ZUhvc3RzKQorZGVmIHVucGFja0J1bmRsZU9u UmVtb3RlSG9zdHMocmVtb3RlSG9zdHMpCiAgICAgZm9yRWFjaFJlbW90ZShyZW1vdGVIb3N0cywg OmRyb3BPbkZhaWx1cmUgPT4gdHJ1ZSwgOnRpbWVvdXQgPT4gUkVNT1RFX1RJTUVPVVQpIHsKICAg ICAgICAgfCBfLCByZW1vdGVIb3N0IHwKICAgICAgICAgbXlzeXMoWyJzc2giLCAiLW8iLCAiTm9I b3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIl0gKyAKQEAgLTMwNTcsNiArMzA1Nywx OSBAQCBkZWYgdW5wYWNrQnVuZGxlR251UGFyYWxsZWwocmVtb3RlSG9zdHMpCiAgICAgfQogZW5k CiAKK2RlZiBwcmVwYXJlUmVtb3RlcyhyZW1vdGVIb3N0cykKKyAgICAjIElmIHRoZSBwcmVwYXJh dG9yeSBzdGVwcyBmYWlsLCBkcm9wIHRoZSByZW1vdGUgaG9zdCBmcm9tIG91cgorICAgICMgbGlz dC4gT3RoZXJ3aXNlLCBpZiBpdCBjb21lcyBiYWNrIG9ubGluZSBpbiB0aGUgbWlkZGxlIG9mIGFu CisgICAgIyBpdGVyYXRpb24sIHdlJ2xsIHRyeSB0byBydW4gdGVzdCBqb2JzIG9uIGl0LCBwb3Nz aWJseSB1c2luZworICAgICMgYW4gdW5yZWxhdGVkIGJ1bmRsZSBmcm9tIGEgcHJldmlvdXMgcnVu LgorICAgIHJlbW90ZUhvc3RzID0gZm9yRWFjaFJlbW90ZShyZW1vdGVIb3N0cywgezpkcm9wT25G YWlsdXJlID0+IHRydWUsIDp0aW1lb3V0ID0+IFJFTU9URV9USU1FT1VUfSkgeworICAgICAgICB8 IF8sIHJlbW90ZUhvc3QgfAorICAgICAgICBnZXRSZW1vdGVEaXJlY3RvcnlJZk5lZWRlZChyZW1v dGVIb3N0KQorICAgICAgICBjb3B5QnVuZGxlVG9SZW1vdGUocmVtb3RlSG9zdCkKKyAgICB9Cisg ICAgcmV0dXJuIHVucGFja0J1bmRsZU9uUmVtb3RlSG9zdHMocmVtb3RlSG9zdHMpCitlbmQKKwog ZGVmIHJ1bkdudVBhcmFsbGVsUnVubmVyKHJlbW90ZUhvc3RzLCBpbnB1dHMsIG9wdGlvbnM9e30p CiAgICAgdGltZW91dCA9IDMwMAogICAgIGlmIEVOVlsiSlNDVEVTVF90aW1lb3V0Il0KQEAgLTMx MzAsMTEgKzMxNDMsMTEgQEAgY2xhc3MgTm9uUmVtb3RlVGVzdHNFeGVjdXRvciA8IEJhc2VUZXN0 c0V4ZWN1dG9yCiAgICAgZGVmIHByZXBhcmVFeGVjdXRpb24ocmVtb3RlSG9zdHMpCiAgICAgICAg IHJlbW90ZUhvc3RzCiAgICAgZW5kCi0gICAgZGVmIHJlZnJlc2hFeGVjdXRpb24ocnVubGlzdCwg c2VyaWFsUGxhbnMsIGNvbXBsZXRlZFRlc3RzKQorICAgIGRlZiByZWZyZXNoRXhlY3V0aW9uKHJ1 bmxpc3QsIHNlcmlhbFBsYW5zLCBjb21wbGV0ZWRUZXN0cywgcmVtb3RlSG9zdHMpCiAgICAgICAg IGlmIG5vdCBAcmVtb3RlSG9zdHMubmlsPwogICAgICAgICAgICAgcmFpc2UgInJlbW90ZUhvc3Rz ICN7QHJlbW90ZUhvc3RzfSwgZXhwZWN0ZWQgbmlsIgogICAgICAgICBlbmQKLSAgICAgICAgQHRl c3RSdW5uZXIucHJlcGFyZShydW5saXN0LCBzZXJpYWxQbGFucywgY29tcGxldGVkVGVzdHMsIEBy ZW1vdGVIb3N0cykKKyAgICAgICAgQHRlc3RSdW5uZXIucHJlcGFyZShydW5saXN0LCBzZXJpYWxQ bGFucywgY29tcGxldGVkVGVzdHMsIHJlbW90ZUhvc3RzKQogICAgIGVuZAogZW5kCiAKQEAgLTMx NzcsMTMgKzMxOTAsMTMgQEAgY2xhc3MgQmFzZVJlbW90ZVRlc3RzRXhlY3V0b3IgPCBCYXNlVGVz dHNFeGVjdXRvcgogICAgIGRlZiB1cGRhdGVTdGF0dXNNYXAoaXRlcmF0aW9uLCBzdGF0dXNNYXAp CiAgICAgICAgIHJldHVybiBnZXRTdGF0dXNNYXAoc3RhdHVzTWFwKQogICAgIGVuZAotICAgIGRl ZiByZWZyZXNoRXhlY3V0aW9uKHJ1bmxpc3QsIHNlcmlhbFBsYW5zLCBjb21wbGV0ZWRUZXN0cykK KyAgICBkZWYgcmVmcmVzaEV4ZWN1dGlvbihydW5saXN0LCBzZXJpYWxQbGFucywgY29tcGxldGVk VGVzdHMsIHJlbW90ZUhvc3RzKQogICAgICAgICAjIE5vdGUsIHdoZW4gcnVubmluZyB0ZXN0cyBy ZW1vdGVseSwgd2UgYWx3YXlzIHByZXBhcmUgdGVzdHMKICAgICAgICAgIyBmb3IgYWxsIHRoZSBo b3N0cyB3aGVuIHJlZnJlc2hpbmcgZXhlY3V0aW9uLCBhcyBldmVuIGhvc3RzCiAgICAgICAgICMg dGhhdCB3ZW50IGF3YXkgZHVyaW5nIHRlc3RpbmcgbWF5IGhhdmUgY29tZSBiYWNrIG9ubGluZSBp bgogICAgICAgICAjIHRoZSBtZWFudGltZSAtLSBzbyB3ZSBkb24ndCBleHBlY3QgYSBsaXN0IG9m IGxpdmUgcmVtb3RlCiAgICAgICAgICMgaG9zdHMgdG8gYmUgcGFzc2VkIGluLgotICAgICAgICBA dGVzdFJ1bm5lci5wcmVwYXJlKHJ1bmxpc3QsIHNlcmlhbFBsYW5zLCBjb21wbGV0ZWRUZXN0cywg QHJlbW90ZUhvc3RzKQorICAgICAgICBAdGVzdFJ1bm5lci5wcmVwYXJlKHJ1bmxpc3QsIHNlcmlh bFBsYW5zLCBjb21wbGV0ZWRUZXN0cywgcmVtb3RlSG9zdHMpCiAgICAgZW5kCiBlbmQKIApAQCAt MzE5MSwxOCArMzIwNCw0NCBAQCBjbGFzcyBSZW1vdGVUZXN0c0V4ZWN1dG9yIDwgQmFzZVJlbW90 ZVRlc3RzRXhlY3V0b3IKICAgICBkZWYgcHJlcGFyZUFydGlmYWN0cyhyZW1vdGVIb3N0cykKICAg ICAgICAgcmFpc2UgInJlbW90ZUhvc3RzIG5pbCIgaWYgcmVtb3RlSG9zdHMubmlsPwogICAgICAg ICBwcmVwYXJlQnVuZGxlCisKKyAgICAgICAgIyBUaGUgbWFrZSBydW5uZXIgc3RhdGljYWxseSBz aGFyZHMgdGhlIHRlc3RzLCBzbyBkbyBhCisgICAgICAgICMgbGl2ZW5lc3MgY2hlY2sgYmVmb3Jl IEB0ZXN0UnVubmVyLnByZXBhcmUuIE90aGVyd2lzZSwgd2UnZAorICAgICAgICAjIGFsd2F5cyBl bmQgdXAgc2NoZWR1bGluZyB0ZXN0cyBvbiBkZWFkIHJlbW90ZXMgYW5kIGhhbXBlcgorICAgICAg ICAjIG91ciBwcm9ncmVzcy4KKyAgICAgICAgcmVtb3RlSG9zdHMgPSBnZXRMaXZlUmVtb3RlSG9z dHMocmVtb3RlSG9zdHMpCiAgICAgICAgIEB0ZXN0UnVubmVyLnByZXBhcmUoQHJ1bmxpc3QsIEBz ZXJpYWxQbGFucywgU2V0Lm5ldywgcmVtb3RlSG9zdHMpCiAgICAgICAgIGNvbXByZXNzQnVuZGxl CisgICAgICAgIHJlbW90ZUhvc3RzCiAgICAgZW5kCiAgICAgZGVmIHByZXBhcmVFeGVjdXRpb24o cmVtb3RlSG9zdHMpCi0gICAgICAgIHJlbW90ZUhvc3RzCisgICAgICAgIHJldHVybiBwcmVwYXJl UmVtb3RlcyhyZW1vdGVIb3N0cykKKyAgICBlbmQKKyAgICBkZWYgcmVmcmVzaEV4ZWN1dGlvbihy dW5saXN0LCBzZXJpYWxQbGFucywgY29tcGxldGVkVGVzdHMsIHJlbW90ZUhvc3RzKQorICAgICAg ICAjIERvbid0IGFzc2lnbiB0ZXN0cyB0byByZW1vdGVzIHRoYXQgYXJlIGRvd24uCisgICAgICAg IHJlbW90ZUhvc3RzID0gZ2V0TGl2ZVJlbW90ZUhvc3RzKHJlbW90ZUhvc3RzKQorICAgICAgICBz dXBlcihydW5saXN0LCBzZXJpYWxQbGFucywgY29tcGxldGVkVGVzdHMsIHJlbW90ZUhvc3RzKQog ICAgIGVuZAogICAgIGRlZiBleGVjdXRlVGVzdHMocmVtb3RlSG9zdHMpCi0gICAgICAgIGZvckVh Y2hSZW1vdGUocmVtb3RlSG9zdHMpIHsKKyAgICAgICAgZm9yRWFjaFJlbW90ZShyZW1vdGVIb3N0 cywgOmRyb3BPbkZhaWx1cmUgPT4gdHJ1ZSkgewogICAgICAgICAgICAgfCBpbmRleCB8CiAgICAg ICAgICAgICBydW5UZXN0UnVubmVyKEB0ZXN0UnVubmVyLCByZW1vdGVIb3N0cywgaW5kZXgpCiAg ICAgICAgIH0KICAgICBlbmQKKyAgICBwcml2YXRlCisgICAgZGVmIGdldExpdmVSZW1vdGVIb3N0 cyhyZW1vdGVIb3N0cykKKyAgICAgICAgIyBUaGlzIGNvbW1hbmQgaXMgc3VwcG9zZWQgdG8gd29y ayBvbiBhbGwgcmVtb3RlIGhvc3RzLCBzbworICAgICAgICAjIHJldXNlIGl0IGZvciB0aGUgbGl2 ZW5lc3MgY2hlY2suCisgICAgICAgIGNtZCA9IGNvbW1hbmRUb0dldE51bWJlck9mUHJvY2Vzc29y cworICAgICAgICBmb3JFYWNoUmVtb3RlKHJlbW90ZUhvc3RzLCA6ZHJvcE9uRmFpbHVyZSA9PiB0 cnVlLCA6dGltZW91dCA9PiBSRU1PVEVfVElNRU9VVCkgeyB8XywgcmVtb3RlSG9zdHwKKyAgICAg ICAgICAgIGJlZ2luCisgICAgICAgICAgICAgICAgc3NoUmVhZChjbWQsIHJlbW90ZUhvc3QpCisg ICAgICAgICAgICByZXNjdWUKKyAgICAgICAgICAgICAgICAjIEl0J3Mgd2hhdCBmb3JFYWNoUmVt b3RlIGNvbnNpZGVycyBhbiBleHBlY3RlZCBmYWlsdXJlLgorICAgICAgICAgICAgICAgIHJhaXNl IENvbW1hbmRFeGVjdXRpb25GYWlsZWQKKyAgICAgICAgICAgIGVuZAorICAgICAgICB9CisgICAg ZW5kCiBlbmQKIAogY2xhc3MgR251UGFyYWxsZWxUZXN0c0V4ZWN1dG9yIDwgQmFzZVJlbW90ZVRl c3RzRXhlY3V0b3IKQEAgLTMyMTIsMTYgKzMyNTEsNyBAQCBjbGFzcyBHbnVQYXJhbGxlbFRlc3Rz RXhlY3V0b3IgPCBCYXNlUmVtb3RlVGVzdHNFeGVjdXRvcgogICAgICAgICBjb21wcmVzc0J1bmRs ZQogICAgIGVuZAogICAgIGRlZiBwcmVwYXJlRXhlY3V0aW9uKHJlbW90ZUhvc3RzKQotICAgICAg ICAjIElmIHRoZSBwcmVwYXJhdG9yeSBzdGVwcyBmYWlsLCBkcm9wIHRoZSByZW1vdGUgaG9zdCBm cm9tIG91cgotICAgICAgICAjIGxpc3QuIE90aGVyd2lzZSwgaWYgaXQgY29tZXMgYmFjayBvbmxp bmUgaW4gdGhlIG1pZGRsZSBvZiBhbgotICAgICAgICAjIGl0ZXJhdGlvbiwgd2UnbGwgdHJ5IHRv IHJ1biB0ZXN0IGpvYnMgb24gaXQsIHBvc3NpYmx5IHVzaW5nCi0gICAgICAgICMgYW4gdW5yZWxh dGVkIGJ1bmRsZSBmcm9tIGEgcHJldmlvdXMgcnVuLgotICAgICAgICByZW1vdGVIb3N0cyA9IGZv ckVhY2hSZW1vdGUocmVtb3RlSG9zdHMsIHs6ZHJvcE9uRmFpbHVyZSA9PiB0cnVlLCA6dGltZW91 dCA9PiBSRU1PVEVfVElNRU9VVH0pIHsKLSAgICAgICAgICAgIHwgXywgcmVtb3RlSG9zdCB8Ci0g ICAgICAgICAgICBnZXRSZW1vdGVEaXJlY3RvcnlJZk5lZWRlZChyZW1vdGVIb3N0KQotICAgICAg ICAgICAgY29weUJ1bmRsZVRvUmVtb3RlKHJlbW90ZUhvc3QpCi0gICAgICAgIH0KLSAgICAgICAg cmV0dXJuIHVucGFja0J1bmRsZUdudVBhcmFsbGVsKHJlbW90ZUhvc3RzKQorICAgICAgICByZXR1 cm4gcHJlcGFyZVJlbW90ZXMocmVtb3RlSG9zdHMpCiAgICAgZW5kCiAgICAgZGVmIGV4ZWN1dGVU ZXN0cyhyZW1vdGVIb3N0cykKICAgICAgICAgcnVuR251UGFyYWxsZWxSdW5uZXIocmVtb3RlSG9z dHMsICRydW5uZXJEaXIgKyAic2VyaWFsLXRlc3RzIiwKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cnVieS9qc2Mtc3RyZXNzLXRlc3QvZXhlY3V0b3IucmIgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHJ1YnkvanNjLXN0cmVzcy10ZXN0L2V4ZWN1dG9yLnJiCmluZGV4IDQxNzFmNjBlMGEz Mjc3YzFjODNiNDMzZTg0ZDM1OTNmODRhMTc5YWYuLjI0NDI5MDUzMmVmNmFkYWNlZDQ1Y2ZhNjcy N2MzNTFhZGQyYjNmNDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cnVieS9qc2Mt c3RyZXNzLXRlc3QvZXhlY3V0b3IucmIKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRydWJ5L2pz Yy1zdHJlc3MtdGVzdC9leGVjdXRvci5yYgpAQCAtMTU0LDcgKzE1NCw3IEBAIGNsYXNzIEJhc2VU ZXN0c0V4ZWN1dG9yCiAgICAgICAgICAgICBlbmQKIAogICAgICAgICAgICAgIyBSZWdlbmVyYXRl IHRoZSBsaXN0cyBvZiB0ZXN0cyB0byBydW4KLSAgICAgICAgICAgIHJlZnJlc2hFeGVjdXRpb24o QHJ1bmxpc3QsIEBzZXJpYWxQbGFucywgY29tcGxldGVkVGVzdHMpCisgICAgICAgICAgICByZWZy ZXNoRXhlY3V0aW9uKEBydW5saXN0LCBAc2VyaWFsUGxhbnMsIGNvbXBsZXRlZFRlc3RzLCBAcmVt b3RlSG9zdHMpCiAKICAgICAgICAgICAgIG51bUZsYWt5ID0gQHJ1bmxpc3Quc2l6ZSAtIGNvbXBs ZXRlZFRlc3RzLnNpemUgLSBldmFsdWF0b3IubWlzc2luZy5zaXplCiAgICAgICAgICAgICB0ZXN0 c0luZm8gPSAiY29tcGxldGVkICN7Y29tcGxldGVkVGVzdHMuc2l6ZX0vI3tAcnVubGlzdC5zaXpl fSAoI3tudW1GbGFreX0gZmxha3ksICN7ZXZhbHVhdG9yLm1pc3Npbmcuc2l6ZX0gbWlzc2luZyki CkBAIC0yMDksNyArMjA5LDcgQEAgbW9kdWxlIEV4ZWN1dG9yU2VsZlRlc3RzCiAgICAgICAgICAg ICBwdXRkKCJzdGF0dXNNYXA6ICN7c3RhdHVzTWFwfSIpCiAgICAgICAgICAgICBzdGF0dXNNYXAK ICAgICAgICAgZW5kCi0gICAgICAgIGRlZiByZWZyZXNoRXhlY3V0aW9uKHJ1bmxpc3QsIHNlcmlh bFBsYW5zLCBjb21wbGV0ZWRUZXN0cykKKyAgICAgICAgZGVmIHJlZnJlc2hFeGVjdXRpb24ocnVu bGlzdCwgc2VyaWFsUGxhbnMsIGNvbXBsZXRlZFRlc3RzLCByZW1vdGVIb3N0cykKICAgICAgICAg ZW5kCiAgICAgZW5kCiAK 454222 2022-03-09 03:53:38 -0800 2022-03-09 05:32:19 -0800 Patch bug-237030-20220309115337.patch text/plain 10905 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMDM2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjIyY2Q3ZmEwYmUyYjBhNzVmMjA5ODVjZDE4YTZiOWY5 ZjAzNDQyNy4uYWZkMGNkNzFmNDdlN2M5MmNkNDM1ZTFlMTQ1MjAwMmQ3MjkwOGY0MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5 IEBACisyMDIyLTAzLTA5ICBBbmdlbG9zIE9pa29ub21vcG91bG9zICA8YW5nZWxvc0BpZ2FsaWEu Y29tPgorCisgICAgICAgIFtKU0NdIE1ha2UgcnVubmVyIHNob3VsZCBvbmx5IHNjaGVkdWxlIHRl c3RzIG9uIGxpdmUgcmVtb3RlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjM3MDMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRyaWFuIFBlcmV6IGRl IENhc3Ryby4KKworICAgICAgICBUaGUgbWFrZSBydW5uZXIgZG9lcyBzdGF0aWMgc2NoZWR1bGlu ZyBvZiB0ZXN0cywgaS5lLiBpdCB3aWxsCisgICAgICAgIGFzc2lnbiB0ZXN0cyB0byBhbGwga25v d24gcmVtb3Rlcy4gSW4gcHJhY3RpY2UsIHRoaXMgbWVhbnMgdGhhdAorICAgICAgICBldmVuIHRo b3VnaCB0aGUgbWFrZSBydW5uZXIgcGFydGljaXBhdGVzIGluIHRoZSByZXRyeSBsb29wLCBpdAor ICAgICAgICB3aWxsIGFsd2F5cyBlbmQgdXAgc2NoZWR1bGluZyBhbnkgdGVzdHMgdGhhdCBmYWls ZWQgdG8gcnVuCisgICAgICAgIChlLmcuIGJlY2F1c2UgdGhlIHJlbW90ZSB3YXMgZG93biBvbiBz dGFydHVwIG9yIHdlbnQgYXdheSBkdXJpbmcKKyAgICAgICAgdGVzdGluZykgb24gYWxsIHJlbW90 ZXMsIGluY2x1ZGluZyBvbmVzIHRoYXQgYXJlIGtub3duIHRvIGJlIGRvd24uCisKKyAgICAgICAg VGhpcyBwYXRjaCBtYWtlcyBpdCBzbGlnaHRseSBtb3JlIHJvYnVzdCBieSBpbnRyb2R1Y2luZyBh IGxpdmVuZXNzCisgICAgICAgIGNoZWNrIChnZXRMaXZlUmVtb3RlSG9zdHMpIGJlZm9yZSB0aGUg c3RhdGljIHNjaGVkdWxpbmcsIGkuZS4KKyAgICAgICAgMS4gaW4gdGhlIGluaXRpYWwgcHJlcGFy YXRpb24gb2YgdGhlIHRlc3RzIHRvIHJ1biAocHJlcGFyZUFydGlmYWN0cykgYW5kCisgICAgICAg IDIuIGluIHJlZnJlc2hFeGVjdXRpb24uCisKKyAgICAgICAgSXQgcmV1c2VzIHRoZSBjb21tYW5k IHRvIGdldCB0aGUgbnVtYmVyIG9mIHByb2Nlc3NvcnMgYXMgdGhlCisgICAgICAgIGxpdmVuZXNz IGNoZWNrIChpdCdzIGEgY29tbWFuZCB3ZSBrbm93IGN1cnJlbmx5IHdvcmtzIGluIGFsbAorICAg ICAgICBzdXBwb3J0ZWQgcmVtb3RlcyksIHNvIGZsaXBzIG51bWJlck9mUHJvY2Vzc29ycyBpbnNp ZGUtb3V0LgorICAgICAgICBXaGlsZSBoZXJlLCBpdCBhZGRzIGdldGNvbmYgX05QUk9DRVNTT1JT X09OTE4gYXMgYSBmaW5hbCBhdHRlbXB0CisgICAgICAgIHRvIGdldCB0aGUgbnVtYmVyIG9mIHBy b2Nlc3NvcnMuCisKKyAgICAgICAgVGhpcyBkb2VzIG5vdCBtZWFuIHRoYXQgdGhlIG1ha2UgcnVu bmVyIGlzIG5vdyByb2J1c3QgYWdhaW5zdAorICAgICAgICBmbGFreSByZW1vdGVzLiBBdCB0aGUg dmVyeSBsZWFzdCwgaXQncyBzdGlsbCBtaXNzaW5nIGFuIHNzaAorICAgICAgICB0aW1lb3V0IChz byBpdCB3b24ndCBoYW5nIGUuZy4gd2hlbiBob3N0cyBnbyBhd2F5IGFmdGVyIHRoZQorICAgICAg ICBpbml0aWFsIGNvbm5lY3Rpb24gaXMgZXN0YWJsaXNoZWQpIGFuZCBjaGlsZCBjbGVhbnVwIChl LmcuIHdoZW4KKyAgICAgICAgYmFpbGluZyBlYXJseSBmcm9tIG9uZSByZW1vdGUgaW4gZm9yRWFj aFJlbW90ZSwgaXQgbmVlZHMgdG8ga2lsbAorICAgICAgICBhbGwgY2hpbGRyZW4gZm9yIG90aGVy IHJlbW90ZXMsIG9yIHdlIG1pZ2h0IGVuZCB1cCByZXRyeWluZyB3aGlsZQorICAgICAgICB0aGUg b2xkIGpvYnMgYXJlIHN0aWxsIHJ1bm5pbmcpLiBCdXQgaXQncyBnZXR0aW5nIHRoZXJlLgorCisg ICAgICAgIFE6IEJ1dCBpc24ndCB0aGUgR05VIHBhcmFsbGVsIHJ1bm5lciBtdWNoIGJldHRlciBz dWl0ZWQgZm9yCisgICAgICAgIGhhbmRsaW5nIGZsYWt5IHJlbW90ZXM/CisKKyAgICAgICAgQTog WWVzLiBIb3dldmVyLCB0aGUgbWFrZSBydW5uZXIgaXMgKHNvbWV3aGF0KSBiZXR0ZXIgYXQga2Vl cGluZworICAgICAgICB0aGUgcmVtb3RlIENQVXMgYnVzeSB3aXRoICJmYXN0IiByZW1vdGVzLCBz byB3ZSBtYXkgc3RpbGwgd2FudCB0bworICAgICAgICB1c2UgaXQgd2hlbiB0aGUgcmVtb3RlcyBh cmUgYm90aCBmYXN0IGFuZCBzdGFibGUgZW5vdWdoLiBUaGF0CisgICAgICAgIHNhaWQsIGl0IHN0 aWxsIG5lZWRzIHRvIGJlIGFibGUgdG8gcmVjb3ZlciBmcm9tIHRoZSBvY2Nhc2lvbmFsCisgICAg ICAgIGZhaWxlZCByZW1vdGUgd2l0aG91dCBwcm9kdWNpbmcgZmFsc2UgdGVzdCBmYWlsdXJlcy4K KworICAgICAgICAqIFNjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHM6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRydWJ5L2pzYy1zdHJlc3MtdGVzdC9leGVjdXRvci5yYjoKKyAgICAgICAgTWFr ZSByZW1vdGVIb3N0cyBhdmFpbGFibGUgdG8gcmVmcmVzaEV4ZWN1dGlvbi4KKwogMjAyMi0wMy0w OCAgSmVhbi1ZdmVzIEF2ZW5hcmQgIDxqeWFAYXBwbGUuY29tPgogCiAgICAgICAgIEhhdmUgTWVk aWFGb3JtYXRSZWFkZXIgcGx1Z2luIHVzZSBXZWJNUGFyc2VyIGRpcmVjdGx5CmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4t anNjLXN0cmVzcy10ZXN0cwppbmRleCA5MmY2NzEyZWNmOTE2MGI3ZGM2NzE5MDI1YjU1YThjN2U1 NTg5ZmYzLi5kZDcxMjhlZTQxNDQ1YWZjY2Q3OTQ2MDZkNTkxNjNmM2Q5NTMxZDQ1IDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCisrKyBiL1Rvb2xzL1Njcmlw dHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMKQEAgLTI1ODksMTUgKzI1ODksMTkgQEAgZGVmIHJ1bkNv bW1hbmRPblRlc3RlcihjbWQpCiAgICAgYCN7Y21kfWAKIGVuZAogCi1kZWYgbnVtYmVyT2ZQcm9j ZXNzb3JzCitkZWYgY29tbWFuZFRvR2V0TnVtYmVyT2ZQcm9jZXNzb3JzCiAgICAgaWYgJGhvc3RP UyA9PSAid2luZG93cyIKLSAgICAgICAgbnVtUHJvY2Vzc29ycyA9IHJ1bkNvbW1hbmRPblRlc3Rl cigiY21kIC9jIGVjaG8gJU5VTUJFUl9PRl9QUk9DRVNTT1JTJSIpLnRvX2kKKyAgICAgICAgImNt ZCAvYyBlY2hvICVOVU1CRVJfT0ZfUFJPQ0VTU09SUyUiCiAgICAgZWxzZQotICAgICAgICBiZWdp bgotICAgICAgICAgICAgbnVtUHJvY2Vzc29ycyA9IHJ1bkNvbW1hbmRPblRlc3Rlcigic3lzY3Rs IC1uIGh3LmFjdGl2ZWNwdSAyPi9kZXYvbnVsbCB8fCBucHJvYyAtLWFsbCAyPi9kZXYvbnVsbCIp LnRvX2kKLSAgICAgICAgcmVzY3VlCi0gICAgICAgICAgICBudW1Qcm9jZXNzb3JzID0gMAotICAg ICAgICBlbmQKKyAgICAgICAgInN5c2N0bCAtbiBody5hY3RpdmVjcHUgMj4vZGV2L251bGwgfHwg bnByb2MgLS1hbGwgMj4vZGV2L251bGwgfHwgZ2V0Y29uZiBfTlBST0NFU1NPUlNfT05MTiIKKyAg ICBlbmQKK2VuZAorCitkZWYgbnVtYmVyT2ZQcm9jZXNzb3JzCisgICAgYmVnaW4KKyAgICAgICAg bnVtUHJvY2Vzc29ycyA9IHJ1bkNvbW1hbmRPblRlc3Rlcihjb21tYW5kVG9HZXROdW1iZXJPZlBy b2Nlc3NvcnMpLnRvX2kKKyAgICByZXNjdWUKKyAgICAgICAgbnVtUHJvY2Vzc29ycyA9IDAKICAg ICBlbmQKIAogICAgIGlmIG51bVByb2Nlc3NvcnMgPT0gMApAQCAtMjcyNywxMiArMjczMSw4IEBA IGRlZiBydW5UZXN0UnVubmVyKHRlc3RSdW5uZXIsIHJlbW90ZUhvc3RzLCByZW1vdGVJbmRleD0w KQogICAgIGlmIG5vdCByZW1vdGVIb3N0cy5uaWw/CiAgICAgICAgIHJlbW90ZUhvc3QgPSByZW1v dGVIb3N0c1tyZW1vdGVJbmRleF0KICAgICAgICAgZ2V0UmVtb3RlRGlyZWN0b3J5SWZOZWVkZWQo cmVtb3RlSG9zdCkKLSAgICAgICAgY29weUJ1bmRsZVRvUmVtb3RlKHJlbW90ZUhvc3QpCiAgICAg ICAgIHJlbW90ZVNjcmlwdCA9ICJcIiIKLSAgICAgICAgcmVtb3RlU2NyaXB0ICs9ICJjZCAje3Jl bW90ZUhvc3QucmVtb3RlRGlyZWN0b3J5fSAmJiAiCi0gICAgICAgIHJlbW90ZVNjcmlwdCArPSAi cm0gLXJmICN7JG91dHB1dERpci5iYXNlbmFtZX0gJiYgIgotICAgICAgICByZW1vdGVTY3JpcHQg Kz0gInRhciB4emYgI3skdGFyRmlsZU5hbWV9ICYmICIKLSAgICAgICAgcmVtb3RlU2NyaXB0ICs9 ICJjZCAjeyRvdXRwdXREaXIuYmFzZW5hbWV9Ly5ydW5uZXIgJiYgIgorICAgICAgICByZW1vdGVT Y3JpcHQgKz0gImNkICN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rvcnl9LyN7JG91dHB1dERpci5i YXNlbmFtZX0vLnJ1bm5lciAmJiAiCiAgICAgICAgIHJlbW90ZVNjcmlwdCArPSBleHBvcnRCYXNl RW52aXJvbm1lbnRWYXJpYWJsZXModHJ1ZSkKICAgICAgICAgJGVudlZhcnMuZWFjaCB7IHx2YXJ8 IHJlbW90ZVNjcmlwdCArPSAiZXhwb3J0ICIgPDwgdmFyIDw8ICJcbiIgfQogICAgICAgICByZW1v dGVTY3JpcHQgKz0gIiN7dGVzdFJ1bm5lci5jb21tYW5kKHJlbW90ZUluZGV4KX1cIiIKQEAgLTMw NzQsNyArMzA3NCw3IEBAIGRlZiB3aXRoR251UGFyYWxsZWxTc2hMb2dpbkZpbGUocmVtb3RlSG9z dHMsICZibGspCiAgICAgfQogZW5kCiAKLWRlZiB1bnBhY2tCdW5kbGVHbnVQYXJhbGxlbChyZW1v dGVIb3N0cykKK2RlZiB1bnBhY2tCdW5kbGVPblJlbW90ZUhvc3RzKHJlbW90ZUhvc3RzKQogICAg IGZvckVhY2hSZW1vdGUocmVtb3RlSG9zdHMsIDpkcm9wT25GYWlsdXJlID0+IHRydWUsIDp0aW1l b3V0ID0+IFJFTU9URV9USU1FT1VUKSB7CiAgICAgICAgIHwgXywgcmVtb3RlSG9zdCB8CiAgICAg ICAgIG15c3lzKFsic3NoIl0gKyBTU0hfT1BUSU9OU19ERUZBVUxUICsKQEAgLTMwODUsNiArMzA4 NSwxOSBAQCBkZWYgdW5wYWNrQnVuZGxlR251UGFyYWxsZWwocmVtb3RlSG9zdHMpCiAgICAgfQog ZW5kCiAKK2RlZiBwcmVwYXJlUmVtb3RlcyhyZW1vdGVIb3N0cykKKyAgICAjIElmIHRoZSBwcmVw YXJhdG9yeSBzdGVwcyBmYWlsLCBkcm9wIHRoZSByZW1vdGUgaG9zdCBmcm9tIG91cgorICAgICMg bGlzdC4gT3RoZXJ3aXNlLCBpZiBpdCBjb21lcyBiYWNrIG9ubGluZSBpbiB0aGUgbWlkZGxlIG9m IGFuCisgICAgIyBpdGVyYXRpb24sIHdlJ2xsIHRyeSB0byBydW4gdGVzdCBqb2JzIG9uIGl0LCBw b3NzaWJseSB1c2luZworICAgICMgYW4gdW5yZWxhdGVkIGJ1bmRsZSBmcm9tIGEgcHJldmlvdXMg cnVuLgorICAgIHJlbW90ZUhvc3RzID0gZm9yRWFjaFJlbW90ZShyZW1vdGVIb3N0cywgezpkcm9w T25GYWlsdXJlID0+IHRydWUsIDp0aW1lb3V0ID0+IFJFTU9URV9USU1FT1VUfSkgeworICAgICAg ICB8IF8sIHJlbW90ZUhvc3QgfAorICAgICAgICBnZXRSZW1vdGVEaXJlY3RvcnlJZk5lZWRlZChy ZW1vdGVIb3N0KQorICAgICAgICBjb3B5QnVuZGxlVG9SZW1vdGUocmVtb3RlSG9zdCkKKyAgICB9 CisgICAgcmV0dXJuIHVucGFja0J1bmRsZU9uUmVtb3RlSG9zdHMocmVtb3RlSG9zdHMpCitlbmQK KwogZGVmIHJ1bkdudVBhcmFsbGVsUnVubmVyKHJlbW90ZUhvc3RzLCBpbnB1dHMsIG9wdGlvbnM9 e30pCiAgICAgdGltZW91dCA9IDMwMAogICAgIGlmIEVOVlsiSlNDVEVTVF90aW1lb3V0Il0KQEAg LTMxNTgsMTEgKzMxNzEsMTEgQEAgY2xhc3MgTm9uUmVtb3RlVGVzdHNFeGVjdXRvciA8IEJhc2VU ZXN0c0V4ZWN1dG9yCiAgICAgZGVmIHByZXBhcmVFeGVjdXRpb24ocmVtb3RlSG9zdHMpCiAgICAg ICAgIHJlbW90ZUhvc3RzCiAgICAgZW5kCi0gICAgZGVmIHJlZnJlc2hFeGVjdXRpb24ocnVubGlz dCwgc2VyaWFsUGxhbnMsIGNvbXBsZXRlZFRlc3RzKQorICAgIGRlZiByZWZyZXNoRXhlY3V0aW9u KHJ1bmxpc3QsIHNlcmlhbFBsYW5zLCBjb21wbGV0ZWRUZXN0cywgcmVtb3RlSG9zdHMpCiAgICAg ICAgIGlmIG5vdCBAcmVtb3RlSG9zdHMubmlsPwogICAgICAgICAgICAgcmFpc2UgInJlbW90ZUhv c3RzICN7QHJlbW90ZUhvc3RzfSwgZXhwZWN0ZWQgbmlsIgogICAgICAgICBlbmQKLSAgICAgICAg QHRlc3RSdW5uZXIucHJlcGFyZShydW5saXN0LCBzZXJpYWxQbGFucywgY29tcGxldGVkVGVzdHMs IEByZW1vdGVIb3N0cykKKyAgICAgICAgQHRlc3RSdW5uZXIucHJlcGFyZShydW5saXN0LCBzZXJp YWxQbGFucywgY29tcGxldGVkVGVzdHMsIHJlbW90ZUhvc3RzKQogICAgIGVuZAogZW5kCiAKQEAg LTMyMDUsMTMgKzMyMTgsMTMgQEAgY2xhc3MgQmFzZVJlbW90ZVRlc3RzRXhlY3V0b3IgPCBCYXNl VGVzdHNFeGVjdXRvcgogICAgIGRlZiB1cGRhdGVTdGF0dXNNYXAoaXRlcmF0aW9uLCBzdGF0dXNN YXApCiAgICAgICAgIHJldHVybiBnZXRTdGF0dXNNYXAoc3RhdHVzTWFwKQogICAgIGVuZAotICAg IGRlZiByZWZyZXNoRXhlY3V0aW9uKHJ1bmxpc3QsIHNlcmlhbFBsYW5zLCBjb21wbGV0ZWRUZXN0 cykKKyAgICBkZWYgcmVmcmVzaEV4ZWN1dGlvbihydW5saXN0LCBzZXJpYWxQbGFucywgY29tcGxl dGVkVGVzdHMsIHJlbW90ZUhvc3RzKQogICAgICAgICAjIE5vdGUsIHdoZW4gcnVubmluZyB0ZXN0 cyByZW1vdGVseSwgd2UgYWx3YXlzIHByZXBhcmUgdGVzdHMKICAgICAgICAgIyBmb3IgYWxsIHRo ZSBob3N0cyB3aGVuIHJlZnJlc2hpbmcgZXhlY3V0aW9uLCBhcyBldmVuIGhvc3RzCiAgICAgICAg ICMgdGhhdCB3ZW50IGF3YXkgZHVyaW5nIHRlc3RpbmcgbWF5IGhhdmUgY29tZSBiYWNrIG9ubGlu ZSBpbgogICAgICAgICAjIHRoZSBtZWFudGltZSAtLSBzbyB3ZSBkb24ndCBleHBlY3QgYSBsaXN0 IG9mIGxpdmUgcmVtb3RlCiAgICAgICAgICMgaG9zdHMgdG8gYmUgcGFzc2VkIGluLgotICAgICAg ICBAdGVzdFJ1bm5lci5wcmVwYXJlKHJ1bmxpc3QsIHNlcmlhbFBsYW5zLCBjb21wbGV0ZWRUZXN0 cywgQHJlbW90ZUhvc3RzKQorICAgICAgICBAdGVzdFJ1bm5lci5wcmVwYXJlKHJ1bmxpc3QsIHNl cmlhbFBsYW5zLCBjb21wbGV0ZWRUZXN0cywgcmVtb3RlSG9zdHMpCiAgICAgZW5kCiBlbmQKIApA QCAtMzIxOSwxOCArMzIzMiw0NCBAQCBjbGFzcyBSZW1vdGVUZXN0c0V4ZWN1dG9yIDwgQmFzZVJl bW90ZVRlc3RzRXhlY3V0b3IKICAgICBkZWYgcHJlcGFyZUFydGlmYWN0cyhyZW1vdGVIb3N0cykK ICAgICAgICAgcmFpc2UgInJlbW90ZUhvc3RzIG5pbCIgaWYgcmVtb3RlSG9zdHMubmlsPwogICAg ICAgICBwcmVwYXJlQnVuZGxlCisKKyAgICAgICAgIyBUaGUgbWFrZSBydW5uZXIgc3RhdGljYWxs eSBzaGFyZHMgdGhlIHRlc3RzLCBzbyBkbyBhCisgICAgICAgICMgbGl2ZW5lc3MgY2hlY2sgYmVm b3JlIEB0ZXN0UnVubmVyLnByZXBhcmUuIE90aGVyd2lzZSwgd2UnZAorICAgICAgICAjIGFsd2F5 cyBlbmQgdXAgc2NoZWR1bGluZyB0ZXN0cyBvbiBkZWFkIHJlbW90ZXMgYW5kIGhhbXBlcgorICAg ICAgICAjIG91ciBwcm9ncmVzcy4KKyAgICAgICAgcmVtb3RlSG9zdHMgPSBnZXRMaXZlUmVtb3Rl SG9zdHMocmVtb3RlSG9zdHMpCiAgICAgICAgIEB0ZXN0UnVubmVyLnByZXBhcmUoQHJ1bmxpc3Qs IEBzZXJpYWxQbGFucywgU2V0Lm5ldywgcmVtb3RlSG9zdHMpCiAgICAgICAgIGNvbXByZXNzQnVu ZGxlCisgICAgICAgIHJlbW90ZUhvc3RzCiAgICAgZW5kCiAgICAgZGVmIHByZXBhcmVFeGVjdXRp b24ocmVtb3RlSG9zdHMpCi0gICAgICAgIHJlbW90ZUhvc3RzCisgICAgICAgIHJldHVybiBwcmVw YXJlUmVtb3RlcyhyZW1vdGVIb3N0cykKKyAgICBlbmQKKyAgICBkZWYgcmVmcmVzaEV4ZWN1dGlv bihydW5saXN0LCBzZXJpYWxQbGFucywgY29tcGxldGVkVGVzdHMsIHJlbW90ZUhvc3RzKQorICAg ICAgICAjIERvbid0IGFzc2lnbiB0ZXN0cyB0byByZW1vdGVzIHRoYXQgYXJlIGRvd24uCisgICAg ICAgIHJlbW90ZUhvc3RzID0gZ2V0TGl2ZVJlbW90ZUhvc3RzKHJlbW90ZUhvc3RzKQorICAgICAg ICBzdXBlcihydW5saXN0LCBzZXJpYWxQbGFucywgY29tcGxldGVkVGVzdHMsIHJlbW90ZUhvc3Rz KQogICAgIGVuZAogICAgIGRlZiBleGVjdXRlVGVzdHMocmVtb3RlSG9zdHMpCi0gICAgICAgIGZv ckVhY2hSZW1vdGUocmVtb3RlSG9zdHMpIHsKKyAgICAgICAgZm9yRWFjaFJlbW90ZShyZW1vdGVI b3N0cywgOmRyb3BPbkZhaWx1cmUgPT4gdHJ1ZSkgewogICAgICAgICAgICAgfCBpbmRleCB8CiAg ICAgICAgICAgICBydW5UZXN0UnVubmVyKEB0ZXN0UnVubmVyLCByZW1vdGVIb3N0cywgaW5kZXgp CiAgICAgICAgIH0KICAgICBlbmQKKyAgICBwcml2YXRlCisgICAgZGVmIGdldExpdmVSZW1vdGVI b3N0cyhyZW1vdGVIb3N0cykKKyAgICAgICAgIyBUaGlzIGNvbW1hbmQgaXMgc3VwcG9zZWQgdG8g d29yayBvbiBhbGwgcmVtb3RlIGhvc3RzLCBzbworICAgICAgICAjIHJldXNlIGl0IGZvciB0aGUg bGl2ZW5lc3MgY2hlY2suCisgICAgICAgIGNtZCA9IGNvbW1hbmRUb0dldE51bWJlck9mUHJvY2Vz c29ycworICAgICAgICBmb3JFYWNoUmVtb3RlKHJlbW90ZUhvc3RzLCA6ZHJvcE9uRmFpbHVyZSA9 PiB0cnVlLCA6dGltZW91dCA9PiBSRU1PVEVfVElNRU9VVCkgeyB8XywgcmVtb3RlSG9zdHwKKyAg ICAgICAgICAgIGJlZ2luCisgICAgICAgICAgICAgICAgc3NoUmVhZChjbWQsIHJlbW90ZUhvc3Qp CisgICAgICAgICAgICByZXNjdWUKKyAgICAgICAgICAgICAgICAjIEl0J3Mgd2hhdCBmb3JFYWNo UmVtb3RlIGNvbnNpZGVycyBhbiBleHBlY3RlZCBmYWlsdXJlLgorICAgICAgICAgICAgICAgIHJh aXNlIENvbW1hbmRFeGVjdXRpb25GYWlsZWQKKyAgICAgICAgICAgIGVuZAorICAgICAgICB9Cisg ICAgZW5kCiBlbmQKIAogY2xhc3MgR251UGFyYWxsZWxUZXN0c0V4ZWN1dG9yIDwgQmFzZVJlbW90 ZVRlc3RzRXhlY3V0b3IKQEAgLTMyNDAsMTYgKzMyNzksNyBAQCBjbGFzcyBHbnVQYXJhbGxlbFRl c3RzRXhlY3V0b3IgPCBCYXNlUmVtb3RlVGVzdHNFeGVjdXRvcgogICAgICAgICBjb21wcmVzc0J1 bmRsZQogICAgIGVuZAogICAgIGRlZiBwcmVwYXJlRXhlY3V0aW9uKHJlbW90ZUhvc3RzKQotICAg ICAgICAjIElmIHRoZSBwcmVwYXJhdG9yeSBzdGVwcyBmYWlsLCBkcm9wIHRoZSByZW1vdGUgaG9z dCBmcm9tIG91cgotICAgICAgICAjIGxpc3QuIE90aGVyd2lzZSwgaWYgaXQgY29tZXMgYmFjayBv bmxpbmUgaW4gdGhlIG1pZGRsZSBvZiBhbgotICAgICAgICAjIGl0ZXJhdGlvbiwgd2UnbGwgdHJ5 IHRvIHJ1biB0ZXN0IGpvYnMgb24gaXQsIHBvc3NpYmx5IHVzaW5nCi0gICAgICAgICMgYW4gdW5y ZWxhdGVkIGJ1bmRsZSBmcm9tIGEgcHJldmlvdXMgcnVuLgotICAgICAgICByZW1vdGVIb3N0cyA9 IGZvckVhY2hSZW1vdGUocmVtb3RlSG9zdHMsIHs6ZHJvcE9uRmFpbHVyZSA9PiB0cnVlLCA6dGlt ZW91dCA9PiBSRU1PVEVfVElNRU9VVH0pIHsKLSAgICAgICAgICAgIHwgXywgcmVtb3RlSG9zdCB8 Ci0gICAgICAgICAgICBnZXRSZW1vdGVEaXJlY3RvcnlJZk5lZWRlZChyZW1vdGVIb3N0KQotICAg ICAgICAgICAgY29weUJ1bmRsZVRvUmVtb3RlKHJlbW90ZUhvc3QpCi0gICAgICAgIH0KLSAgICAg ICAgcmV0dXJuIHVucGFja0J1bmRsZUdudVBhcmFsbGVsKHJlbW90ZUhvc3RzKQorICAgICAgICBy ZXR1cm4gcHJlcGFyZVJlbW90ZXMocmVtb3RlSG9zdHMpCiAgICAgZW5kCiAgICAgZGVmIGV4ZWN1 dGVUZXN0cyhyZW1vdGVIb3N0cykKICAgICAgICAgcnVuR251UGFyYWxsZWxSdW5uZXIocmVtb3Rl SG9zdHMsICRydW5uZXJEaXIgKyAic2VyaWFsLXRlc3RzIiwKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cnVieS9qc2Mtc3RyZXNzLXRlc3QvZXhlY3V0b3IucmIgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHJ1YnkvanNjLXN0cmVzcy10ZXN0L2V4ZWN1dG9yLnJiCmluZGV4IDQxNzFmNjBl MGEzMjc3YzFjODNiNDMzZTg0ZDM1OTNmODRhMTc5YWYuLjI0NDI5MDUzMmVmNmFkYWNlZDQ1Y2Zh NjcyN2MzNTFhZGQyYjNmNDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cnVieS9q c2Mtc3RyZXNzLXRlc3QvZXhlY3V0b3IucmIKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRydWJ5 L2pzYy1zdHJlc3MtdGVzdC9leGVjdXRvci5yYgpAQCAtMTU0LDcgKzE1NCw3IEBAIGNsYXNzIEJh c2VUZXN0c0V4ZWN1dG9yCiAgICAgICAgICAgICBlbmQKIAogICAgICAgICAgICAgIyBSZWdlbmVy YXRlIHRoZSBsaXN0cyBvZiB0ZXN0cyB0byBydW4KLSAgICAgICAgICAgIHJlZnJlc2hFeGVjdXRp b24oQHJ1bmxpc3QsIEBzZXJpYWxQbGFucywgY29tcGxldGVkVGVzdHMpCisgICAgICAgICAgICBy ZWZyZXNoRXhlY3V0aW9uKEBydW5saXN0LCBAc2VyaWFsUGxhbnMsIGNvbXBsZXRlZFRlc3RzLCBA cmVtb3RlSG9zdHMpCiAKICAgICAgICAgICAgIG51bUZsYWt5ID0gQHJ1bmxpc3Quc2l6ZSAtIGNv bXBsZXRlZFRlc3RzLnNpemUgLSBldmFsdWF0b3IubWlzc2luZy5zaXplCiAgICAgICAgICAgICB0 ZXN0c0luZm8gPSAiY29tcGxldGVkICN7Y29tcGxldGVkVGVzdHMuc2l6ZX0vI3tAcnVubGlzdC5z aXplfSAoI3tudW1GbGFreX0gZmxha3ksICN7ZXZhbHVhdG9yLm1pc3Npbmcuc2l6ZX0gbWlzc2lu ZykiCkBAIC0yMDksNyArMjA5LDcgQEAgbW9kdWxlIEV4ZWN1dG9yU2VsZlRlc3RzCiAgICAgICAg ICAgICBwdXRkKCJzdGF0dXNNYXA6ICN7c3RhdHVzTWFwfSIpCiAgICAgICAgICAgICBzdGF0dXNN YXAKICAgICAgICAgZW5kCi0gICAgICAgIGRlZiByZWZyZXNoRXhlY3V0aW9uKHJ1bmxpc3QsIHNl cmlhbFBsYW5zLCBjb21wbGV0ZWRUZXN0cykKKyAgICAgICAgZGVmIHJlZnJlc2hFeGVjdXRpb24o cnVubGlzdCwgc2VyaWFsUGxhbnMsIGNvbXBsZXRlZFRlc3RzLCByZW1vdGVIb3N0cykKICAgICAg ICAgZW5kCiAgICAgZW5kCiAK