198662 2019-06-07 09:23:09 -0700 webkitpy: Support reporting results for uncommon test configurations 2019-06-07 15:50:18 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain commit-queue ews-watchlist glenn webkit-bug-importer oldest_to_newest 1542838 0 jbedard 2019-06-07 09:23:09 -0700 It's possible to run layout tests is a variety of exotic ways. Rather than try and categorize each method as a separate style (as we have done for GuardMalloc and ASan), we should just allow buildbot to specifically override the default 'flavor' of a test result, since the 'flavor' option was designed for exactly such exotic configurations. 1542839 1 webkit-bug-importer 2019-06-07 09:24:31 -0700 <rdar://problem/51524128> 1542862 2 371593 jbedard 2019-06-07 10:30:16 -0700 Created attachment 371593 Patch 1542928 3 371607 jbedard 2019-06-07 13:43:22 -0700 Created attachment 371607 Patch 1542946 4 371607 aakash_jain 2019-06-07 14:28:23 -0700 Comment on attachment 371607 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371607&action=review > Tools/ChangeLog:3 > + webkitpy: Support reporting results for exotic test configurations exotic or uncommon/rare? > Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:271 > + if not configuration.get('flavor', None): # The --result-report-flavor argument should override wk1/wk2 flavor or result-report-flavor? does this file already have concept of flavour? What does that do? > Tools/Scripts/webkitpy/test/main.py:281 > + print json.dumps(upload.configuration) Is this for debugging or for production? 1542948 5 371607 jbedard 2019-06-07 14:37:52 -0700 Comment on attachment 371607 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371607&action=review >> Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:271 >> + if not configuration.get('flavor', None): # The --result-report-flavor argument should override wk1/wk2 > > flavor or result-report-flavor? > > does this file already have concept of flavour? What does that do? Here, flavor is correct because we're updating the upload configuration dictionary. Layout tests already use this key to differentiate wk1 and wk2. More generally, the 'flavor' option is used as a wild-card key to distinguish testing configurations that don't fit into other more structured configuration options (like platform, style, model, ect.) 1542949 6 371611 jbedard 2019-06-07 14:41:01 -0700 Created attachment 371611 Patch 1542983 7 371611 commit-queue 2019-06-07 15:50:16 -0700 Comment on attachment 371611 Patch Clearing flags on attachment: 371611 Committed r246221: <https://trac.webkit.org/changeset/246221> 1542984 8 commit-queue 2019-06-07 15:50:18 -0700 All reviewed patches have been landed. Closing bug. 371593 2019-06-07 10:30:16 -0700 2019-06-07 13:43:20 -0700 Patch bug-198662-20190607103016.patch text/plain 3962 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NjIwNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTA2LTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogU3VwcG9ydCByZXBvcnRpbmcgcmVzdWx0cyBmb3IgZXhv dGljIHRlc3QgY29uZmlndXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5ODY2MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTE1MjQxMjg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5OgorICAgICAg ICAoTWFuYWdlci5ydW4pOiBPdmVycmlkZSB3azEgYW5kIHdrMiBmbGF2b3JzIHdpdGggc3BlY2lm aWVkIGZsYXZvci4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAg ICAgICAgKFBvcnQuY29uZmlndXJhdGlvbl9mb3JfdXBsb2FkKTogU2V0IGZsYXZvciBiYXNlZCBv biBvcHRpb25zLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy9vcHRpb25zLnB5 OgorICAgICAgICAodXBsb2FkX29wdGlvbnMpOiBBZGQgZmxhdm9yIG9wdGlvbi4KKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3Rlc3QvbWFpbi5weToKKyAgICAgICAgKFRlc3Rlci5fcnVuX3Rl c3RzKTogU2V0IGZsYXZvciBiYXNlZCBvbiBvcHRpb25zLgorCiAyMDE5LTA2LTA3ICBXZW5zb24g SHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEF0IGxlYXN0 IDYgQVBJIHRlc3RzIGFyZSBmYWlsaW5nIGR1ZSB0byBhbiBleGNlcHRpb24gd2hlbiB3cml0aW5n IE5TQXR0cmlidXRlZFN0cmluZyB0byB0aGUgcGFzdGVib2FyZApJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5h Z2VyLnB5CShyZXZpc2lvbiAyNDYyMDIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNjgsNyAr MjY4LDggQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAgICAgIHJldHVybiB0 ZXN0X3J1bl9yZXN1bHRzLlJ1bkRldGFpbHMoZXhpdF9jb2RlPS0xKQogCiAgICAgICAgICAgICBj b25maWd1cmF0aW9uID0gc2VsZi5fcG9ydC5jb25maWd1cmF0aW9uX2Zvcl91cGxvYWQoc2VsZi5f cG9ydC50YXJnZXRfaG9zdCgwKSkKLSAgICAgICAgICAgIGNvbmZpZ3VyYXRpb25bJ2ZsYXZvcidd ID0gJ3drMicgaWYgc2VsZi5fb3B0aW9ucy53ZWJraXRfdGVzdF9ydW5uZXIgZWxzZSAnd2sxJwor ICAgICAgICAgICAgaWYgbm90IGNvbmZpZ3VyYXRpb24uZ2V0KCdmbGF2b3InLCBOb25lKTogICMg VGhlIC0tZmxhdm9yIGFyZ3VtZW50IHNob3VsZCBvdmVycmlkZSB3azEvd2syCisgICAgICAgICAg ICAgICAgY29uZmlndXJhdGlvblsnZmxhdm9yJ10gPSAnd2syJyBpZiBzZWxmLl9vcHRpb25zLndl YmtpdF90ZXN0X3J1bm5lciBlbHNlICd3azEnCiAgICAgICAgICAgICB0ZW1wX2luaXRpYWxfcmVz dWx0cywgdGVtcF9yZXRyeV9yZXN1bHRzLCB0ZW1wX2VuYWJsZWRfcGl4ZWxfdGVzdHNfaW5fcmV0 cnkgPSBzZWxmLl9ydW5fdGVzdF9zdWJzZXQodGVzdHNfdG9fcnVuX2J5X2RldmljZVtkZXZpY2Vf dHlwZV0sIHRlc3RzX3RvX3NraXAsIGRldmljZV90eXBlPWRldmljZV90eXBlKQogCiAgICAgICAg ICAgICBpZiBzZWxmLl9vcHRpb25zLnJlcG9ydF91cmxzOgpJbmRleDogVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L2Jhc2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2Jhc2UucHkJKHJldmlzaW9uIDI0NjIwMikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9iYXNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNTk3LDYgKzE1OTcsNyBAQCBjbGFz cyBQb3J0KG9iamVjdCk6CiAgICAgICAgICAgICBhcmNoaXRlY3R1cmU9Y29uZmlndXJhdGlvbi5h cmNoaXRlY3R1cmUsCiAgICAgICAgICAgICBzdHlsZT1zdHlsZSwKICAgICAgICAgICAgIHNkaz1o b3N0LnBsYXRmb3JtLmJ1aWxkX3ZlcnNpb24oKSwKKyAgICAgICAgICAgIGZsYXZvcj1zZWxmLmdl dF9vcHRpb24oJ2ZsYXZvcicpLAogICAgICAgICApCiAKICAgICBAbWVtb2l6ZWQKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy9vcHRpb25zLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy9vcHRpb25zLnB5CShyZXZpc2lvbiAyNDYyMDIp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvb3B0aW9ucy5weQkod29ya2luZyBj b3B5KQpAQCAtMzAsNCArMzAsNSBAQCBkZWYgdXBsb2FkX29wdGlvbnMoKToKICAgICAgICAgb3B0 cGFyc2UubWFrZV9vcHRpb24oJy0tYnVpbGRlci1uYW1lJywgaGVscD0nVGhlIG5hbWUgb2YgdGhl IGJ1aWxkYm90IGJ1aWxkZXIgdGVzdHMgd2VyZSBydW4gb24uJyksCiAgICAgICAgIG9wdHBhcnNl Lm1ha2Vfb3B0aW9uKCctLWJ1aWxkLW51bWJlcicsIGhlbHA9J1RoZSBidWlsZGJvdCBidWlsZCBu dW1iZXIgdGVzdHMgYXJlIGFzc29jaWF0ZWQgd2l0aC4nKSwKICAgICAgICAgb3B0cGFyc2UubWFr ZV9vcHRpb24oJy0tYnVpbGRib3Qtd29ya2VyJywgaGVscD0nVGhlIGJ1aWxkYm90IHdvcmtlciB0 ZXN0cyB3ZXJlIHJ1biBvbi4nKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tZmxh dm9yJywgaGVscD0nT3B0aW9uYWwgZmxhZyBmb3IgY2F0ZWdvcml6aW5nIHRlc3QgcnVucyB3aGlj aCBkbyBub3QgZml0IGludG8gb3RoZXIgY29uZmlndXJhdGlvbiBvcHRpb25zLicpLAogICAgIF0K SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5CShyZXZpc2lvbiAyNDYyMDIpCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvbWFpbi5weQkod29ya2luZyBjb3B5KQpAQCAt MjYzLDYgKzI2Myw3IEBAIGNsYXNzIFRlc3RlcihvYmplY3QpOgogICAgICAgICAgICAgICAgICAg ICB2ZXJzaW9uX25hbWU9X2hvc3QucGxhdGZvcm0ub3NfdmVyc2lvbl9uYW1lKCksCiAgICAgICAg ICAgICAgICAgICAgIHN0eWxlPSdhc2FuJyBpZiBjb25maWcuYXNhbiBlbHNlIGNvbmZpZ3VyYXRp b25fdG9fdXNlLAogICAgICAgICAgICAgICAgICAgICBzZGs9X2hvc3QucGxhdGZvcm0uYnVpbGRf dmVyc2lvbigpLAorICAgICAgICAgICAgICAgICAgICBmbGF2b3I9c2VsZi5fb3B0aW9ucy5mbGF2 b3IsCiAgICAgICAgICAgICAgICAgKSwKICAgICAgICAgICAgICAgICBkZXRhaWxzPVVwbG9hZC5j cmVhdGVfZGV0YWlscyhvcHRpb25zPXNlbGYuX29wdGlvbnMpLAogICAgICAgICAgICAgICAgIGNv bW1pdHM9W1VwbG9hZC5jcmVhdGVfY29tbWl0KAo= 371607 2019-06-07 13:43:22 -0700 2019-06-07 14:40:59 -0700 Patch bug-198662-20190607134321.patch text/plain 4463 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NjIwNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTA2LTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogU3VwcG9ydCByZXBvcnRpbmcgcmVzdWx0cyBmb3IgZXhv dGljIHRlc3QgY29uZmlndXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5ODY2MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTE1MjQxMjg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5OgorICAgICAg ICAoTWFuYWdlci5ydW4pOiBPdmVycmlkZSB3azEgYW5kIHdrMiBmbGF2b3JzIHdpdGggc3BlY2lm aWVkIGZsYXZvci4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAg ICAgICAgKFBvcnQuY29uZmlndXJhdGlvbl9mb3JfdXBsb2FkKTogU2V0IGZsYXZvciBiYXNlZCBv biBvcHRpb25zLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy9vcHRpb25zLnB5 OgorICAgICAgICAodXBsb2FkX29wdGlvbnMpOiBBZGQgcmVzdWx0LXJlcG9ydC1mbGF2b3Igb3B0 aW9uLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5OgorICAgICAgICAo VGVzdGVyLl9ydW5fdGVzdHMpOiBTZXQgZmxhdm9yIGJhc2VkIG9uIG9wdGlvbnMuCisKIDIwMTkt MDYtMDcgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAg W2lPU10gQXQgbGVhc3QgNiBBUEkgdGVzdHMgYXJlIGZhaWxpbmcgZHVlIHRvIGFuIGV4Y2VwdGlv biB3aGVuIHdyaXRpbmcgTlNBdHRyaWJ1dGVkU3RyaW5nIHRvIHRoZSBwYXN0ZWJvYXJkCkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2Vy LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2Nv bnRyb2xsZXJzL21hbmFnZXIucHkJKHJldmlzaW9uIDI0NjIwMikKKysrIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkJKHdvcmtpbmcgY29w eSkKQEAgLTI2OCw3ICsyNjgsOCBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAg ICAgICAgcmV0dXJuIHRlc3RfcnVuX3Jlc3VsdHMuUnVuRGV0YWlscyhleGl0X2NvZGU9LTEpCiAK ICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb24gPSBzZWxmLl9wb3J0LmNvbmZpZ3VyYXRpb25fZm9y X3VwbG9hZChzZWxmLl9wb3J0LnRhcmdldF9ob3N0KDApKQotICAgICAgICAgICAgY29uZmlndXJh dGlvblsnZmxhdm9yJ10gPSAnd2syJyBpZiBzZWxmLl9vcHRpb25zLndlYmtpdF90ZXN0X3J1bm5l ciBlbHNlICd3azEnCisgICAgICAgICAgICBpZiBub3QgY29uZmlndXJhdGlvbi5nZXQoJ2ZsYXZv cicsIE5vbmUpOiAgIyBUaGUgLS1yZXN1bHQtcmVwb3J0LWZsYXZvciBhcmd1bWVudCBzaG91bGQg b3ZlcnJpZGUgd2sxL3drMgorICAgICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb25bJ2ZsYXZvcidd ID0gJ3drMicgaWYgc2VsZi5fb3B0aW9ucy53ZWJraXRfdGVzdF9ydW5uZXIgZWxzZSAnd2sxJwog ICAgICAgICAgICAgdGVtcF9pbml0aWFsX3Jlc3VsdHMsIHRlbXBfcmV0cnlfcmVzdWx0cywgdGVt cF9lbmFibGVkX3BpeGVsX3Rlc3RzX2luX3JldHJ5ID0gc2VsZi5fcnVuX3Rlc3Rfc3Vic2V0KHRl c3RzX3RvX3J1bl9ieV9kZXZpY2VbZGV2aWNlX3R5cGVdLCB0ZXN0c190b19za2lwLCBkZXZpY2Vf dHlwZT1kZXZpY2VfdHlwZSkKIAogICAgICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5yZXBvcnRf dXJsczoKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CShyZXZpc2lvbiAyNDYy MDIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkod29ya2luZyBjb3B5 KQpAQCAtMTU5Nyw2ICsxNTk3LDcgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAgICAg YXJjaGl0ZWN0dXJlPWNvbmZpZ3VyYXRpb24uYXJjaGl0ZWN0dXJlLAogICAgICAgICAgICAgc3R5 bGU9c3R5bGUsCiAgICAgICAgICAgICBzZGs9aG9zdC5wbGF0Zm9ybS5idWlsZF92ZXJzaW9uKCks CisgICAgICAgICAgICBmbGF2b3I9c2VsZi5nZXRfb3B0aW9uKCdyZXN1bHRfcmVwb3J0X2ZsYXZv cicpLAogICAgICAgICApCiAKICAgICBAbWVtb2l6ZWQKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcmVzdWx0cy9vcHRpb25zLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcmVzdWx0cy9vcHRpb25zLnB5CShyZXZpc2lvbiAyNDYyMDIpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Jlc3VsdHMvb3B0aW9ucy5weQkod29ya2luZyBjb3B5KQpAQCAtMzAsNCAr MzAsNSBAQCBkZWYgdXBsb2FkX29wdGlvbnMoKToKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRp b24oJy0tYnVpbGRlci1uYW1lJywgaGVscD0nVGhlIG5hbWUgb2YgdGhlIGJ1aWxkYm90IGJ1aWxk ZXIgdGVzdHMgd2VyZSBydW4gb24uJyksCiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCct LWJ1aWxkLW51bWJlcicsIGhlbHA9J1RoZSBidWlsZGJvdCBidWlsZCBudW1iZXIgdGVzdHMgYXJl IGFzc29jaWF0ZWQgd2l0aC4nKSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tYnVp bGRib3Qtd29ya2VyJywgaGVscD0nVGhlIGJ1aWxkYm90IHdvcmtlciB0ZXN0cyB3ZXJlIHJ1biBv bi4nKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tcmVzdWx0LXJlcG9ydC1mbGF2 b3InLCBoZWxwPSdPcHRpb25hbCBmbGFnIGZvciBjYXRlZ29yaXppbmcgdGVzdCBydW5zIHdoaWNo IGRvIG5vdCBmaXQgaW50byBvdGhlciBjb25maWd1cmF0aW9uIG9wdGlvbnMuJyksCiAgICAgXQpJ bmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkJKHJldmlzaW9uIDI0NjIwMikKKysr IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0y NjMsNiArMjYzLDcgQEAgY2xhc3MgVGVzdGVyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAg IHZlcnNpb25fbmFtZT1faG9zdC5wbGF0Zm9ybS5vc192ZXJzaW9uX25hbWUoKSwKICAgICAgICAg ICAgICAgICAgICAgc3R5bGU9J2FzYW4nIGlmIGNvbmZpZy5hc2FuIGVsc2UgY29uZmlndXJhdGlv bl90b191c2UsCiAgICAgICAgICAgICAgICAgICAgIHNkaz1faG9zdC5wbGF0Zm9ybS5idWlsZF92 ZXJzaW9uKCksCisgICAgICAgICAgICAgICAgICAgIGZsYXZvcj1zZWxmLl9vcHRpb25zLnJlc3Vs dF9yZXBvcnRfZmxhdm9yLAogICAgICAgICAgICAgICAgICksCiAgICAgICAgICAgICAgICAgZGV0 YWlscz1VcGxvYWQuY3JlYXRlX2RldGFpbHMob3B0aW9ucz1zZWxmLl9vcHRpb25zKSwKICAgICAg ICAgICAgICAgICBjb21taXRzPVtVcGxvYWQuY3JlYXRlX2NvbW1pdCgKQEAgLTI3Nyw2ICsyNzgs NyBAQCBjbGFzcyBUZXN0ZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICApLAogICAgICAgICAg ICAgICAgIHJlc3VsdHM9cmVzdWx0cywKICAgICAgICAgICAgICkKKyAgICAgICAgICAgIHByaW50 IGpzb24uZHVtcHModXBsb2FkLmNvbmZpZ3VyYXRpb24pCiAgICAgICAgICAgICBmb3IgdXJsIGlu IHNlbGYuX29wdGlvbnMucmVwb3J0X3VybHM6CiAgICAgICAgICAgICAgICAgc2VsZi5wcmludGVy LndyaXRlX3VwZGF0ZSgnVXBsb2FkaW5nIHRvIHt9IC4uLicuZm9ybWF0KHVybCkpCiAgICAgICAg ICAgICAgICAgZmFpbGVkX3VwbG9hZHMgPSBmYWlsZWRfdXBsb2FkcyBpZiB1cGxvYWQudXBsb2Fk KHVybCwgbG9nX2xpbmVfZnVuYz1zZWxmLnByaW50ZXIubWV0ZXIud3JpdGVsbikgZWxzZSAoZmFp bGVkX3VwbG9hZHMgKyAxKQo= 371611 2019-06-07 14:41:01 -0700 2019-06-07 15:50:16 -0700 Patch bug-198662-20190607144100.patch text/plain 4034 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NjIwNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTA2LTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogU3VwcG9ydCByZXBvcnRpbmcgcmVzdWx0cyBmb3IgdW5j b21tb24gdGVzdCBjb25maWd1cmF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk4NjYyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MTUyNDEy OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHk6CisgICAg ICAgIChNYW5hZ2VyLnJ1bik6IE92ZXJyaWRlIHdrMSBhbmQgd2syIGZsYXZvcnMgd2l0aCBzcGVj aWZpZWQgZmxhdm9yLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5Ogor ICAgICAgICAoUG9ydC5jb25maWd1cmF0aW9uX2Zvcl91cGxvYWQpOiBTZXQgZmxhdm9yIGJhc2Vk IG9uIG9wdGlvbnMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL29wdGlvbnMu cHk6CisgICAgICAgICh1cGxvYWRfb3B0aW9ucyk6IEFkZCByZXN1bHQtcmVwb3J0LWZsYXZvciBv cHRpb24uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHk6CisgICAgICAg IChUZXN0ZXIuX3J1bl90ZXN0cyk6IFNldCBmbGF2b3IgYmFzZWQgb24gb3B0aW9ucy4KKwogMjAx OS0wNi0wNyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAg ICBbaU9TXSBBdCBsZWFzdCA2IEFQSSB0ZXN0cyBhcmUgZmFpbGluZyBkdWUgdG8gYW4gZXhjZXB0 aW9uIHdoZW4gd3JpdGluZyBOU0F0dHJpYnV0ZWRTdHJpbmcgdG8gdGhlIHBhc3RlYm9hcmQKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFn ZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv Y29udHJvbGxlcnMvbWFuYWdlci5weQkocmV2aXNpb24gMjQ2MjAyKQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQkod29ya2luZyBj b3B5KQpAQCAtMjY4LDcgKzI2OCw4IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAg ICAgICAgICByZXR1cm4gdGVzdF9ydW5fcmVzdWx0cy5SdW5EZXRhaWxzKGV4aXRfY29kZT0tMSkK IAogICAgICAgICAgICAgY29uZmlndXJhdGlvbiA9IHNlbGYuX3BvcnQuY29uZmlndXJhdGlvbl9m b3JfdXBsb2FkKHNlbGYuX3BvcnQudGFyZ2V0X2hvc3QoMCkpCi0gICAgICAgICAgICBjb25maWd1 cmF0aW9uWydmbGF2b3InXSA9ICd3azInIGlmIHNlbGYuX29wdGlvbnMud2Via2l0X3Rlc3RfcnVu bmVyIGVsc2UgJ3drMScKKyAgICAgICAgICAgIGlmIG5vdCBjb25maWd1cmF0aW9uLmdldCgnZmxh dm9yJywgTm9uZSk6ICAjIFRoZSAtLXJlc3VsdC1yZXBvcnQtZmxhdm9yIGFyZ3VtZW50IHNob3Vs ZCBvdmVycmlkZSB3azEvd2syCisgICAgICAgICAgICAgICAgY29uZmlndXJhdGlvblsnZmxhdm9y J10gPSAnd2syJyBpZiBzZWxmLl9vcHRpb25zLndlYmtpdF90ZXN0X3J1bm5lciBlbHNlICd3azEn CiAgICAgICAgICAgICB0ZW1wX2luaXRpYWxfcmVzdWx0cywgdGVtcF9yZXRyeV9yZXN1bHRzLCB0 ZW1wX2VuYWJsZWRfcGl4ZWxfdGVzdHNfaW5fcmV0cnkgPSBzZWxmLl9ydW5fdGVzdF9zdWJzZXQo dGVzdHNfdG9fcnVuX2J5X2RldmljZVtkZXZpY2VfdHlwZV0sIHRlc3RzX3RvX3NraXAsIGRldmlj ZV90eXBlPWRldmljZV90eXBlKQogCiAgICAgICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnJlcG9y dF91cmxzOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHJldmlzaW9uIDI0 NjIwMikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CSh3b3JraW5nIGNv cHkpCkBAIC0xNTk3LDYgKzE1OTcsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgICAg ICBhcmNoaXRlY3R1cmU9Y29uZmlndXJhdGlvbi5hcmNoaXRlY3R1cmUsCiAgICAgICAgICAgICBz dHlsZT1zdHlsZSwKICAgICAgICAgICAgIHNkaz1ob3N0LnBsYXRmb3JtLmJ1aWxkX3ZlcnNpb24o KSwKKyAgICAgICAgICAgIGZsYXZvcj1zZWxmLmdldF9vcHRpb24oJ3Jlc3VsdF9yZXBvcnRfZmxh dm9yJyksCiAgICAgICAgICkKIAogICAgIEBtZW1vaXplZApJbmRleDogVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9yZXN1bHRzL29wdGlvbnMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9yZXN1bHRzL29wdGlvbnMucHkJKHJldmlzaW9uIDI0NjIwMikKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcmVzdWx0cy9vcHRpb25zLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMCw0 ICszMCw1IEBAIGRlZiB1cGxvYWRfb3B0aW9ucygpOgogICAgICAgICBvcHRwYXJzZS5tYWtlX29w dGlvbignLS1idWlsZGVyLW5hbWUnLCBoZWxwPSdUaGUgbmFtZSBvZiB0aGUgYnVpbGRib3QgYnVp bGRlciB0ZXN0cyB3ZXJlIHJ1biBvbi4nKSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24o Jy0tYnVpbGQtbnVtYmVyJywgaGVscD0nVGhlIGJ1aWxkYm90IGJ1aWxkIG51bWJlciB0ZXN0cyBh cmUgYXNzb2NpYXRlZCB3aXRoLicpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbignLS1i dWlsZGJvdC13b3JrZXInLCBoZWxwPSdUaGUgYnVpbGRib3Qgd29ya2VyIHRlc3RzIHdlcmUgcnVu IG9uLicpLAorICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbignLS1yZXN1bHQtcmVwb3J0LWZs YXZvcicsIGhlbHA9J09wdGlvbmFsIGZsYWcgZm9yIGNhdGVnb3JpemluZyB0ZXN0IHJ1bnMgd2hp Y2ggZG8gbm90IGZpdCBpbnRvIG90aGVyIGNvbmZpZ3VyYXRpb24gb3B0aW9ucy4nKSwKICAgICBd CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvbWFpbi5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvbWFpbi5weQkocmV2aXNpb24gMjQ2MjAyKQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkJKHdvcmtpbmcgY29weSkKQEAg LTI2Myw2ICsyNjMsNyBAQCBjbGFzcyBUZXN0ZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICAg ICAgdmVyc2lvbl9uYW1lPV9ob3N0LnBsYXRmb3JtLm9zX3ZlcnNpb25fbmFtZSgpLAogICAgICAg ICAgICAgICAgICAgICBzdHlsZT0nYXNhbicgaWYgY29uZmlnLmFzYW4gZWxzZSBjb25maWd1cmF0 aW9uX3RvX3VzZSwKICAgICAgICAgICAgICAgICAgICAgc2RrPV9ob3N0LnBsYXRmb3JtLmJ1aWxk X3ZlcnNpb24oKSwKKyAgICAgICAgICAgICAgICAgICAgZmxhdm9yPXNlbGYuX29wdGlvbnMucmVz dWx0X3JlcG9ydF9mbGF2b3IsCiAgICAgICAgICAgICAgICAgKSwKICAgICAgICAgICAgICAgICBk ZXRhaWxzPVVwbG9hZC5jcmVhdGVfZGV0YWlscyhvcHRpb25zPXNlbGYuX29wdGlvbnMpLAogICAg ICAgICAgICAgICAgIGNvbW1pdHM9W1VwbG9hZC5jcmVhdGVfY29tbWl0KAo=