203490 2019-10-28 10:02:08 -0700 results.webkit.org: Report more descriptive configurations for non-Apple ports 2019-10-28 17:26:18 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap clopez commit-queue don.olmstead ews-watchlist glenn lingho webkit-bug-importer oldest_to_newest 1584470 0 jbedard 2019-10-28 10:02:08 -0700 Alexey pointed out to me that we're doing a pretty terrible job of distinguishing between our various different Linux ports in the results database. This carries over to WinCario too. Example: https://results.webkit.org/?suite=layout-tests&test=imported%2Fw3c%2Fweb-platform-tests%2Fcss%2Fcss-position%2Fposition-absolute-container-dynamic-002.html I'm going to suggest that we make the 'platform' for these match the 'port' from webkitpy and then, in the case of GTK, add a version_name based on the display driver. 1584472 1 jbedard 2019-10-28 10:06:02 -0700 <rdar://problem/56658244> 1584473 2 382078 jbedard 2019-10-28 10:09:24 -0700 Created attachment 382078 Patch 1584477 3 382078 clopez 2019-10-28 10:17:53 -0700 Comment on attachment 382078 Patch Patch looks fine. But there are some webkitpy test errors from the EWS. 1584479 4 382080 jbedard 2019-10-28 10:25:27 -0700 Created attachment 382080 Patch 1584484 5 jbedard 2019-10-28 10:32:00 -0700 (In reply to Carlos Alberto Lopez Perez from comment #3) > Comment on attachment 382078 [details] > Patch > > Patch looks fine. But there are some webkitpy test errors from the EWS. Yep, that's what I get for not running the tests locally before uploading... 1584485 6 382080 clopez 2019-10-28 10:36:47 -0700 Comment on attachment 382080 Patch r=me. thanks! 1584487 7 382080 aakash_jain 2019-10-28 10:42:21 -0700 Comment on attachment 382080 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382080&action=review > Tools/Scripts/webkitpy/port/gtk.py:256 > + configuration['platform'] = 'GTK' is the capitalization intention? 1584488 8 jbedard 2019-10-28 10:43:55 -0700 (In reply to Aakash Jain from comment #7) > Comment on attachment 382080 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=382080&action=review > > > Tools/Scripts/webkitpy/port/gtk.py:256 > > + configuration['platform'] = 'GTK' > > is the capitalization intention? It is, it's trying to match the behavior of the old database and buildbot: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#builder=GTK%20Linux%2064-bit%20Debug%20(Tests) 1584517 9 commit-queue 2019-10-28 11:42:17 -0700 The commit-queue encountered the following flaky tests while processing attachment 382080: imported/w3c/web-platform-tests/css/css-position/position-absolute-container-dynamic-002.html bug 203473 (author: simon.fraser@apple.com) imported/w3c/web-platform-tests/css/css-position/position-absolute-crash-chrome-005.html bug 203474 (author: simon.fraser@apple.com) imported/w3c/web-platform-tests/websockets/bufferedAmount-unchanged-by-sync-xhr.any.worker.html bug 202003 (author: youennf@gmail.com) The commit-queue is continuing to process your patch. 1584518 10 382080 commit-queue 2019-10-28 11:43:11 -0700 Comment on attachment 382080 Patch Clearing flags on attachment: 382080 Committed r251661: <https://trac.webkit.org/changeset/251661> 1584519 11 commit-queue 2019-10-28 11:43:13 -0700 All reviewed patches have been landed. Closing bug. 1584712 12 ap 2019-10-28 16:22:00 -0700 > Example: https://results.webkit.org/?suite=layout-tests&test=imported%2Fw3c%2Fweb-platform-tests%2Fcss%2Fcss-position%2Fposition-absolute-container-dynamic-002.html We should further standardize the naming. I see "Xvfb wk2 Release" on this link now, but that doesn't match any of the queue names on https://build.webkit.org/dashboard/ 1584734 13 jbedard 2019-10-28 16:33:28 -0700 (In reply to Alexey Proskuryakov from comment #12) > > Example: https://results.webkit.org/?suite=layout-tests&test=imported%2Fw3c%2Fweb-platform-tests%2Fcss%2Fcss-position%2Fposition-absolute-container-dynamic-002.html > > We should further standardize the naming. I see "Xvfb wk2 Release" on this > link now, but that doesn't match any of the queue names on > https://build.webkit.org/dashboard/ That would be GTK, but yeah, I agree, the name we're displaying isn't quite right. 1584766 14 clopez 2019-10-28 17:26:18 -0700 (In reply to Alexey Proskuryakov from comment #12) > > Example: https://results.webkit.org/?suite=layout-tests&test=imported%2Fw3c%2Fweb-platform-tests%2Fcss%2Fcss-position%2Fposition-absolute-container-dynamic-002.html > > We should further standardize the naming. I see "Xvfb wk2 Release" on this > link now, but that doesn't match any of the queue names on > https://build.webkit.org/dashboard/ For layout tests for GTK we basically have two types of bots: - Wayland - Xvfb (but the name Xvfb is usually omitted) So I suggest to remove "Xvfb" from the name here. 382078 2019-10-28 10:09:24 -0700 2019-10-28 10:25:26 -0700 Patch bug-203490-20191028100924.patch text/plain 2935 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MTY1NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTEwLTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IFJlcG9ydCBtb3JlIGRlc2NyaXB0aXZl IGNvbmZpZ3VyYXRpb25zIGZvciBub24tQXBwbGUgcG9ydHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzQ5MAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNTY2NTgyNDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrLnB5OgorICAgICAgICAoR3RrUG9ydCk6 CisgICAgICAgIChHdGtQb3J0LmNvbmZpZ3VyYXRpb25fZm9yX3VwbG9hZCk6IFJldHVybiB1c2Ug R1RLIGFzIHRoZSBwbGF0Zm9ybS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2lu LnB5OgorICAgICAgICAoV2luQ2Fpcm9Qb3J0LmNvbmZpZ3VyYXRpb25fZm9yX3VwbG9hZCk6IFVz ZSB3aW5jYWlybyBhcyB0aGUgcGxhdGZvcm0uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9w b3J0L3dwZS5weToKKyAgICAgICAgKFdQRVBvcnQpOgorICAgICAgICAoV1BFUG9ydC5jb25maWd1 cmF0aW9uX2Zvcl91cGxvYWQpOiBVc2UgV1BFIGFzIHRoZSBwbGF0Zm9ybS4KKwogMjAxOS0xMC0y OCAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW2V3c10g SW1wcm92ZSBzdW1tYXJ5IGZvciBDb21waWxlV2ViS2l0IGFuZCBDb21waWxlSlNDIGJ1aWxkIHN0 ZXAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGsucHkKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5weQkocmV2aXNpb24gMjUxNjU2KQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5weQkod29ya2luZyBjb3B5KQpAQCAt MjUwLDMgKzI1MCw5IEBAIGNsYXNzIEd0a1BvcnQoUG9ydCk6CiAgICAgICAgIGNvbW1hbmQgPSBz dXBlcihHdGtQb3J0LCBzZWxmKS5ydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoKQogICAgICAgICBj b21tYW5kLmFwcGVuZCgiLS1ndGsiKQogICAgICAgICByZXR1cm4gY29tbWFuZAorCisgICAgZGVm IGNvbmZpZ3VyYXRpb25fZm9yX3VwbG9hZChzZWxmLCBob3N0PU5vbmUpOgorICAgICAgICBjb25m aWd1cmF0aW9uID0gc3VwZXIoR3RrUG9ydCwgc2VsZikuY29uZmlndXJhdGlvbl9mb3JfdXBsb2Fk KGhvc3Q9aG9zdCkKKyAgICAgICAgY29uZmlndXJhdGlvblsncGxhdGZvcm0nXSA9ICdHVEsnCisg ICAgICAgIGNvbmZpZ3VyYXRpb25bJ3ZlcnNpb25fbmFtZSddID0gc2VsZi5fZGlzcGxheV9zZXJ2 ZXIuY2FwaXRhbGl6ZSgpIG9yICdYdmZiJworICAgICAgICByZXR1cm4gY29uZmlndXJhdGlvbgpJ bmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5CShyZXZpc2lvbiAyNTE2NTYpCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00OTUs NiArNDk1LDExIEBAIGNsYXNzIFdpbkNhaXJvUG9ydChXaW5Qb3J0KToKIAogICAgICAgICByZXR1 cm4gcGF0aHMKIAorICAgIGRlZiBjb25maWd1cmF0aW9uX2Zvcl91cGxvYWQoc2VsZiwgaG9zdD1O b25lKToKKyAgICAgICAgY29uZmlndXJhdGlvbiA9IHN1cGVyKFdpbkNhaXJvUG9ydCwgc2VsZiku Y29uZmlndXJhdGlvbl9mb3JfdXBsb2FkKGhvc3Q9aG9zdCkKKyAgICAgICAgY29uZmlndXJhdGlv blsncGxhdGZvcm0nXSA9IHNlbGYucG9ydF9uYW1lCisgICAgICAgIHJldHVybiBjb25maWd1cmF0 aW9uCisKIAogY2xhc3MgRlRXUG9ydChXaW5Qb3J0KToKICAgICBwb3J0X25hbWUgPSAiZnR3IgpJ bmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dwZS5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd3BlLnB5CShyZXZpc2lvbiAyNTE2NTYpCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd3BlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMTgs MyArMTE4LDggQEAgY2xhc3MgV1BFUG9ydChQb3J0KToKIAogICAgIGRlZiBfZ2V0X2NyYXNoX2xv ZyhzZWxmLCBuYW1lLCBwaWQsIHN0ZG91dCwgc3RkZXJyLCBuZXdlcl90aGFuLCB0YXJnZXRfaG9z dD1Ob25lKToKICAgICAgICAgcmV0dXJuIEdEQkNyYXNoTG9nR2VuZXJhdG9yKHNlbGYuX2V4ZWN1 dGl2ZSwgbmFtZSwgcGlkLCBuZXdlcl90aGFuLCBzZWxmLl9maWxlc3lzdGVtLCBzZWxmLl9wYXRo X3RvX2RyaXZlcikuZ2VuZXJhdGVfY3Jhc2hfbG9nKHN0ZG91dCwgc3RkZXJyKQorCisgICAgZGVm IGNvbmZpZ3VyYXRpb25fZm9yX3VwbG9hZChzZWxmLCBob3N0PU5vbmUpOgorICAgICAgICBjb25m aWd1cmF0aW9uID0gc3VwZXIoV1BFUG9ydCwgc2VsZikuY29uZmlndXJhdGlvbl9mb3JfdXBsb2Fk KGhvc3Q9aG9zdCkKKyAgICAgICAgY29uZmlndXJhdGlvblsncGxhdGZvcm0nXSA9ICdXUEUnCisg ICAgICAgIHJldHVybiBjb25maWd1cmF0aW9uCg== 382080 2019-10-28 10:25:27 -0700 2019-10-28 11:43:11 -0700 Patch bug-203490-20191028102527.patch text/plain 5920 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MTY1OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI2IEBACisyMDE5LTEwLTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IFJlcG9ydCBtb3JlIGRlc2NyaXB0aXZl IGNvbmZpZ3VyYXRpb25zIGZvciBub24tQXBwbGUgcG9ydHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzQ5MAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNTY2NTgyNDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrLnB5OgorICAgICAgICAoR3RrUG9ydCk6 CisgICAgICAgIChHdGtQb3J0LmNvbmZpZ3VyYXRpb25fZm9yX3VwbG9hZCk6IFJldHVybiB1c2Ug R1RLIGFzIHRoZSBwbGF0Zm9ybS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3Rr X3VuaXR0ZXN0LnB5OgorICAgICAgICAoR3RrUG9ydFRlc3QpOgorICAgICAgICAoR3RrUG9ydFRl c3QudGVzdF9kZWZhdWx0X3VwbG9hZF9jb25maWd1cmF0aW9uKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3BvcnQvd2luLnB5OgorICAgICAgICAoV2luQ2Fpcm9Qb3J0LmNvbmZpZ3VyYXRp b25fZm9yX3VwbG9hZCk6IFVzZSB3aW5jYWlybyBhcyB0aGUgcGxhdGZvcm0uCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9wb3J0L3dwZS5weToKKyAgICAgICAgKFdQRVBvcnQpOgorICAgICAg ICAoV1BFUG9ydC5jb25maWd1cmF0aW9uX2Zvcl91cGxvYWQpOiBVc2UgV1BFIGFzIHRoZSBwbGF0 Zm9ybS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvd3BlX3VuaXR0ZXN0LnB5Ogor ICAgICAgICAoV1BFUG9ydFRlc3QpOgorICAgICAgICAoV1BFUG9ydFRlc3QudGVzdF9kZWZhdWx0 X3VwbG9hZF9jb25maWd1cmF0aW9uKToKKwogMjAxOS0xMC0yOCAgQWFrYXNoIEphaW4gIDxhYWth c2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW2V3c10gSW1wcm92ZSBzdW1tYXJ5IGZvciBD b21waWxlV2ViS2l0IGFuZCBDb21waWxlSlNDIGJ1aWxkIHN0ZXAKSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9ndGsucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2d0ay5weQkocmV2aXNpb24gMjUxNjU4KQorKysgVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2d0ay5weQkod29ya2luZyBjb3B5KQpAQCAtMjUwLDMgKzI1MCw5IEBAIGNsYXNz IEd0a1BvcnQoUG9ydCk6CiAgICAgICAgIGNvbW1hbmQgPSBzdXBlcihHdGtQb3J0LCBzZWxmKS5y dW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoKQogICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1ndGsi KQogICAgICAgICByZXR1cm4gY29tbWFuZAorCisgICAgZGVmIGNvbmZpZ3VyYXRpb25fZm9yX3Vw bG9hZChzZWxmLCBob3N0PU5vbmUpOgorICAgICAgICBjb25maWd1cmF0aW9uID0gc3VwZXIoR3Rr UG9ydCwgc2VsZikuY29uZmlndXJhdGlvbl9mb3JfdXBsb2FkKGhvc3Q9aG9zdCkKKyAgICAgICAg Y29uZmlndXJhdGlvblsncGxhdGZvcm0nXSA9ICdHVEsnCisgICAgICAgIGNvbmZpZ3VyYXRpb25b J3ZlcnNpb25fbmFtZSddID0gc2VsZi5fZGlzcGxheV9zZXJ2ZXIuY2FwaXRhbGl6ZSgpIGlmIHNl bGYuX2Rpc3BsYXlfc2VydmVyIGVsc2UgJ1h2ZmInCisgICAgICAgIHJldHVybiBjb25maWd1cmF0 aW9uCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrX3VuaXR0ZXN0LnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGtfdW5pdHRlc3QucHkJ KHJldmlzaW9uIDI1MTY1OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGtfdW5p dHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDcgQEAgaW1wb3J0IHVuaXR0ZXN0 CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlX21vY2sgaW1wb3J0IE1vY2tF eGVjdXRpdmUKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVtX21vY2sgaW1w b3J0IE1vY2tGaWxlU3lzdGVtCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2Fw dHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQorZnJvbSB3ZWJraXRweS5wb3J0LmNvbmZpZyBpbXBv cnQgY2xlYXJfY2FjaGVkX2NvbmZpZ3VyYXRpb24KIGZyb20gd2Via2l0cHkucG9ydC5ndGsgaW1w b3J0IEd0a1BvcnQKIGZyb20gd2Via2l0cHkucG9ydC5wdWxzZWF1ZGlvX3Nhbml0aXplcl9tb2Nr IGltcG9ydCBQdWxzZUF1ZGlvU2FuaXRpemVyTW9jawogZnJvbSB3ZWJraXRweS5wb3J0IGltcG9y dCBwb3J0X3Rlc3RjYXNlCkBAIC03NiwzICs3NywxMyBAQCBjbGFzcyBHdGtQb3J0VGVzdChwb3J0 X3Rlc3RjYXNlLlBvcnRUZXN0CiAgICAgZGVmIHRlc3RfZ2V0X2NyYXNoX2xvZyhzZWxmKToKICAg ICAgICAgIyBUaGlzIGZ1bmN0aW9uIHRlc3RlZCBpbiBsaW51eF9nZXRfY3Jhc2hfbG9nX3VuaXR0 ZXN0LnB5CiAgICAgICAgIHBhc3MKKworICAgIGRlZiB0ZXN0X2RlZmF1bHRfdXBsb2FkX2NvbmZp Z3VyYXRpb24oc2VsZik6CisgICAgICAgIGNsZWFyX2NhY2hlZF9jb25maWd1cmF0aW9uKCkKKyAg ICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKKyAgICAgICAgY29uZmlndXJhdGlvbiA9IHBv cnQuY29uZmlndXJhdGlvbl9mb3JfdXBsb2FkKCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChj b25maWd1cmF0aW9uWydhcmNoaXRlY3R1cmUnXSwgcG9ydC5hcmNoaXRlY3R1cmUoKSkKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChjb25maWd1cmF0aW9uWydpc19zaW11bGF0b3InXSwgRmFsc2Up CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29uZmlndXJhdGlvblsncGxhdGZvcm0nXSwgJ0dU SycpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29uZmlndXJhdGlvblsnc3R5bGUnXSwgJ3Jl bGVhc2UnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbmZpZ3VyYXRpb25bJ3ZlcnNpb25f bmFtZSddLCAnWHZmYicpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkJKHJldmlz aW9uIDI1MTY1OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkJKHdvcmtp bmcgY29weSkKQEAgLTQ5NSw2ICs0OTUsMTEgQEAgY2xhc3MgV2luQ2Fpcm9Qb3J0KFdpblBvcnQp OgogCiAgICAgICAgIHJldHVybiBwYXRocwogCisgICAgZGVmIGNvbmZpZ3VyYXRpb25fZm9yX3Vw bG9hZChzZWxmLCBob3N0PU5vbmUpOgorICAgICAgICBjb25maWd1cmF0aW9uID0gc3VwZXIoV2lu Q2Fpcm9Qb3J0LCBzZWxmKS5jb25maWd1cmF0aW9uX2Zvcl91cGxvYWQoaG9zdD1ob3N0KQorICAg ICAgICBjb25maWd1cmF0aW9uWydwbGF0Zm9ybSddID0gc2VsZi5wb3J0X25hbWUKKyAgICAgICAg cmV0dXJuIGNvbmZpZ3VyYXRpb24KKwogCiBjbGFzcyBGVFdQb3J0KFdpblBvcnQpOgogICAgIHBv cnRfbmFtZSA9ICJmdHciCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd3BlLnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUucHkJKHJldmlz aW9uIDI1MTY1OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUucHkJKHdvcmtp bmcgY29weSkKQEAgLTExOCwzICsxMTgsOCBAQCBjbGFzcyBXUEVQb3J0KFBvcnQpOgogCiAgICAg ZGVmIF9nZXRfY3Jhc2hfbG9nKHNlbGYsIG5hbWUsIHBpZCwgc3Rkb3V0LCBzdGRlcnIsIG5ld2Vy X3RoYW4sIHRhcmdldF9ob3N0PU5vbmUpOgogICAgICAgICByZXR1cm4gR0RCQ3Jhc2hMb2dHZW5l cmF0b3Ioc2VsZi5fZXhlY3V0aXZlLCBuYW1lLCBwaWQsIG5ld2VyX3RoYW4sIHNlbGYuX2ZpbGVz eXN0ZW0sIHNlbGYuX3BhdGhfdG9fZHJpdmVyKS5nZW5lcmF0ZV9jcmFzaF9sb2coc3Rkb3V0LCBz dGRlcnIpCisKKyAgICBkZWYgY29uZmlndXJhdGlvbl9mb3JfdXBsb2FkKHNlbGYsIGhvc3Q9Tm9u ZSk6CisgICAgICAgIGNvbmZpZ3VyYXRpb24gPSBzdXBlcihXUEVQb3J0LCBzZWxmKS5jb25maWd1 cmF0aW9uX2Zvcl91cGxvYWQoaG9zdD1ob3N0KQorICAgICAgICBjb25maWd1cmF0aW9uWydwbGF0 Zm9ybSddID0gJ1dQRScKKyAgICAgICAgcmV0dXJuIGNvbmZpZ3VyYXRpb24KSW5kZXg6IFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGVfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dwZV91bml0dGVzdC5weQkocmV2aXNpb24gMjUxNjU4 KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dwZV91bml0dGVzdC5weQkod29ya2lu ZyBjb3B5KQpAQCAtMzQsNiArMzQsNyBAQCBpbXBvcnQgdW5pdHRlc3QKIGZyb20gd2Via2l0cHku Y29tbW9uLnN5c3RlbS5leGVjdXRpdmVfbW9jayBpbXBvcnQgTW9ja0V4ZWN1dGl2ZQogZnJvbSB3 ZWJraXRweS5jb21tb24uc3lzdGVtLmZpbGVzeXN0ZW1fbW9jayBpbXBvcnQgTW9ja0ZpbGVTeXN0 ZW0KIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5vdXRwdXRjYXB0dXJlIGltcG9ydCBPdXRw dXRDYXB0dXJlCitmcm9tIHdlYmtpdHB5LnBvcnQuY29uZmlnIGltcG9ydCBjbGVhcl9jYWNoZWRf Y29uZmlndXJhdGlvbgogZnJvbSB3ZWJraXRweS5wb3J0LndwZSBpbXBvcnQgV1BFUG9ydAogZnJv bSB3ZWJraXRweS5wb3J0LnB1bHNlYXVkaW9fc2FuaXRpemVyX21vY2sgaW1wb3J0IFB1bHNlQXVk aW9TYW5pdGl6ZXJNb2NrCiBmcm9tIHdlYmtpdHB5LnBvcnQgaW1wb3J0IHBvcnRfdGVzdGNhc2UK QEAgLTcxLDMgKzcyLDEyIEBAIGNsYXNzIFdQRVBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRl c3QKICAgICBkZWYgdGVzdF9nZXRfY3Jhc2hfbG9nKHNlbGYpOgogICAgICAgICAjIFRoaXMgZnVu Y3Rpb24gdGVzdGVkIGluIGxpbnV4X2dldF9jcmFzaF9sb2dfdW5pdHRlc3QucHkKICAgICAgICAg cGFzcworCisgICAgZGVmIHRlc3RfZGVmYXVsdF91cGxvYWRfY29uZmlndXJhdGlvbihzZWxmKToK KyAgICAgICAgY2xlYXJfY2FjaGVkX2NvbmZpZ3VyYXRpb24oKQorICAgICAgICBwb3J0ID0gc2Vs Zi5tYWtlX3BvcnQoKQorICAgICAgICBjb25maWd1cmF0aW9uID0gcG9ydC5jb25maWd1cmF0aW9u X2Zvcl91cGxvYWQoKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbmZpZ3VyYXRpb25bJ2Fy Y2hpdGVjdHVyZSddLCBwb3J0LmFyY2hpdGVjdHVyZSgpKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFsKGNvbmZpZ3VyYXRpb25bJ2lzX3NpbXVsYXRvciddLCBGYWxzZSkKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChjb25maWd1cmF0aW9uWydwbGF0Zm9ybSddLCAnV1BFJykKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChjb25maWd1cmF0aW9uWydzdHlsZSddLCAncmVsZWFzZScpCg==