237778 2022-03-11 05:46:12 -0800 [Flatpak SDK] API tests scripts have conflicting parameters with the Flatpak scripts 2022-03-14 11:26:42 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alex alex aperez bugs-noreply lmoura pnormand oldest_to_newest 1850460 0 alex 2022-03-11 05:46:12 -0800 run-gtk-tests and run-wpe-tests have arguments that cause conflict with the flatpak sdk, we have to rewrite and consume some of them to avoid problems because we do not know in those cases what the user is requesting, in general until we rewrite this script to a newer version we should always suggest to use the long format of the parameter name. 1850465 1 454475 alex 2022-03-11 05:52:32 -0800 Created attachment 454475 Patch 1850513 2 454475 lmoura 2022-03-11 08:39:10 -0800 Comment on attachment 454475 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454475&action=review > Tools/glib/api_test_runner.py:403 > + for arg in sys.argv: Shouldn't this be `argv` instead of `sys.argv`? (Happens to work in both scripts because we are already passing `sys.argv` as `argv`) 1850684 3 454475 pnormand 2022-03-12 03:35:37 -0800 Comment on attachment 454475 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454475&action=review >> Tools/glib/api_test_runner.py:403 >> + for arg in sys.argv: > > Shouldn't this be `argv` instead of `sys.argv`? (Happens to work in both scripts because we are already passing `sys.argv` as `argv`) Right, good point Lauro! 1850809 4 alex 2022-03-14 02:49:54 -0700 Thanks for the reviews! I'll upload a new patch. 1850835 5 454580 alex 2022-03-14 04:52:35 -0700 Created attachment 454580 Patch 1850954 6 ews-feeder 2022-03-14 11:26:37 -0700 Committed r291240 (248395@main): <https://commits.webkit.org/248395@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454580. 454475 2022-03-11 05:52:32 -0800 2022-03-14 04:52:30 -0700 Patch bug-237778-20220311145231.patch text/plain 4777 alex U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMDMzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjIyY2Q3ZmEwYmUyYjBhNzVmMjA5ODVjZDE4YTZiOWY5 ZjAzNDQyNy4uY2RhNzVlMjlmMTJmZTJhMTdiYjllYThhNTFhZmU0NTljZWQwNWU3YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDIyLTAzLTExICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgor CisgICAgICAgIFtGbGF0cGFjayBTREtdIEFwaSB0ZXN0cyBzY3JpcHRzIGhhdmUgY29uZmxpY3Rp bmcgcGFyYW1ldGVycyB3aXRoIHRoZSBmbGF0cGFrIHNjcmlwdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzc3OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHJ1bi1ndGstdGVzdHMgYW5kIHJ1bi13cGUt dGVzdHMgaGF2ZSBhcmd1bWVudHMgdGhhdCBjYXVzZQorICAgICAgICBjb25mbGljdHMgd2l0aCB0 aGUgZmxhdHBhayBzZGssIHdlIGhhdmUgdG8gcmV3cml0ZSBhbmQgY29uc3VtZQorICAgICAgICBz b21lIG9mIHRoZW0gdG8gYXZvaWQgcHJvYmxlbXMgYmVjYXVzZSB3ZSBkbyBub3Qga25vdyB3aGF0 IHRoZQorICAgICAgICB1c2VyIGlzIHJlcXVlc3RpbmcuIFRoaXMgcGF0Y2ggZ2l2ZXMgcHJpb3Jp dHkgdG8gdGhlIGFwaSB0ZXN0cworICAgICAgICBwYXJhbWV0ZXJzLCB0aGUgZmxhdHBhayBvbmVz IGZvciB0aGUgY29uZmxpY3RpdmUgc2l0dWF0aW9ucyBuZWVkCisgICAgICAgIHRvIGJlIHBhc3Nl ZCB3aXRoIHRoZSBsb25nIGZvcm1hdCwgbmFtZWx5IHJlZ2VuZXJhdGUtdG9vbGNoYWlucworICAg ICAgICBhbmQgc2NjYWNoZS10b2tlbi4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWd0ay10ZXN0 czoKKyAgICAgICAgKiBTY3JpcHRzL3J1bi13cGUtdGVzdHM6CisgICAgICAgICogZ2xpYi9hcGlf dGVzdF9ydW5uZXIucHk6CisgICAgICAgIChhZGRfb3B0aW9ucyk6CisgICAgICAgIChnZXRfcnVu bmVyX2FyZ3MpOgorCiAyMDIyLTAzLTA4ICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5j b20+CiAKICAgICAgICAgSGF2ZSBNZWRpYUZvcm1hdFJlYWRlciBwbHVnaW4gdXNlIFdlYk1QYXJz ZXIgZGlyZWN0bHkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cyBiL1Rv b2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cwppbmRleCA0NjU1NmZiZmU2ZjZhOGQ0Y2U5NjBmY2Nm YWE2ODZjNmU4MmNiNDY3Li45NWY0ZDFiMzFiZWY3Y2RmM2JmNzFlOThiMTczZTM1MmQyYjExMzFm IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKKysrIGIvVG9vbHMvU2Ny aXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC0yOSw3ICsyOSw3IEBAIHN5cy5wYXRoLmluc2VydCgwLCBv cy5wYXRoLmpvaW4odG9wX2xldmVsX2RpcmVjdG9yeSwgIlRvb2xzIiwgImdsaWIiKSkKIGltcG9y dCBjb21tb24KIGltcG9ydCBqaGJ1aWxkdXRpbHMKIGltcG9ydCBmbGF0cGFrdXRpbHMKLWZyb20g YXBpX3Rlc3RfcnVubmVyIGltcG9ydCBUZXN0UnVubmVyLCBhZGRfb3B0aW9ucworZnJvbSBhcGlf dGVzdF9ydW5uZXIgaW1wb3J0IFRlc3RSdW5uZXIsIGFkZF9vcHRpb25zLCBnZXRfcnVubmVyX2Fy Z3MKIAogCiB0cnk6CkBAIC04Nyw3ICs4Nyw4IEBAIGNsYXNzIEd0a1Rlc3RSdW5uZXIoVGVzdFJ1 bm5lcik6CiAgICAgICAgIHJldHVybiBGYWxzZQogCiBpZiBfX25hbWVfXyA9PSAiX19tYWluX18i OgotICAgIGZsYXRwYWt1dGlscy5ydW5faW5fc2FuZGJveF9pZl9hdmFpbGFibGUoc3lzLmFyZ3Yp CisgICAgcnVubmVyX2FyZ3MgPSBnZXRfcnVubmVyX2FyZ3Moc3lzLmFyZ3YpCisgICAgZmxhdHBh a3V0aWxzLnJ1bl9pbl9zYW5kYm94X2lmX2F2YWlsYWJsZShydW5uZXJfYXJncykKICAgICBpZiBu b3QgZmxhdHBha3V0aWxzLmlzX3NhbmRib3hlZCgpIGFuZCBub3QgamhidWlsZHV0aWxzLmVudGVy X2poYnVpbGRfZW52aXJvbm1lbnRfaWZfYXZhaWxhYmxlKCJndGsiKToKICAgICAgICAgcHJpbnQo JyoqKicpCiAgICAgICAgIHByaW50KCcqKiogV2FybmluZzogamhidWlsZCBlbnZpcm9ubWVudCBu b3QgcHJlc2VudCBhbmQgbm90IHJ1bm5pbmcgaW4gZmxhdHBhay4nKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy9ydW4td3BlLXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4td3BlLXRlc3RzCmlu ZGV4IDlmOTkyMGJjODNiNTE5ZTJiOGI0N2IwN2YzMjZkNzMwYjA1MWExNGQuLjMxMWU0NjNkODQ5 YWFhZmNjZjVkNzg1YTQ3M2I2MGY1YmIwYzA4MjYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv cnVuLXdwZS10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL3J1bi13cGUtdGVzdHMKQEAgLTI5LDcg KzI5LDcgQEAgc3lzLnBhdGguaW5zZXJ0KDAsIG9zLnBhdGguam9pbih0b3BfbGV2ZWxfZGlyZWN0 b3J5LCAiVG9vbHMiLCAiZ2xpYiIpKQogaW1wb3J0IGNvbW1vbgogaW1wb3J0IGpoYnVpbGR1dGls cwogaW1wb3J0IGZsYXRwYWt1dGlscwotZnJvbSBhcGlfdGVzdF9ydW5uZXIgaW1wb3J0IFRlc3RS dW5uZXIsIGFkZF9vcHRpb25zCitmcm9tIGFwaV90ZXN0X3J1bm5lciBpbXBvcnQgVGVzdFJ1bm5l ciwgYWRkX29wdGlvbnMsIGdldF9ydW5uZXJfYXJncwogCiBjbGFzcyBXUEVUZXN0UnVubmVyKFRl c3RSdW5uZXIpOgogICAgIFRlc3RSdW5uZXIuVEVTVF9UQVJHRVRTID0gWyAiV1BFIiwgIldQRVF0 IiwgIlRlc3RXZWJLaXQiLCAiVGVzdEpTQyIsICJUZXN0V1RGIiwgIlRlc3RXZWJDb3JlIiBdCkBA IC00Nyw3ICs0Nyw4IEBAIGNsYXNzIFdQRVRlc3RSdW5uZXIoVGVzdFJ1bm5lcik6CiAgICAgICAg IHJldHVybiBvcy5wYXRoLmJhc2VuYW1lKG9zLnBhdGguZGlybmFtZSh0ZXN0X3Byb2dyYW0pKSA9 PSAiV1BFUXQiCiAKIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6Ci0gICAgZmxhdHBha3V0aWxz LnJ1bl9pbl9zYW5kYm94X2lmX2F2YWlsYWJsZShbc3lzLmFyZ3ZbMF0sICItLXdwZSJdICsgc3lz LmFyZ3ZbMTpdKQorICAgIHJ1bm5lcl9hcmdzID0gZ2V0X3J1bm5lcl9hcmdzKHN5cy5hcmd2KQor ICAgIGZsYXRwYWt1dGlscy5ydW5faW5fc2FuZGJveF9pZl9hdmFpbGFibGUoW3J1bm5lcl9hcmdz WzBdLCAiLS13cGUiXSArIHJ1bm5lcl9hcmdzWzE6XSkKICAgICBpZiBub3QgZmxhdHBha3V0aWxz LmlzX3NhbmRib3hlZCgpIGFuZCBub3QgamhidWlsZHV0aWxzLmVudGVyX2poYnVpbGRfZW52aXJv bm1lbnRfaWZfYXZhaWxhYmxlKCJ3cGUiKToKICAgICAgICAgcHJpbnQoJyoqKicpCiAgICAgICAg IHByaW50KCcqKiogV2FybmluZzogamhidWlsZCBlbnZpcm9ubWVudCBub3QgcHJlc2VudCBhbmQg bm90IHJ1bm5pbmcgaW4gZmxhdHBhay4nKQpkaWZmIC0tZ2l0IGEvVG9vbHMvZ2xpYi9hcGlfdGVz dF9ydW5uZXIucHkgYi9Ub29scy9nbGliL2FwaV90ZXN0X3J1bm5lci5weQppbmRleCBlNmM4MGUw MjFiN2FkMTViNGM5NDcxMTM2YjIxZjUzYTA4N2FjZTBjLi5lZTQ3ZTI3MWEwMmYxZjFlMDJmNTJj YmRjM2VmZTRkNjlhZTNkMjU1IDEwMDc1NQotLS0gYS9Ub29scy9nbGliL2FwaV90ZXN0X3J1bm5l ci5weQorKysgYi9Ub29scy9nbGliL2FwaV90ZXN0X3J1bm5lci5weQpAQCAtMzk2LDMgKzM5Niwy NSBAQCBkZWYgYWRkX29wdGlvbnMob3B0aW9uX3BhcnNlcik6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGhlbHA9J1NhdmUgdGVzdCByZXN1bHRzIGFzIEpTT04gdG8gZmlsZScpCiAgICAg b3B0aW9uX3BhcnNlci5hZGRfb3B0aW9uKCctcCcsIGFjdGlvbj0nYXBwZW5kJywgZGVzdD0nc3Vi dGVzdHMnLCBkZWZhdWx0PVtdLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSdT dWJ0ZXN0cyB0byBydW4nKQorCisKK2RlZiBnZXRfcnVubmVyX2FyZ3MoYXJndik6CisgICAgcnVu bmVyX2FyZ3MgPSBbXQorICAgIGZvciBhcmcgaW4gc3lzLmFyZ3Y6CisgICAgICAgIGlmIChhcmcg PT0gIi1kIik6CisgICAgICAgICAgICBydW5uZXJfYXJncy5hcHBlbmQoIi0tZGVidWciKQorICAg ICAgICAgICAgY29udGludWUKKyAgICAgICAgIyBGSVhNRTogVGhpcyBwYXJhbWV0ZXIgLXIgaXMg YW1iaWd1b3VzIGZvciBzb21lIG9yIHRoZQorICAgICAgICAjIHNjcmlwdHMgdXNpbmcgZmxhdHBh aywgd2UgY29uc3VtZSBpdCwgdXNlcnMgbXVzdCB1c2UgdGhlCisgICAgICAgICMgbG9uZyBuYW1l IGZvcm1hdCBmb3IgdGhlIGZsYXRwYWsgb3B0aW9uIC0tcmVnZW5lcmF0ZS10b29sY2hhaW5zLgor ICAgICAgICBpZiAoYXJnID09ICItciIpOgorICAgICAgICAgICAgcnVubmVyX2FyZ3MuYXBwZW5k KCItLXJlbGVhc2UiKQorICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgIyBGSVhNRTogVGhp cyBwYXJhbWV0ZXIgLXQgaXMgYW1iaWd1b3VzIGZvciBzb21lIG9yIHRoZQorICAgICAgICAjIHNj cmlwdHMgdXNpbmcgZmxhdHBhaywgd2UgY29uc3VtZSBpdCwgdXNlcnMgbXVzdCB1c2UgdGhlCisg ICAgICAgICMgbG9uZyBuYW1lIGZvcm1hdCBmb3IgdGhlIGZsYXRwYWsgb3B0aW9uIC0tc2NjYWNo ZS10b2tlbi4KKyAgICAgICAgaWYgKGFyZyA9PSAiLXQiKToKKyAgICAgICAgICAgIHJ1bm5lcl9h cmdzLmFwcGVuZCgiLS10aW1lb3V0IikKKyAgICAgICAgICAgIGNvbnRpbnVlCisgICAgICAgIHJ1 bm5lcl9hcmdzLmFwcGVuZChhcmcpCisgICAgcmV0dXJuIHJ1bm5lcl9hcmdzCg== 454580 2022-03-14 04:52:35 -0700 2022-03-14 11:26:40 -0700 Patch bug-237778-20220314125234.patch text/plain 4773 alex U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMDMzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjIyY2Q3ZmEwYmUyYjBhNzVmMjA5ODVjZDE4YTZiOWY5 ZjAzNDQyNy4uY2RhNzVlMjlmMTJmZTJhMTdiYjllYThhNTFhZmU0NTljZWQwNWU3YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDIyLTAzLTExICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgor CisgICAgICAgIFtGbGF0cGFjayBTREtdIEFwaSB0ZXN0cyBzY3JpcHRzIGhhdmUgY29uZmxpY3Rp bmcgcGFyYW1ldGVycyB3aXRoIHRoZSBmbGF0cGFrIHNjcmlwdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzc3OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHJ1bi1ndGstdGVzdHMgYW5kIHJ1bi13cGUt dGVzdHMgaGF2ZSBhcmd1bWVudHMgdGhhdCBjYXVzZQorICAgICAgICBjb25mbGljdHMgd2l0aCB0 aGUgZmxhdHBhayBzZGssIHdlIGhhdmUgdG8gcmV3cml0ZSBhbmQgY29uc3VtZQorICAgICAgICBz b21lIG9mIHRoZW0gdG8gYXZvaWQgcHJvYmxlbXMgYmVjYXVzZSB3ZSBkbyBub3Qga25vdyB3aGF0 IHRoZQorICAgICAgICB1c2VyIGlzIHJlcXVlc3RpbmcuIFRoaXMgcGF0Y2ggZ2l2ZXMgcHJpb3Jp dHkgdG8gdGhlIGFwaSB0ZXN0cworICAgICAgICBwYXJhbWV0ZXJzLCB0aGUgZmxhdHBhayBvbmVz IGZvciB0aGUgY29uZmxpY3RpdmUgc2l0dWF0aW9ucyBuZWVkCisgICAgICAgIHRvIGJlIHBhc3Nl ZCB3aXRoIHRoZSBsb25nIGZvcm1hdCwgbmFtZWx5IHJlZ2VuZXJhdGUtdG9vbGNoYWlucworICAg ICAgICBhbmQgc2NjYWNoZS10b2tlbi4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWd0ay10ZXN0 czoKKyAgICAgICAgKiBTY3JpcHRzL3J1bi13cGUtdGVzdHM6CisgICAgICAgICogZ2xpYi9hcGlf dGVzdF9ydW5uZXIucHk6CisgICAgICAgIChhZGRfb3B0aW9ucyk6CisgICAgICAgIChnZXRfcnVu bmVyX2FyZ3MpOgorCiAyMDIyLTAzLTA4ICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5j b20+CiAKICAgICAgICAgSGF2ZSBNZWRpYUZvcm1hdFJlYWRlciBwbHVnaW4gdXNlIFdlYk1QYXJz ZXIgZGlyZWN0bHkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cyBiL1Rv b2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cwppbmRleCA0NjU1NmZiZmU2ZjZhOGQ0Y2U5NjBmY2Nm YWE2ODZjNmU4MmNiNDY3Li45NWY0ZDFiMzFiZWY3Y2RmM2JmNzFlOThiMTczZTM1MmQyYjExMzFm IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKKysrIGIvVG9vbHMvU2Ny aXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC0yOSw3ICsyOSw3IEBAIHN5cy5wYXRoLmluc2VydCgwLCBv cy5wYXRoLmpvaW4odG9wX2xldmVsX2RpcmVjdG9yeSwgIlRvb2xzIiwgImdsaWIiKSkKIGltcG9y dCBjb21tb24KIGltcG9ydCBqaGJ1aWxkdXRpbHMKIGltcG9ydCBmbGF0cGFrdXRpbHMKLWZyb20g YXBpX3Rlc3RfcnVubmVyIGltcG9ydCBUZXN0UnVubmVyLCBhZGRfb3B0aW9ucworZnJvbSBhcGlf dGVzdF9ydW5uZXIgaW1wb3J0IFRlc3RSdW5uZXIsIGFkZF9vcHRpb25zLCBnZXRfcnVubmVyX2Fy Z3MKIAogCiB0cnk6CkBAIC04Nyw3ICs4Nyw4IEBAIGNsYXNzIEd0a1Rlc3RSdW5uZXIoVGVzdFJ1 bm5lcik6CiAgICAgICAgIHJldHVybiBGYWxzZQogCiBpZiBfX25hbWVfXyA9PSAiX19tYWluX18i OgotICAgIGZsYXRwYWt1dGlscy5ydW5faW5fc2FuZGJveF9pZl9hdmFpbGFibGUoc3lzLmFyZ3Yp CisgICAgcnVubmVyX2FyZ3MgPSBnZXRfcnVubmVyX2FyZ3Moc3lzLmFyZ3YpCisgICAgZmxhdHBh a3V0aWxzLnJ1bl9pbl9zYW5kYm94X2lmX2F2YWlsYWJsZShydW5uZXJfYXJncykKICAgICBpZiBu b3QgZmxhdHBha3V0aWxzLmlzX3NhbmRib3hlZCgpIGFuZCBub3QgamhidWlsZHV0aWxzLmVudGVy X2poYnVpbGRfZW52aXJvbm1lbnRfaWZfYXZhaWxhYmxlKCJndGsiKToKICAgICAgICAgcHJpbnQo JyoqKicpCiAgICAgICAgIHByaW50KCcqKiogV2FybmluZzogamhidWlsZCBlbnZpcm9ubWVudCBu b3QgcHJlc2VudCBhbmQgbm90IHJ1bm5pbmcgaW4gZmxhdHBhay4nKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy9ydW4td3BlLXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4td3BlLXRlc3RzCmlu ZGV4IDlmOTkyMGJjODNiNTE5ZTJiOGI0N2IwN2YzMjZkNzMwYjA1MWExNGQuLjMxMWU0NjNkODQ5 YWFhZmNjZjVkNzg1YTQ3M2I2MGY1YmIwYzA4MjYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv cnVuLXdwZS10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL3J1bi13cGUtdGVzdHMKQEAgLTI5LDcg KzI5LDcgQEAgc3lzLnBhdGguaW5zZXJ0KDAsIG9zLnBhdGguam9pbih0b3BfbGV2ZWxfZGlyZWN0 b3J5LCAiVG9vbHMiLCAiZ2xpYiIpKQogaW1wb3J0IGNvbW1vbgogaW1wb3J0IGpoYnVpbGR1dGls cwogaW1wb3J0IGZsYXRwYWt1dGlscwotZnJvbSBhcGlfdGVzdF9ydW5uZXIgaW1wb3J0IFRlc3RS dW5uZXIsIGFkZF9vcHRpb25zCitmcm9tIGFwaV90ZXN0X3J1bm5lciBpbXBvcnQgVGVzdFJ1bm5l ciwgYWRkX29wdGlvbnMsIGdldF9ydW5uZXJfYXJncwogCiBjbGFzcyBXUEVUZXN0UnVubmVyKFRl c3RSdW5uZXIpOgogICAgIFRlc3RSdW5uZXIuVEVTVF9UQVJHRVRTID0gWyAiV1BFIiwgIldQRVF0 IiwgIlRlc3RXZWJLaXQiLCAiVGVzdEpTQyIsICJUZXN0V1RGIiwgIlRlc3RXZWJDb3JlIiBdCkBA IC00Nyw3ICs0Nyw4IEBAIGNsYXNzIFdQRVRlc3RSdW5uZXIoVGVzdFJ1bm5lcik6CiAgICAgICAg IHJldHVybiBvcy5wYXRoLmJhc2VuYW1lKG9zLnBhdGguZGlybmFtZSh0ZXN0X3Byb2dyYW0pKSA9 PSAiV1BFUXQiCiAKIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6Ci0gICAgZmxhdHBha3V0aWxz LnJ1bl9pbl9zYW5kYm94X2lmX2F2YWlsYWJsZShbc3lzLmFyZ3ZbMF0sICItLXdwZSJdICsgc3lz LmFyZ3ZbMTpdKQorICAgIHJ1bm5lcl9hcmdzID0gZ2V0X3J1bm5lcl9hcmdzKHN5cy5hcmd2KQor ICAgIGZsYXRwYWt1dGlscy5ydW5faW5fc2FuZGJveF9pZl9hdmFpbGFibGUoW3J1bm5lcl9hcmdz WzBdLCAiLS13cGUiXSArIHJ1bm5lcl9hcmdzWzE6XSkKICAgICBpZiBub3QgZmxhdHBha3V0aWxz LmlzX3NhbmRib3hlZCgpIGFuZCBub3QgamhidWlsZHV0aWxzLmVudGVyX2poYnVpbGRfZW52aXJv bm1lbnRfaWZfYXZhaWxhYmxlKCJ3cGUiKToKICAgICAgICAgcHJpbnQoJyoqKicpCiAgICAgICAg IHByaW50KCcqKiogV2FybmluZzogamhidWlsZCBlbnZpcm9ubWVudCBub3QgcHJlc2VudCBhbmQg bm90IHJ1bm5pbmcgaW4gZmxhdHBhay4nKQpkaWZmIC0tZ2l0IGEvVG9vbHMvZ2xpYi9hcGlfdGVz dF9ydW5uZXIucHkgYi9Ub29scy9nbGliL2FwaV90ZXN0X3J1bm5lci5weQppbmRleCBlNmM4MGUw MjFiN2FkMTViNGM5NDcxMTM2YjIxZjUzYTA4N2FjZTBjLi5mZTg4NWE3ZjYzNDhlMjQ2NzQwMjRk NzI4MjM2NWJlZTMwNTQ1Njc1IDEwMDc1NQotLS0gYS9Ub29scy9nbGliL2FwaV90ZXN0X3J1bm5l ci5weQorKysgYi9Ub29scy9nbGliL2FwaV90ZXN0X3J1bm5lci5weQpAQCAtMzk2LDMgKzM5Niwy NSBAQCBkZWYgYWRkX29wdGlvbnMob3B0aW9uX3BhcnNlcik6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGhlbHA9J1NhdmUgdGVzdCByZXN1bHRzIGFzIEpTT04gdG8gZmlsZScpCiAgICAg b3B0aW9uX3BhcnNlci5hZGRfb3B0aW9uKCctcCcsIGFjdGlvbj0nYXBwZW5kJywgZGVzdD0nc3Vi dGVzdHMnLCBkZWZhdWx0PVtdLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSdT dWJ0ZXN0cyB0byBydW4nKQorCisKK2RlZiBnZXRfcnVubmVyX2FyZ3MoYXJndik6CisgICAgcnVu bmVyX2FyZ3MgPSBbXQorICAgIGZvciBhcmcgaW4gYXJndjoKKyAgICAgICAgaWYgKGFyZyA9PSAi LWQiKToKKyAgICAgICAgICAgIHJ1bm5lcl9hcmdzLmFwcGVuZCgiLS1kZWJ1ZyIpCisgICAgICAg ICAgICBjb250aW51ZQorICAgICAgICAjIEZJWE1FOiBUaGlzIHBhcmFtZXRlciAtciBpcyBhbWJp Z3VvdXMgZm9yIHNvbWUgb3IgdGhlCisgICAgICAgICMgc2NyaXB0cyB1c2luZyBmbGF0cGFrLCB3 ZSBjb25zdW1lIGl0LCB1c2VycyBtdXN0IHVzZSB0aGUKKyAgICAgICAgIyBsb25nIG5hbWUgZm9y bWF0IGZvciB0aGUgZmxhdHBhayBvcHRpb24gLS1yZWdlbmVyYXRlLXRvb2xjaGFpbnMuCisgICAg ICAgIGlmIChhcmcgPT0gIi1yIik6CisgICAgICAgICAgICBydW5uZXJfYXJncy5hcHBlbmQoIi0t cmVsZWFzZSIpCisgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAjIEZJWE1FOiBUaGlzIHBh cmFtZXRlciAtdCBpcyBhbWJpZ3VvdXMgZm9yIHNvbWUgb3IgdGhlCisgICAgICAgICMgc2NyaXB0 cyB1c2luZyBmbGF0cGFrLCB3ZSBjb25zdW1lIGl0LCB1c2VycyBtdXN0IHVzZSB0aGUKKyAgICAg ICAgIyBsb25nIG5hbWUgZm9ybWF0IGZvciB0aGUgZmxhdHBhayBvcHRpb24gLS1zY2NhY2hlLXRv a2VuLgorICAgICAgICBpZiAoYXJnID09ICItdCIpOgorICAgICAgICAgICAgcnVubmVyX2FyZ3Mu YXBwZW5kKCItLXRpbWVvdXQiKQorICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgcnVubmVy X2FyZ3MuYXBwZW5kKGFyZykKKyAgICByZXR1cm4gcnVubmVyX2FyZ3MK