193352 2019-01-11 09:06:11 -0800 webkitpy: Print abbreviated baseline search path that includes only folders that exist 2019-01-11 14:26:57 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap commit-queue ews-watchlist glenn lforschler ryanhaddad webkit-bug-importer oldest_to_newest 1493683 0 jbedard 2019-01-11 09:06:11 -0800 Maciej mentioned this idea in passing, I think it's a good one given how long our baseline search paths have gotten (and the fact the impending device-specific expectations will likely make this problem worse). 1493684 1 webkit-bug-importer 2019-01-11 09:06:33 -0800 <rdar://problem/47210736> 1493685 2 358901 jbedard 2019-01-11 09:10:51 -0800 Created attachment 358901 Patch 1493690 3 358901 ryanhaddad 2019-01-11 09:33:53 -0800 Comment on attachment 358901 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358901&action=review > Tools/ChangeLog:3 > + webkitpy: Print abbreviated baseline search path that includes only folders that exists Typo: Should be 'exist', not 'exists' > Tools/Scripts/webkitpy/layout_tests/views/printing.py:85 > + full_baseline_search_paths = self._port.baseline_search_path() For consistency, I think this should be 'full_baseline_search_path'. > Tools/Scripts/webkitpy/layout_tests/views/printing.py:88 > + self._print_default('Verbose baseline search paths: {} -> generic'.format(' -> '.join(normalize_baseline(full_baseline_search_paths)))) Again, 'path' not 'paths'. 1493692 4 358903 jbedard 2019-01-11 09:40:19 -0800 Created attachment 358903 Patch 1493693 5 358904 jbedard 2019-01-11 09:49:48 -0800 Created attachment 358904 Patch 1493697 6 358904 lforschler 2019-01-11 10:29:14 -0800 Comment on attachment 358904 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358904&action=review > Tools/Scripts/webkitpy/layout_tests/views/printing.py:86 > + normalize_baseline = lambda basline_search_paths: [fs.relpath(x, self._port.layout_tests_dir()).replace("../", "") for x in basline_search_paths] typo: basline 1493704 7 358909 jbedard 2019-01-11 10:45:06 -0800 Created attachment 358909 Patch for landing 1493818 8 jbedard 2019-01-11 14:25:35 -0800 Committed r239874: <https://trac.webkit.org/changeset/239874> 358901 2019-01-11 09:10:51 -0800 2019-01-11 09:40:18 -0800 Patch bug-193352-20190111091051.patch text/plain 3440 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzOTg2MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTAxLTExICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUHJpbnQgYWJicmV2aWF0ZWQgYmFzZWxpbmUgc2VhcmNo IHBhdGggdGhhdCBpbmNsdWRlcyBvbmx5IGZvbGRlcnMgdGhhdCBleGlzdHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM1MgorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNDcyMTA3MzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmlu dGluZy5weToKKyAgICAgICAgKFByaW50ZXIucHJpbnRfY29uZmlnKTogUHJpbnQgbGlzdCBvbiBv bmx5IGJhc2VsaW5lIHNlYXJjaCBwYXRocyB3aGljaCBleGlzdC4gCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHk6CisgICAg ICAgIChUZXN0cHJpbnRlci50ZXN0X3ByaW50X2NvbmZpZyk6CisKIDIwMTktMDEtMTEgIFphbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtCRkNdW01hcmdpbkNv bGxhcHNpbmddIEFkanVzdCB2ZXJ0aWNhbCBwb3NpdGlvbiB3aGVuIGJveCBtYXJnaW4gY29sbGFw c2VzIHRocm91Z2guCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92 aWV3cy9wcmludGluZy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weQkocmV2aXNpb24gMjM5ODYzKQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmcucHkJKHdvcmtpbmcg Y29weSkKQEAgLTgyLDggKzgyLDE0IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAg ICAgIHNlbGYuX3ByaW50X2RlZmF1bHQoIlBsYWNpbmcgbmV3IGJhc2VsaW5lcyBpbiAlcyIgJSBz ZWxmLl9wb3J0LmJhc2VsaW5lX3BhdGgoKSkKIAogICAgICAgICBmcyA9IHNlbGYuX3BvcnQuaG9z dC5maWxlc3lzdGVtCi0gICAgICAgIGZhbGxiYWNrX3BhdGggPSBbZnMucmVscGF0aCh4LCBzZWxm Ll9wb3J0LmxheW91dF90ZXN0c19kaXIoKSkucmVwbGFjZSgiLi4vIiwgIiIpIGZvciB4IGluIHNl bGYuX3BvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKV0KLSAgICAgICAgc2VsZi5fcHJpbnRfZGVm YXVsdCgiQmFzZWxpbmUgc2VhcmNoIHBhdGg6ICVzIC0+IGdlbmVyaWMiICUgIiAtPiAiLmpvaW4o ZmFsbGJhY2tfcGF0aCkpCisgICAgICAgIGZ1bGxfYmFzZWxpbmVfc2VhcmNoX3BhdGhzID0gc2Vs Zi5fcG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aCgpCisgICAgICAgIG5vcm1hbGl6ZV9iYXNlbGlu ZSA9IGxhbWJkYSBiYXNsaW5lX3NlYXJjaF9wYXRoczogW2ZzLnJlbHBhdGgoeCwgc2VsZi5fcG9y dC5sYXlvdXRfdGVzdHNfZGlyKCkpLnJlcGxhY2UoIi4uLyIsICIiKSBmb3IgeCBpbiBiYXNsaW5l X3NlYXJjaF9wYXRoc10KKworICAgICAgICBzZWxmLl9wcmludF9kZWZhdWx0KCdWZXJib3NlIGJh c2VsaW5lIHNlYXJjaCBwYXRoczoge30gLT4gZ2VuZXJpYycuZm9ybWF0KCcgLT4gJy5qb2luKG5v cm1hbGl6ZV9iYXNlbGluZShmdWxsX2Jhc2VsaW5lX3NlYXJjaF9wYXRocykpKSkKKworICAgICAg ICBzZWxmLl9wcmludF9kZWZhdWx0KCcnKQorICAgICAgICBzZWxmLl9wcmludF9kZWZhdWx0KCdC YXNlbGluZSBzZWFyY2ggcGF0aDoge30gLT4gZ2VuZXJpYycuZm9ybWF0KCcgLT4gJy5qb2luKG5v cm1hbGl6ZV9iYXNlbGluZShbcGF0aCBmb3IgcGF0aCBpbiBmdWxsX2Jhc2VsaW5lX3NlYXJjaF9w YXRocyBpZiBmcy5leGlzdHMocGF0aCldKSkpKQorICAgICAgICBzZWxmLl9wcmludF9kZWZhdWx0 KCcnKQogCiAgICAgICAgIHNlbGYuX3ByaW50X2RlZmF1bHQoIlVzaW5nICVzIGJ1aWxkIiAlIHNl bGYuX29wdGlvbnMuY29uZmlndXJhdGlvbikKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5waXhl bF90ZXN0czoKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdz L3ByaW50aW5nX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyMzk4 NjMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGlu Z191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTExLDcgKzExMSw4IEBAIGNsYXNzICBU ZXN0cHJpbnRlcih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0SW4oIlVz aW5nIHBvcnQgJ3Rlc3QtbWFjLWxlb3BhcmQnIiwgZXJyLmdldHZhbHVlKCkpCiAgICAgICAgIHNl bGYuYXNzZXJ0SW4oJ1Rlc3QgY29uZmlndXJhdGlvbjogPGxlb3BhcmQsIHg4NiwgcmVsZWFzZT4n LCBlcnIuZ2V0dmFsdWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRJbignUGxhY2luZyB0ZXN0IHJl c3VsdHMgaW4gL3RtcCcsIGVyci5nZXR2YWx1ZSgpKQotICAgICAgICBzZWxmLmFzc2VydEluKCdC YXNlbGluZSBzZWFyY2ggcGF0aDogcGxhdGZvcm0vdGVzdC1tYWMtbGVvcGFyZCAtPiBwbGF0Zm9y bS90ZXN0LW1hYy1zbm93bGVvcGFyZCAtPiBnZW5lcmljJywgZXJyLmdldHZhbHVlKCkpCisgICAg ICAgIHNlbGYuYXNzZXJ0SW4oJ1ZlcmJvc2UgYmFzZWxpbmUgc2VhcmNoIHBhdGhzOiBwbGF0Zm9y bS90ZXN0LW1hYy1sZW9wYXJkIC0+IHBsYXRmb3JtL3Rlc3QtbWFjLXNub3dsZW9wYXJkIC0+IGdl bmVyaWMnLCBlcnIuZ2V0dmFsdWUoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRJbignQmFzZWxpbmUg c2VhcmNoIHBhdGg6IHBsYXRmb3JtL3Rlc3QtbWFjLWxlb3BhcmQgLT4gZ2VuZXJpYycsIGVyci5n ZXR2YWx1ZSgpKQogICAgICAgICBzZWxmLmFzc2VydEluKCdVc2luZyBSZWxlYXNlIGJ1aWxkJywg ZXJyLmdldHZhbHVlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0SW4oJ1BpeGVsIHRlc3RzIGVuYWJs ZWQnLCBlcnIuZ2V0dmFsdWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRJbignQ29tbWFuZCBsaW5l OicsIGVyci5nZXR2YWx1ZSgpKQo= 358903 2019-01-11 09:40:19 -0800 2019-01-11 09:49:46 -0800 Patch bug-193352-20190111094018.patch text/plain 3439 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzOTg2MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTAxLTExICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUHJpbnQgYWJicmV2aWF0ZWQgYmFzZWxpbmUgc2VhcmNo IHBhdGggdGhhdCBpbmNsdWRlcyBvbmx5IGZvbGRlcnMgdGhhdCBleGlzdHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM1MgorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNDcyMTA3MzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmlu dGluZy5weToKKyAgICAgICAgKFByaW50ZXIucHJpbnRfY29uZmlnKTogUHJpbnQgbGlzdCBvbiBv bmx5IGJhc2VsaW5lIHNlYXJjaCBwYXRocyB3aGljaCBleGlzdC4gCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHk6CisgICAg ICAgIChUZXN0cHJpbnRlci50ZXN0X3ByaW50X2NvbmZpZyk6CisKIDIwMTktMDEtMTEgIFphbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtCRkNdW01hcmdpbkNv bGxhcHNpbmddIEFkanVzdCB2ZXJ0aWNhbCBwb3NpdGlvbiB3aGVuIGJveCBtYXJnaW4gY29sbGFw c2VzIHRocm91Z2guCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92 aWV3cy9wcmludGluZy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weQkocmV2aXNpb24gMjM5ODYzKQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmcucHkJKHdvcmtpbmcg Y29weSkKQEAgLTgyLDggKzgyLDE0IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAg ICAgIHNlbGYuX3ByaW50X2RlZmF1bHQoIlBsYWNpbmcgbmV3IGJhc2VsaW5lcyBpbiAlcyIgJSBz ZWxmLl9wb3J0LmJhc2VsaW5lX3BhdGgoKSkKIAogICAgICAgICBmcyA9IHNlbGYuX3BvcnQuaG9z dC5maWxlc3lzdGVtCi0gICAgICAgIGZhbGxiYWNrX3BhdGggPSBbZnMucmVscGF0aCh4LCBzZWxm Ll9wb3J0LmxheW91dF90ZXN0c19kaXIoKSkucmVwbGFjZSgiLi4vIiwgIiIpIGZvciB4IGluIHNl bGYuX3BvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKV0KLSAgICAgICAgc2VsZi5fcHJpbnRfZGVm YXVsdCgiQmFzZWxpbmUgc2VhcmNoIHBhdGg6ICVzIC0+IGdlbmVyaWMiICUgIiAtPiAiLmpvaW4o ZmFsbGJhY2tfcGF0aCkpCisgICAgICAgIGZ1bGxfYmFzZWxpbmVfc2VhcmNoX3BhdGhzID0gc2Vs Zi5fcG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aCgpCisgICAgICAgIG5vcm1hbGl6ZV9iYXNlbGlu ZSA9IGxhbWJkYSBiYXNsaW5lX3NlYXJjaF9wYXRoczogW2ZzLnJlbHBhdGgoeCwgc2VsZi5fcG9y dC5sYXlvdXRfdGVzdHNfZGlyKCkpLnJlcGxhY2UoIi4uLyIsICIiKSBmb3IgeCBpbiBiYXNsaW5l X3NlYXJjaF9wYXRoc10KKworICAgICAgICBzZWxmLl9wcmludF9kZWZhdWx0KCdWZXJib3NlIGJh c2VsaW5lIHNlYXJjaCBwYXRoOiB7fSAtPiBnZW5lcmljJy5mb3JtYXQoJyAtPiAnLmpvaW4obm9y bWFsaXplX2Jhc2VsaW5lKGZ1bGxfYmFzZWxpbmVfc2VhcmNoX3BhdGhzKSkpKQorCisgICAgICAg IHNlbGYuX3ByaW50X2RlZmF1bHQoJycpCisgICAgICAgIHNlbGYuX3ByaW50X2RlZmF1bHQoJ0Jh c2VsaW5lIHNlYXJjaCBwYXRoOiB7fSAtPiBnZW5lcmljJy5mb3JtYXQoJyAtPiAnLmpvaW4obm9y bWFsaXplX2Jhc2VsaW5lKFtwYXRoIGZvciBwYXRoIGluIGZ1bGxfYmFzZWxpbmVfc2VhcmNoX3Bh dGhzIGlmIGZzLmV4aXN0cyhwYXRoKV0pKSkpCisgICAgICAgIHNlbGYuX3ByaW50X2RlZmF1bHQo JycpCiAKICAgICAgICAgc2VsZi5fcHJpbnRfZGVmYXVsdCgiVXNpbmcgJXMgYnVpbGQiICUgc2Vs Zi5fb3B0aW9ucy5jb25maWd1cmF0aW9uKQogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnBpeGVs X3Rlc3RzOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3Mv cHJpbnRpbmdfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHkJKHJldmlzaW9uIDIzOTg2 MykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5n X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMTEsNyArMTExLDggQEAgY2xhc3MgIFRl c3RwcmludGVyKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRJbigiVXNp bmcgcG9ydCAndGVzdC1tYWMtbGVvcGFyZCciLCBlcnIuZ2V0dmFsdWUoKSkKICAgICAgICAgc2Vs Zi5hc3NlcnRJbignVGVzdCBjb25maWd1cmF0aW9uOiA8bGVvcGFyZCwgeDg2LCByZWxlYXNlPics IGVyci5nZXR2YWx1ZSgpKQogICAgICAgICBzZWxmLmFzc2VydEluKCdQbGFjaW5nIHRlc3QgcmVz dWx0cyBpbiAvdG1wJywgZXJyLmdldHZhbHVlKCkpCi0gICAgICAgIHNlbGYuYXNzZXJ0SW4oJ0Jh c2VsaW5lIHNlYXJjaCBwYXRoOiBwbGF0Zm9ybS90ZXN0LW1hYy1sZW9wYXJkIC0+IHBsYXRmb3Jt L3Rlc3QtbWFjLXNub3dsZW9wYXJkIC0+IGdlbmVyaWMnLCBlcnIuZ2V0dmFsdWUoKSkKKyAgICAg ICAgc2VsZi5hc3NlcnRJbignVmVyYm9zZSBiYXNlbGluZSBzZWFyY2ggcGF0aHM6IHBsYXRmb3Jt L3Rlc3QtbWFjLWxlb3BhcmQgLT4gcGxhdGZvcm0vdGVzdC1tYWMtc25vd2xlb3BhcmQgLT4gZ2Vu ZXJpYycsIGVyci5nZXR2YWx1ZSgpKQorICAgICAgICBzZWxmLmFzc2VydEluKCdCYXNlbGluZSBz ZWFyY2ggcGF0aDogcGxhdGZvcm0vdGVzdC1tYWMtbGVvcGFyZCAtPiBnZW5lcmljJywgZXJyLmdl dHZhbHVlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0SW4oJ1VzaW5nIFJlbGVhc2UgYnVpbGQnLCBl cnIuZ2V0dmFsdWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRJbignUGl4ZWwgdGVzdHMgZW5hYmxl ZCcsIGVyci5nZXR2YWx1ZSgpKQogICAgICAgICBzZWxmLmFzc2VydEluKCdDb21tYW5kIGxpbmU6 JywgZXJyLmdldHZhbHVlKCkpCg== 358904 2019-01-11 09:49:48 -0800 2019-01-11 10:45:04 -0800 Patch bug-193352-20190111094947.patch text/plain 3434 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzOTg2MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTAxLTExICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUHJpbnQgYWJicmV2aWF0ZWQgYmFzZWxpbmUgc2VhcmNo IHBhdGggdGhhdCBpbmNsdWRlcyBvbmx5IGZvbGRlcnMgdGhhdCBleGlzdAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMzUyCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS80NzIxMDczNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50 aW5nLnB5OgorICAgICAgICAoUHJpbnRlci5wcmludF9jb25maWcpOiBQcmludCBsaXN0IG9uIG9u bHkgYmFzZWxpbmUgc2VhcmNoIHBhdGhzIHdoaWNoIGV4aXN0LiAKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0dGVzdC5weToKKyAgICAg ICAgKFRlc3RwcmludGVyLnRlc3RfcHJpbnRfY29uZmlnKToKKwogMjAxOS0wMS0xMSAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0JGQ11bTWFyZ2luQ29s bGFwc2luZ10gQWRqdXN0IHZlcnRpY2FsIHBvc2l0aW9uIHdoZW4gYm94IG1hcmdpbiBjb2xsYXBz ZXMgdGhyb3VnaC4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Zp ZXdzL3ByaW50aW5nLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5CShyZXZpc2lvbiAyMzk4NjMpCisrKyBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weQkod29ya2luZyBj b3B5KQpAQCAtODIsOCArODIsMTQgQEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICAg ICAgc2VsZi5fcHJpbnRfZGVmYXVsdCgiUGxhY2luZyBuZXcgYmFzZWxpbmVzIGluICVzIiAlIHNl bGYuX3BvcnQuYmFzZWxpbmVfcGF0aCgpKQogCiAgICAgICAgIGZzID0gc2VsZi5fcG9ydC5ob3N0 LmZpbGVzeXN0ZW0KLSAgICAgICAgZmFsbGJhY2tfcGF0aCA9IFtmcy5yZWxwYXRoKHgsIHNlbGYu X3BvcnQubGF5b3V0X3Rlc3RzX2RpcigpKS5yZXBsYWNlKCIuLi8iLCAiIikgZm9yIHggaW4gc2Vs Zi5fcG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aCgpXQotICAgICAgICBzZWxmLl9wcmludF9kZWZh dWx0KCJCYXNlbGluZSBzZWFyY2ggcGF0aDogJXMgLT4gZ2VuZXJpYyIgJSAiIC0+ICIuam9pbihm YWxsYmFja19wYXRoKSkKKyAgICAgICAgZnVsbF9iYXNlbGluZV9zZWFyY2hfcGF0aCA9IHNlbGYu X3BvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKQorICAgICAgICBub3JtYWxpemVfYmFzZWxpbmUg PSBsYW1iZGEgYmFzbGluZV9zZWFyY2hfcGF0aHM6IFtmcy5yZWxwYXRoKHgsIHNlbGYuX3BvcnQu bGF5b3V0X3Rlc3RzX2RpcigpKS5yZXBsYWNlKCIuLi8iLCAiIikgZm9yIHggaW4gYmFzbGluZV9z ZWFyY2hfcGF0aHNdCisKKyAgICAgICAgc2VsZi5fcHJpbnRfZGVmYXVsdCgnVmVyYm9zZSBiYXNl bGluZSBzZWFyY2ggcGF0aDoge30gLT4gZ2VuZXJpYycuZm9ybWF0KCcgLT4gJy5qb2luKG5vcm1h bGl6ZV9iYXNlbGluZShmdWxsX2Jhc2VsaW5lX3NlYXJjaF9wYXRoKSkpKQorCisgICAgICAgIHNl bGYuX3ByaW50X2RlZmF1bHQoJycpCisgICAgICAgIHNlbGYuX3ByaW50X2RlZmF1bHQoJ0Jhc2Vs aW5lIHNlYXJjaCBwYXRoOiB7fSAtPiBnZW5lcmljJy5mb3JtYXQoJyAtPiAnLmpvaW4obm9ybWFs aXplX2Jhc2VsaW5lKFtwYXRoIGZvciBwYXRoIGluIGZ1bGxfYmFzZWxpbmVfc2VhcmNoX3BhdGgg aWYgZnMuZXhpc3RzKHBhdGgpXSkpKSkKKyAgICAgICAgc2VsZi5fcHJpbnRfZGVmYXVsdCgnJykK IAogICAgICAgICBzZWxmLl9wcmludF9kZWZhdWx0KCJVc2luZyAlcyBidWlsZCIgJSBzZWxmLl9v cHRpb25zLmNvbmZpZ3VyYXRpb24pCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMucGl4ZWxfdGVz dHM6CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmlu dGluZ191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0dGVzdC5weQkocmV2aXNpb24gMjM5ODYzKQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmdfdW5p dHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTExMSw3ICsxMTEsOCBAQCBjbGFzcyAgVGVzdHBy aW50ZXIodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEluKCJVc2luZyBw b3J0ICd0ZXN0LW1hYy1sZW9wYXJkJyIsIGVyci5nZXR2YWx1ZSgpKQogICAgICAgICBzZWxmLmFz c2VydEluKCdUZXN0IGNvbmZpZ3VyYXRpb246IDxsZW9wYXJkLCB4ODYsIHJlbGVhc2U+JywgZXJy LmdldHZhbHVlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0SW4oJ1BsYWNpbmcgdGVzdCByZXN1bHRz IGluIC90bXAnLCBlcnIuZ2V0dmFsdWUoKSkKLSAgICAgICAgc2VsZi5hc3NlcnRJbignQmFzZWxp bmUgc2VhcmNoIHBhdGg6IHBsYXRmb3JtL3Rlc3QtbWFjLWxlb3BhcmQgLT4gcGxhdGZvcm0vdGVz dC1tYWMtc25vd2xlb3BhcmQgLT4gZ2VuZXJpYycsIGVyci5nZXR2YWx1ZSgpKQorICAgICAgICBz ZWxmLmFzc2VydEluKCdWZXJib3NlIGJhc2VsaW5lIHNlYXJjaCBwYXRoOiBwbGF0Zm9ybS90ZXN0 LW1hYy1sZW9wYXJkIC0+IHBsYXRmb3JtL3Rlc3QtbWFjLXNub3dsZW9wYXJkIC0+IGdlbmVyaWMn LCBlcnIuZ2V0dmFsdWUoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRJbignQmFzZWxpbmUgc2VhcmNo IHBhdGg6IHBsYXRmb3JtL3Rlc3QtbWFjLWxlb3BhcmQgLT4gZ2VuZXJpYycsIGVyci5nZXR2YWx1 ZSgpKQogICAgICAgICBzZWxmLmFzc2VydEluKCdVc2luZyBSZWxlYXNlIGJ1aWxkJywgZXJyLmdl dHZhbHVlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0SW4oJ1BpeGVsIHRlc3RzIGVuYWJsZWQnLCBl cnIuZ2V0dmFsdWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRJbignQ29tbWFuZCBsaW5lOicsIGVy ci5nZXR2YWx1ZSgpKQo= 358909 2019-01-11 10:45:06 -0800 2019-01-11 14:26:57 -0800 Patch for landing bug-193352-20190111104505.patch text/plain 3433 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzOTg2NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTAxLTExICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUHJpbnQgYWJicmV2aWF0ZWQgYmFzZWxpbmUgc2VhcmNo IHBhdGggdGhhdCBpbmNsdWRlcyBvbmx5IGZvbGRlcnMgdGhhdCBleGlzdAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMzUyCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS80NzIxMDczNj4KKworICAgICAgICBSZXZpZXdlZCBieSBMdWNhcyBGb3JzY2hs ZXIuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmlu dGluZy5weToKKyAgICAgICAgKFByaW50ZXIucHJpbnRfY29uZmlnKTogUHJpbnQgbGlzdCBvbiBv bmx5IGJhc2VsaW5lIHNlYXJjaCBwYXRocyB3aGljaCBleGlzdC4gCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHk6CisgICAg ICAgIChUZXN0cHJpbnRlci50ZXN0X3ByaW50X2NvbmZpZyk6CisKIDIwMTktMDEtMTEgIFdlbnNv biBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgSW50cm9kdWNlIElE TCBmaWxlcyBmb3IgcnVudGltZS1lbmFibGVkIFVuZG9NYW5hZ2VyIGFuZCBVbmRvSXRlbSBKYXZh U2NyaXB0IEFQSQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmll d3MvcHJpbnRpbmcucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvdmlld3MvcHJpbnRpbmcucHkJKHJldmlzaW9uIDIzOTg2NCkKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5CSh3b3JraW5nIGNv cHkpCkBAIC04Miw4ICs4MiwxNCBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgICAg ICBzZWxmLl9wcmludF9kZWZhdWx0KCJQbGFjaW5nIG5ldyBiYXNlbGluZXMgaW4gJXMiICUgc2Vs Zi5fcG9ydC5iYXNlbGluZV9wYXRoKCkpCiAKICAgICAgICAgZnMgPSBzZWxmLl9wb3J0Lmhvc3Qu ZmlsZXN5c3RlbQotICAgICAgICBmYWxsYmFja19wYXRoID0gW2ZzLnJlbHBhdGgoeCwgc2VsZi5f cG9ydC5sYXlvdXRfdGVzdHNfZGlyKCkpLnJlcGxhY2UoIi4uLyIsICIiKSBmb3IgeCBpbiBzZWxm Ll9wb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRoKCldCi0gICAgICAgIHNlbGYuX3ByaW50X2RlZmF1 bHQoIkJhc2VsaW5lIHNlYXJjaCBwYXRoOiAlcyAtPiBnZW5lcmljIiAlICIgLT4gIi5qb2luKGZh bGxiYWNrX3BhdGgpKQorICAgICAgICBmdWxsX2Jhc2VsaW5lX3NlYXJjaF9wYXRoID0gc2VsZi5f cG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aCgpCisgICAgICAgIG5vcm1hbGl6ZV9iYXNlbGluZSA9 IGxhbWJkYSBiYXNlbGluZV9zZWFyY2hfcGF0aDogW2ZzLnJlbHBhdGgoeCwgc2VsZi5fcG9ydC5s YXlvdXRfdGVzdHNfZGlyKCkpLnJlcGxhY2UoIi4uLyIsICIiKSBmb3IgeCBpbiBiYXNlbGluZV9z ZWFyY2hfcGF0aF0KKworICAgICAgICBzZWxmLl9wcmludF9kZWZhdWx0KCdWZXJib3NlIGJhc2Vs aW5lIHNlYXJjaCBwYXRoOiB7fSAtPiBnZW5lcmljJy5mb3JtYXQoJyAtPiAnLmpvaW4obm9ybWFs aXplX2Jhc2VsaW5lKGZ1bGxfYmFzZWxpbmVfc2VhcmNoX3BhdGgpKSkpCisKKyAgICAgICAgc2Vs Zi5fcHJpbnRfZGVmYXVsdCgnJykKKyAgICAgICAgc2VsZi5fcHJpbnRfZGVmYXVsdCgnQmFzZWxp bmUgc2VhcmNoIHBhdGg6IHt9IC0+IGdlbmVyaWMnLmZvcm1hdCgnIC0+ICcuam9pbihub3JtYWxp emVfYmFzZWxpbmUoW3BhdGggZm9yIHBhdGggaW4gZnVsbF9iYXNlbGluZV9zZWFyY2hfcGF0aCBp ZiBmcy5leGlzdHMocGF0aCldKSkpKQorICAgICAgICBzZWxmLl9wcmludF9kZWZhdWx0KCcnKQog CiAgICAgICAgIHNlbGYuX3ByaW50X2RlZmF1bHQoIlVzaW5nICVzIGJ1aWxkIiAlIHNlbGYuX29w dGlvbnMuY29uZmlndXJhdGlvbikKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5waXhlbF90ZXN0 czoKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50 aW5nX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyMzk4NjQpCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0 dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTExLDcgKzExMSw4IEBAIGNsYXNzICBUZXN0cHJp bnRlcih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0SW4oIlVzaW5nIHBv cnQgJ3Rlc3QtbWFjLWxlb3BhcmQnIiwgZXJyLmdldHZhbHVlKCkpCiAgICAgICAgIHNlbGYuYXNz ZXJ0SW4oJ1Rlc3QgY29uZmlndXJhdGlvbjogPGxlb3BhcmQsIHg4NiwgcmVsZWFzZT4nLCBlcnIu Z2V0dmFsdWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRJbignUGxhY2luZyB0ZXN0IHJlc3VsdHMg aW4gL3RtcCcsIGVyci5nZXR2YWx1ZSgpKQotICAgICAgICBzZWxmLmFzc2VydEluKCdCYXNlbGlu ZSBzZWFyY2ggcGF0aDogcGxhdGZvcm0vdGVzdC1tYWMtbGVvcGFyZCAtPiBwbGF0Zm9ybS90ZXN0 LW1hYy1zbm93bGVvcGFyZCAtPiBnZW5lcmljJywgZXJyLmdldHZhbHVlKCkpCisgICAgICAgIHNl bGYuYXNzZXJ0SW4oJ1ZlcmJvc2UgYmFzZWxpbmUgc2VhcmNoIHBhdGg6IHBsYXRmb3JtL3Rlc3Qt bWFjLWxlb3BhcmQgLT4gcGxhdGZvcm0vdGVzdC1tYWMtc25vd2xlb3BhcmQgLT4gZ2VuZXJpYycs IGVyci5nZXR2YWx1ZSgpKQorICAgICAgICBzZWxmLmFzc2VydEluKCdCYXNlbGluZSBzZWFyY2gg cGF0aDogcGxhdGZvcm0vdGVzdC1tYWMtbGVvcGFyZCAtPiBnZW5lcmljJywgZXJyLmdldHZhbHVl KCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0SW4oJ1VzaW5nIFJlbGVhc2UgYnVpbGQnLCBlcnIuZ2V0 dmFsdWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRJbignUGl4ZWwgdGVzdHMgZW5hYmxlZCcsIGVy ci5nZXR2YWx1ZSgpKQogICAgICAgICBzZWxmLmFzc2VydEluKCdDb21tYW5kIGxpbmU6JywgZXJy LmdldHZhbHVlKCkpCg==