150069 2015-10-12 17:47:34 -0700 Add a Mac debug EWS queue 2015-10-12 19:50:13 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap commit-queue glenn lforschler oldest_to_newest 1132608 0 ap 2015-10-12 17:47:34 -0700 Let's add a Mac debug EWS queue. And make it 32-bit to increase the coverage in this direction too. 1132610 1 262947 ap 2015-10-12 17:49:16 -0700 Created attachment 262947 proposed patch I think that this should do it... 1132628 2 262952 ap 2015-10-12 18:31:45 -0700 Created attachment 262952 proposed patch Now that I actually tried to run the tests, I realize that we can't test WK2, because modern WebKit API is 64-bit only. 1132634 3 262954 ap 2015-10-12 18:38:30 -0700 Created attachment 262954 proposed patch But we can't enable tests in WK1 either - they run, but there are lots of slightly different results. 1132638 4 commit-queue 2015-10-12 18:41:23 -0700 Attachment 262954 did not pass style-queue: ERROR: Tools/Scripts/webkitpy/common/config/ews.json:43: Expecting property name enclosed in double quotes: line 43 column 5 (char 877) [json/syntax] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1132657 5 262954 ggaren 2015-10-12 19:04:09 -0700 Comment on attachment 262954 proposed patch r=me 1132680 6 262954 commit-queue 2015-10-12 19:50:09 -0700 Comment on attachment 262954 proposed patch Clearing flags on attachment: 262954 Committed r190922: <http://trac.webkit.org/changeset/190922> 1132681 7 commit-queue 2015-10-12 19:50:13 -0700 All reviewed patches have been landed. Closing bug. 262947 2015-10-12 17:49:16 -0700 2015-10-12 18:31:45 -0700 proposed patch MacDebugEWS.txt text/plain 3542 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5MDkwOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE1LTEwLTEyICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIEFkZCBhIE1hYyBkZWJ1ZyBFV1MgcXVldWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDA2OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvY29uZmln L3F1ZXVlcy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvZXdz Lmpzb246CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2Fy bmluZ3N5c3RlbS5weToKKyAgICAgICAgKEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtKToKKyAg ICAgICAgKEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtLmFyY2hpdmVfbGFzdF90ZXN0X3Jlc3Vs dHMpOgorICAgICAgICAoQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0uYnVpbGRfc3R5bGUpOgor ICAgICAgICAoQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0ucmVmZXRjaF9wYXRjaCk6CisgICAg ICAgIChBYnN0cmFjdEVhcmx5V2FybmluZ1N5c3RlbS5sb2FkX2V3c19jbGFzc2VzKToKKwogMjAx NS0xMC0xMiAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1hcmlvQGVuZGxlc3NtLmNvbT4KIAogICAg ICAgICBbR1RLXSBVcGRhdGUgamhidWlsZCdzIHZlcnNpb24gb2YgaGFyZmJ1enoKSW5kZXg6IFRv b2xzL1F1ZXVlU3RhdHVzU2VydmVyL2NvbmZpZy9xdWV1ZXMucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvUXVldWVTdGF0dXNTZXJ2ZXIvY29uZmlnL3F1ZXVlcy5weQkocmV2aXNpb24gMTkwODU1KQor KysgVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvY29uZmlnL3F1ZXVlcy5weQkod29ya2luZyBjb3B5 KQpAQCAtMzcsNiArMzcsNyBAQCBhbGxfcXVldWVfbmFtZXMgPSBbCiAgICAgImlvcy1ld3MiLAog ICAgICJtYWMtZXdzIiwKICAgICAibWFjLXdrMi1ld3MiLAorICAgICJtYWMtZGVidWctMzJiaXQt d2syLWV3cyIsCiAgICAgIndpbi1ld3MiLAogICAgICJlZmwtd2syLWV3cyIsCiBdCkluZGV4OiBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvZXdzLmpzb24KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2V3cy5qc29uCShyZXZpc2lv biAxOTA4NTUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvZXdzLmpz b24JKHdvcmtpbmcgY29weSkKQEAgLTM0LDUgKzM0LDEyIEBACiAgICAgICAgICAgICAicm5pd2FA d2Via2l0Lm9yZyIKICAgICAgICAgXSwKICAgICAgICAgInJ1blRlc3RzIjogdHJ1ZQorICAgIH0s CisgICAgIk1hYyBEZWJ1ZyAzMi1iaXQgV0syIEVXUyI6IHsKKyAgICAgICAgInBvcnQiOiAibWFj LXdrMiIsCisgICAgICAgICJuYW1lIjogIm1hYy1kZWJ1Zy0zMmJpdC13azItZXdzIiwKKyAgICAg ICAgInN0eWxlIjogImRlYnVnIiwKKyAgICAgICAgImFyY2hpdGVjdHVyZSI6ICJpMzg2IiwKKyAg ICAgICAgInJ1blRlc3RzIjogdHJ1ZQogICAgIH0KIH0KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5w eQkocmV2aXNpb24gMTkwODU1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weQkod29ya2luZyBjb3B5KQpAQCAtNDQsNyArNDQsNiBA QCBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKIAogY2xhc3MgQWJzdHJhY3RF YXJseVdhcm5pbmdTeXN0ZW0oQWJzdHJhY3RSZXZpZXdRdWV1ZSwgRWFybHlXYXJuaW5nU3lzdGVt VGFza0RlbGVnYXRlKToKLSAgICBfYnVpbGRfc3R5bGUgPSAicmVsZWFzZSIKICAgICAjIEZJWE1F OiBTd2l0Y2ggX2RlZmF1bHRfcnVuX3Rlc3RzIGZyb20gb3B0LWluIHRvIG9wdC1vdXQgb25jZSBt b3JlIGJvdHMgYXJlIHJlYWR5IHRvIHJ1biB0ZXN0cy4KICAgICBydW5fdGVzdHMgPSBGYWxzZQog CkBAIC0xMjQsNyArMTIzLDcgQEAgY2xhc3MgQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0oQWJz dHJhYwogICAgICAgICByZXR1cm4gc2VsZi5fbGF5b3V0X3Rlc3RfcmVzdWx0c19yZWFkZXIuYXJj aGl2ZShwYXRjaCkKIAogICAgIGRlZiBidWlsZF9zdHlsZShzZWxmKToKLSAgICAgICAgcmV0dXJu IHNlbGYuX2J1aWxkX3N0eWxlCisgICAgICAgIHJldHVybiBzZWxmLmJ1aWxkX3N0eWxlCiAKICAg ICBkZWYgcmVmZXRjaF9wYXRjaChzZWxmLCBwYXRjaCk6CiAgICAgICAgIHJldHVybiBzZWxmLl90 b29sLmJ1Z3MuZmV0Y2hfYXR0YWNobWVudChwYXRjaC5pZCgpKQpAQCAtMTUwLDEwICsxNDksMTEg QEAgY2xhc3MgQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0oQWJzdHJhYwogCiAgICAgICAgIGNs YXNzZXMgPSBbXQogICAgICAgICBmb3IgbmFtZSwgY29uZmlnIGluIGV3c2VzLml0ZXJpdGVtcygp OgotICAgICAgICAgICAgY2xhc3Nlcy5hcHBlbmQodHlwZShzdHIobmFtZS5yZXBsYWNlKCcgJywg JycpKSwgKEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtLCksIHsKLSAgICAgICAgICAgICAgICAn bmFtZSc6IGNvbmZpZ1sncG9ydCddICsgJy1ld3MnLAorICAgICAgICAgICAgY2xhc3Nlcy5hcHBl bmQodHlwZShzdHIobmFtZSkudHJhbnNsYXRlKE5vbmUsICcgLScpLCAoQWJzdHJhY3RFYXJseVdh cm5pbmdTeXN0ZW0sKSwgeworICAgICAgICAgICAgICAgICduYW1lJzogY29uZmlnLmdldCgnbmFt ZScsIGNvbmZpZ1sncG9ydCddICsgJy1ld3MnKSwKICAgICAgICAgICAgICAgICAncG9ydF9uYW1l JzogY29uZmlnWydwb3J0J10sCiAgICAgICAgICAgICAgICAgJ2FyY2hpdGVjdHVyZSc6IGNvbmZp Zy5nZXQoJ2FyY2hpdGVjdHVyZScsIE5vbmUpLAorICAgICAgICAgICAgICAgICdidWlsZF9zdHls ZSc6IGNvbmZpZy5nZXQoJ3N0eWxlJywgInJlbGVhc2UiKSwKICAgICAgICAgICAgICAgICAnd2F0 Y2hlcnMnOiBjb25maWcuZ2V0KCd3YXRjaGVycycsIFtdKSwKICAgICAgICAgICAgICAgICAncnVu X3Rlc3RzJzogY29uZmlnLmdldCgncnVuVGVzdHMnLCBjbHMucnVuX3Rlc3RzKSwKICAgICAgICAg ICAgIH0pKQo= 262952 2015-10-12 18:31:45 -0700 2015-10-12 18:38:30 -0700 proposed patch MacDebugEWS.txt text/plain 3530 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5MDkwOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE1LTEwLTEyICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIEFkZCBhIE1hYyBkZWJ1ZyBFV1MgcXVldWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDA2OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvY29uZmln L3F1ZXVlcy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvZXdz Lmpzb246CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2Fy bmluZ3N5c3RlbS5weToKKyAgICAgICAgKEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtKToKKyAg ICAgICAgKEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtLmFyY2hpdmVfbGFzdF90ZXN0X3Jlc3Vs dHMpOgorICAgICAgICAoQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0uYnVpbGRfc3R5bGUpOgor ICAgICAgICAoQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0ucmVmZXRjaF9wYXRjaCk6CisgICAg ICAgIChBYnN0cmFjdEVhcmx5V2FybmluZ1N5c3RlbS5sb2FkX2V3c19jbGFzc2VzKToKKwogMjAx NS0xMC0xMiAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1hcmlvQGVuZGxlc3NtLmNvbT4KIAogICAg ICAgICBbR1RLXSBVcGRhdGUgamhidWlsZCdzIHZlcnNpb24gb2YgaGFyZmJ1enoKSW5kZXg6IFRv b2xzL1F1ZXVlU3RhdHVzU2VydmVyL2NvbmZpZy9xdWV1ZXMucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvUXVldWVTdGF0dXNTZXJ2ZXIvY29uZmlnL3F1ZXVlcy5weQkocmV2aXNpb24gMTkwODU1KQor KysgVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvY29uZmlnL3F1ZXVlcy5weQkod29ya2luZyBjb3B5 KQpAQCAtMzcsNiArMzcsNyBAQCBhbGxfcXVldWVfbmFtZXMgPSBbCiAgICAgImlvcy1ld3MiLAog ICAgICJtYWMtZXdzIiwKICAgICAibWFjLXdrMi1ld3MiLAorICAgICJtYWMtZGVidWctMzJiaXQt ZXdzIiwKICAgICAid2luLWV3cyIsCiAgICAgImVmbC13azItZXdzIiwKIF0KSW5kZXg6IFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9ld3MuanNvbgo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvZXdzLmpzb24JKHJldmlzaW9uIDE5 MDg1NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9ld3MuanNvbgko d29ya2luZyBjb3B5KQpAQCAtMzQsNSArMzQsMTIgQEAKICAgICAgICAgICAgICJybml3YUB3ZWJr aXQub3JnIgogICAgICAgICBdLAogICAgICAgICAicnVuVGVzdHMiOiB0cnVlCisgICAgfSwKKyAg ICAiTWFjIERlYnVnIDMyLWJpdCBXSzIgRVdTIjogeworICAgICAgICAicG9ydCI6ICJtYWMiLAor ICAgICAgICAibmFtZSI6ICJtYWMtZGVidWctMzJiaXQtZXdzIiwKKyAgICAgICAgInN0eWxlIjog ImRlYnVnIiwKKyAgICAgICAgImFyY2hpdGVjdHVyZSI6ICJpMzg2IiwKKyAgICAgICAgInJ1blRl c3RzIjogdHJ1ZQogICAgIH0KIH0KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9j b21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weQkocmV2aXNpb24g MTkwODU1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2Fy bmluZ3N5c3RlbS5weQkod29ya2luZyBjb3B5KQpAQCAtNDQsNyArNDQsNiBAQCBfbG9nID0gbG9n Z2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKIAogY2xhc3MgQWJzdHJhY3RFYXJseVdhcm5pbmdT eXN0ZW0oQWJzdHJhY3RSZXZpZXdRdWV1ZSwgRWFybHlXYXJuaW5nU3lzdGVtVGFza0RlbGVnYXRl KToKLSAgICBfYnVpbGRfc3R5bGUgPSAicmVsZWFzZSIKICAgICAjIEZJWE1FOiBTd2l0Y2ggX2Rl ZmF1bHRfcnVuX3Rlc3RzIGZyb20gb3B0LWluIHRvIG9wdC1vdXQgb25jZSBtb3JlIGJvdHMgYXJl IHJlYWR5IHRvIHJ1biB0ZXN0cy4KICAgICBydW5fdGVzdHMgPSBGYWxzZQogCkBAIC0xMjQsNyAr MTIzLDcgQEAgY2xhc3MgQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0oQWJzdHJhYwogICAgICAg ICByZXR1cm4gc2VsZi5fbGF5b3V0X3Rlc3RfcmVzdWx0c19yZWFkZXIuYXJjaGl2ZShwYXRjaCkK IAogICAgIGRlZiBidWlsZF9zdHlsZShzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxk X3N0eWxlCisgICAgICAgIHJldHVybiBzZWxmLmJ1aWxkX3N0eWxlCiAKICAgICBkZWYgcmVmZXRj aF9wYXRjaChzZWxmLCBwYXRjaCk6CiAgICAgICAgIHJldHVybiBzZWxmLl90b29sLmJ1Z3MuZmV0 Y2hfYXR0YWNobWVudChwYXRjaC5pZCgpKQpAQCAtMTUwLDEwICsxNDksMTEgQEAgY2xhc3MgQWJz dHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0oQWJzdHJhYwogCiAgICAgICAgIGNsYXNzZXMgPSBbXQog ICAgICAgICBmb3IgbmFtZSwgY29uZmlnIGluIGV3c2VzLml0ZXJpdGVtcygpOgotICAgICAgICAg ICAgY2xhc3Nlcy5hcHBlbmQodHlwZShzdHIobmFtZS5yZXBsYWNlKCcgJywgJycpKSwgKEFic3Ry YWN0RWFybHlXYXJuaW5nU3lzdGVtLCksIHsKLSAgICAgICAgICAgICAgICAnbmFtZSc6IGNvbmZp Z1sncG9ydCddICsgJy1ld3MnLAorICAgICAgICAgICAgY2xhc3Nlcy5hcHBlbmQodHlwZShzdHIo bmFtZSkudHJhbnNsYXRlKE5vbmUsICcgLScpLCAoQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0s KSwgeworICAgICAgICAgICAgICAgICduYW1lJzogY29uZmlnLmdldCgnbmFtZScsIGNvbmZpZ1sn cG9ydCddICsgJy1ld3MnKSwKICAgICAgICAgICAgICAgICAncG9ydF9uYW1lJzogY29uZmlnWydw b3J0J10sCiAgICAgICAgICAgICAgICAgJ2FyY2hpdGVjdHVyZSc6IGNvbmZpZy5nZXQoJ2FyY2hp dGVjdHVyZScsIE5vbmUpLAorICAgICAgICAgICAgICAgICdidWlsZF9zdHlsZSc6IGNvbmZpZy5n ZXQoJ3N0eWxlJywgInJlbGVhc2UiKSwKICAgICAgICAgICAgICAgICAnd2F0Y2hlcnMnOiBjb25m aWcuZ2V0KCd3YXRjaGVycycsIFtdKSwKICAgICAgICAgICAgICAgICAncnVuX3Rlc3RzJzogY29u ZmlnLmdldCgncnVuVGVzdHMnLCBjbHMucnVuX3Rlc3RzKSwKICAgICAgICAgICAgIH0pKQo= 262954 2015-10-12 18:38:30 -0700 2015-10-12 19:50:09 -0700 proposed patch MacDebugEWS.txt text/plain 3504 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5MDkwOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE1LTEwLTEyICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIEFkZCBhIE1hYyBkZWJ1ZyBFV1MgcXVldWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDA2OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvY29uZmln L3F1ZXVlcy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvZXdz Lmpzb246CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2Fy bmluZ3N5c3RlbS5weToKKyAgICAgICAgKEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtKToKKyAg ICAgICAgKEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtLmFyY2hpdmVfbGFzdF90ZXN0X3Jlc3Vs dHMpOgorICAgICAgICAoQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0uYnVpbGRfc3R5bGUpOgor ICAgICAgICAoQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0ucmVmZXRjaF9wYXRjaCk6CisgICAg ICAgIChBYnN0cmFjdEVhcmx5V2FybmluZ1N5c3RlbS5sb2FkX2V3c19jbGFzc2VzKToKKwogMjAx NS0xMC0xMiAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1hcmlvQGVuZGxlc3NtLmNvbT4KIAogICAg ICAgICBbR1RLXSBVcGRhdGUgamhidWlsZCdzIHZlcnNpb24gb2YgaGFyZmJ1enoKSW5kZXg6IFRv b2xzL1F1ZXVlU3RhdHVzU2VydmVyL2NvbmZpZy9xdWV1ZXMucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvUXVldWVTdGF0dXNTZXJ2ZXIvY29uZmlnL3F1ZXVlcy5weQkocmV2aXNpb24gMTkwODU1KQor KysgVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvY29uZmlnL3F1ZXVlcy5weQkod29ya2luZyBjb3B5 KQpAQCAtMzcsNiArMzcsNyBAQCBhbGxfcXVldWVfbmFtZXMgPSBbCiAgICAgImlvcy1ld3MiLAog ICAgICJtYWMtZXdzIiwKICAgICAibWFjLXdrMi1ld3MiLAorICAgICJtYWMtZGVidWctMzJiaXQt ZXdzIiwKICAgICAid2luLWV3cyIsCiAgICAgImVmbC13azItZXdzIiwKIF0KSW5kZXg6IFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9ld3MuanNvbgo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvZXdzLmpzb24JKHJldmlzaW9uIDE5 MDg1NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9ld3MuanNvbgko d29ya2luZyBjb3B5KQpAQCAtMzQsNSArMzQsMTEgQEAKICAgICAgICAgICAgICJybml3YUB3ZWJr aXQub3JnIgogICAgICAgICBdLAogICAgICAgICAicnVuVGVzdHMiOiB0cnVlCisgICAgfSwKKyAg ICAiTWFjIERlYnVnIDMyLWJpdCBXSzIgRVdTIjogeworICAgICAgICAicG9ydCI6ICJtYWMiLAor ICAgICAgICAibmFtZSI6ICJtYWMtZGVidWctMzJiaXQtZXdzIiwKKyAgICAgICAgInN0eWxlIjog ImRlYnVnIiwKKyAgICAgICAgImFyY2hpdGVjdHVyZSI6ICJpMzg2IiwKICAgICB9CiB9CkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVt LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9l YXJseXdhcm5pbmdzeXN0ZW0ucHkJKHJldmlzaW9uIDE5MDg1NSkKKysrIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkJKHdvcmtpbmcgY29w eSkKQEAgLTQ0LDcgKzQ0LDYgQEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQog CiAKIGNsYXNzIEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtKEFic3RyYWN0UmV2aWV3UXVldWUs IEVhcmx5V2FybmluZ1N5c3RlbVRhc2tEZWxlZ2F0ZSk6Ci0gICAgX2J1aWxkX3N0eWxlID0gInJl bGVhc2UiCiAgICAgIyBGSVhNRTogU3dpdGNoIF9kZWZhdWx0X3J1bl90ZXN0cyBmcm9tIG9wdC1p biB0byBvcHQtb3V0IG9uY2UgbW9yZSBib3RzIGFyZSByZWFkeSB0byBydW4gdGVzdHMuCiAgICAg cnVuX3Rlc3RzID0gRmFsc2UKIApAQCAtMTI0LDcgKzEyMyw3IEBAIGNsYXNzIEFic3RyYWN0RWFy bHlXYXJuaW5nU3lzdGVtKEFic3RyYWMKICAgICAgICAgcmV0dXJuIHNlbGYuX2xheW91dF90ZXN0 X3Jlc3VsdHNfcmVhZGVyLmFyY2hpdmUocGF0Y2gpCiAKICAgICBkZWYgYnVpbGRfc3R5bGUoc2Vs Zik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9zdHlsZQorICAgICAgICByZXR1cm4gc2Vs Zi5idWlsZF9zdHlsZQogCiAgICAgZGVmIHJlZmV0Y2hfcGF0Y2goc2VsZiwgcGF0Y2gpOgogICAg ICAgICByZXR1cm4gc2VsZi5fdG9vbC5idWdzLmZldGNoX2F0dGFjaG1lbnQocGF0Y2guaWQoKSkK QEAgLTE1MCwxMCArMTQ5LDExIEBAIGNsYXNzIEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtKEFi c3RyYWMKIAogICAgICAgICBjbGFzc2VzID0gW10KICAgICAgICAgZm9yIG5hbWUsIGNvbmZpZyBp biBld3Nlcy5pdGVyaXRlbXMoKToKLSAgICAgICAgICAgIGNsYXNzZXMuYXBwZW5kKHR5cGUoc3Ry KG5hbWUucmVwbGFjZSgnICcsICcnKSksIChBYnN0cmFjdEVhcmx5V2FybmluZ1N5c3RlbSwpLCB7 Ci0gICAgICAgICAgICAgICAgJ25hbWUnOiBjb25maWdbJ3BvcnQnXSArICctZXdzJywKKyAgICAg ICAgICAgIGNsYXNzZXMuYXBwZW5kKHR5cGUoc3RyKG5hbWUpLnRyYW5zbGF0ZShOb25lLCAnIC0n KSwgKEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtLCksIHsKKyAgICAgICAgICAgICAgICAnbmFt ZSc6IGNvbmZpZy5nZXQoJ25hbWUnLCBjb25maWdbJ3BvcnQnXSArICctZXdzJyksCiAgICAgICAg ICAgICAgICAgJ3BvcnRfbmFtZSc6IGNvbmZpZ1sncG9ydCddLAogICAgICAgICAgICAgICAgICdh cmNoaXRlY3R1cmUnOiBjb25maWcuZ2V0KCdhcmNoaXRlY3R1cmUnLCBOb25lKSwKKyAgICAgICAg ICAgICAgICAnYnVpbGRfc3R5bGUnOiBjb25maWcuZ2V0KCdzdHlsZScsICJyZWxlYXNlIiksCiAg ICAgICAgICAgICAgICAgJ3dhdGNoZXJzJzogY29uZmlnLmdldCgnd2F0Y2hlcnMnLCBbXSksCiAg ICAgICAgICAgICAgICAgJ3J1bl90ZXN0cyc6IGNvbmZpZy5nZXQoJ3J1blRlc3RzJywgY2xzLnJ1 bl90ZXN0cyksCiAgICAgICAgICAgICB9KSkK