35265 2010-02-22 15:24:58 -0800 new-run-webkit-tests --platform=mac-leopard diffs are backwards 2010-03-01 18:59:28 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 35365 34984 1 eric dpranke dpranke oldest_to_newest 192670 0 eric 2010-02-22 15:24:58 -0800 run-chromium-webkit-tests --platform=mac-leopard diffs are backwards --- /tmp/run-chromium-webkit-tests-layout-test-results/http/tests/security/local-user-CSS-from-remote-actual.txt +++ /tmp/run-chromium-webkit-tests-layout-test-results/http/tests/security/local-user-CSS-from-remote-expected.txt run-webkit-tests diffs the other way. + lines are "actual" instead of expected. This confuses me to no end. 193512 1 49441 eric 2010-02-24 14:36:20 -0800 Created attachment 49441 Patch 193526 2 dpranke 2010-02-24 14:47:16 -0800 change looks good but we should make this consistent across the board. 193551 3 eric 2010-02-24 15:58:55 -0800 I've filed bug 35365 about fixing this sort of issue globally. 193747 4 49441 levin 2010-02-25 09:03:00 -0800 Comment on attachment 49441 Patch > diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog > +2010-02-24 Eric Seidel <eric@webkit.org> > + > + Reviewed by NOBODY (OOPS!). > + > + run-chromium-webkit-tests --platform=mac-leopard diffs are backwards > + https://bugs.webkit.org/show_bug.cgi?id=35265 > + > + Some parts of the code passed arguments as > + "actual, expected" and some passed as "expected, actual". > + As you might imagine, this lead to great confusion and wrongness. > + Standardize on "expected, actual" as that't the order which is typo: that't > diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py > - def diff_text(self, actual_text, expected_text, > - actual_filename, expected_filename): > + def diff_text(self, expected_text, actual_text, > + expected_filename, actual_filename): It would be nice to align to the ( of the previous line (as was done before). 193876 5 eric 2010-02-25 14:11:03 -0800 (In reply to comment #4) > > diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py > > - def diff_text(self, actual_text, expected_text, > > - actual_filename, expected_filename): > > + def diff_text(self, expected_text, actual_text, > > + expected_filename, actual_filename): > It would be nice to align to the ( of the previous line (as was done before). I thought "we" as webkit avoided that because you end up having to re-indent all the time. I went with the "just indent one level" model. Does PEP8 say anything on this subject? 193899 6 dpranke 2010-02-25 15:53:18 -0800 > I thought "we" as webkit avoided that because you end up having to re-indent > all the time. I went with the "just indent one level" model. Does PEP8 say > anything on this subject? PEP 8 says "Make sure to indent the continued line appropriately", but examples show function arguments and parenthesized expressions being aligned. Google's Python style guide says to align vertically and, failing that, to align w/ a hanging indent. 194356 7 49664 dpranke 2010-02-26 16:21:44 -0800 Created attachment 49664 posting a revised patch since Eric is OOO 194729 8 49664 levin 2010-03-01 10:34:17 -0800 Comment on attachment 49664 posting a revised patch since Eric is OOO > diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py > + def diff_text(self, expected_text, actual_text, > + expected_filename, actual_filename): > diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py > + def diff_text(self, expected_text, actual_text, > + expected_filename, actual_filename): fwiw, this indent doesn't align with the (. Note that there are many examples even within this patch of the alignment happening. 194744 9 dpranke 2010-03-01 11:36:32 -0800 Committed r55372: <http://trac.webkit.org/changeset/55372> 49441 2010-02-24 14:36:20 -0800 2010-02-25 09:02:59 -0800 Patch bug-35265-20100224143619.patch text/plain 4083 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3OTg2NDViLi5lYTgyZWIzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDIt MjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHJ1bi1jaHJvbWl1bS13ZWJraXQtdGVzdHMgLS1w bGF0Zm9ybT1tYWMtbGVvcGFyZCBkaWZmcyBhcmUgYmFja3dhcmRzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTI2NQorCisgICAgICAgIFNvbWUgcGFy dHMgb2YgdGhlIGNvZGUgcGFzc2VkIGFyZ3VtZW50cyBhcworICAgICAgICAiYWN0dWFsLCBleHBl Y3RlZCIgYW5kIHNvbWUgcGFzc2VkIGFzICJleHBlY3RlZCwgYWN0dWFsIi4KKyAgICAgICAgQXMg eW91IG1pZ2h0IGltYWdpbmUsIHRoaXMgbGVhZCB0byBncmVhdCBjb25mdXNpb24gYW5kIHdyb25n bmVzcy4KKyAgICAgICAgU3RhbmRhcmRpemUgb24gImV4cGVjdGVkLCBhY3R1YWwiIGFzIHRoYXQn dCB0aGUgb3JkZXIgd2hpY2ggaXMKKyAgICAgICAgcGFzc2VkIHRvIHRoZSB1bmRlcmx5aW5nIGRp ZmYgdG9vbC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv YmFzZS5weTogRml4IGRpZmYgb3JkZXIgYW5kIGFkZAorICAgICAgICAgbmVlZHNfaHR0cCBzbyB0 aGF0IHBsYXRmb3JtLW1hYyB3b3JrcyBhZ2Fpbi4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L21hYy5weTogZGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5OiBBZGQgbmVlZHNfaHR0cCB0byBjaGVja19z eXNfZGVwcyBzbyB0aGF0IHRoZSB0ZXN0IHBsYXRmb3JtIHdvcmtzIGFnYWluLgorCiAyMDEwLTAy LTIzICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtlIGNvbW1p dC1sb2ctZWRpdG9yIGZpbmQganVzdC1hZGRlZCBDaGFuZ2VMb2cgZmlsZXMKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQpp bmRleCBjYjFlMGU5Li44MWY3YmQ4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0xMTEsOCArMTExLDggQEAg Y2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAgICAgcGFzcwogICAgICAgICByZXR1cm4gcmVz dWx0CiAKLSAgICBkZWYgZGlmZl90ZXh0KHNlbGYsIGFjdHVhbF90ZXh0LCBleHBlY3RlZF90ZXh0 LAotICAgICAgICAgICAgICAgICAgYWN0dWFsX2ZpbGVuYW1lLCBleHBlY3RlZF9maWxlbmFtZSk6 CisgICAgZGVmIGRpZmZfdGV4dChzZWxmLCBleHBlY3RlZF90ZXh0LCBhY3R1YWxfdGV4dCwKKyAg ICAgICAgICAgICAgICAgIGV4cGVjdGVkX2ZpbGVuYW1lLCBhY3R1YWxfZmlsZW5hbWUpOgogICAg ICAgICAiIiJSZXR1cm5zIGEgc3RyaW5nIGNvbnRhaW5pbmcgdGhlIGRpZmYgb2YgdGhlIHR3byB0 ZXh0IHN0cmluZ3MKICAgICAgICAgaW4gJ3VuaWZpZWQgZGlmZicgZm9ybWF0LgogCkBAIC00NjYs NyArNDY2LDcgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICBleHBlY3RhdGlvbnMsIGRl dGVybWluaW5nIHNlYXJjaCBwYXRocywgYW5kIGxvZ2dpbmcgaW5mb3JtYXRpb24uIiIiCiAgICAg ICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IoJ1BvcnQudmVyc2lvbicpCiAKLSAgICBkZWYg d2RpZmZfdGV4dChzZWxmLCBhY3R1YWxfZmlsZW5hbWUsIGV4cGVjdGVkX2ZpbGVuYW1lKToKKyAg ICBkZWYgd2RpZmZfdGV4dChzZWxmLCBleHBlY3RlZF9maWxlbmFtZSwgYWN0dWFsX2ZpbGVuYW1l KToKICAgICAgICAgIiIiUmV0dXJucyBhIHN0cmluZyBvZiBIVE1MIGluZGljYXRpbmcgdGhlIHdv cmQtbGV2ZWwgZGlmZiBvZiB0aGUKICAgICAgICAgY29udGVudHMgb2YgdGhlIHR3byBmaWxlbmFt ZXMuIFJldHVybnMgYW4gZW1wdHkgc3RyaW5nIGlmIHdvcmQtbGV2ZWwKICAgICAgICAgZGlmZmlu ZyBpc24ndCBhdmFpbGFibGUuIiIiCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5CmluZGV4IGQzNTVmNjIuLjliNzBjYjcgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv bWFjLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvbWFjLnB5CkBAIC02Niw3ICs2Niw3IEBAIGNsYXNzIE1hY1BvcnQoYmFzZS5Qb3J0KToKICAg ICAgICAgZGlycy5hcHBlbmQoc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoJ21hYycpKQogICAg ICAgICByZXR1cm4gZGlycwogCi0gICAgZGVmIGNoZWNrX3N5c19kZXBzKHNlbGYpOgorICAgIGRl ZiBjaGVja19zeXNfZGVwcyhzZWxmLCBuZWVkc19odHRwKToKICAgICAgICAgaWYgZXhlY3V0aXZl LnJ1bl9jb21tYW5kKFtzZWxmLnNjcmlwdF9wYXRoKCJidWlsZC1kdW1wcmVuZGVydHJlZSIpXSwg cmV0dXJuX2V4aXRfY29kZT1UcnVlKSAhPSAwOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvdGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvdGVzdC5weQppbmRleCBjM2U5N2JlLi40OGI2ZjVmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CkBAIC01Miw3 ICs1Miw3IEBAIGNsYXNzIFRlc3RQb3J0KGJhc2UuUG9ydCk6CiAgICAgZGVmIGJhc2VsaW5lX3Nl YXJjaF9wYXRoKHNlbGYpOgogICAgICAgICByZXR1cm4gW3NlbGYuYmFzZWxpbmVfcGF0aCgpXQog Ci0gICAgZGVmIGNoZWNrX3N5c19kZXBzKHNlbGYpOgorICAgIGRlZiBjaGVja19zeXNfZGVwcyhz ZWxmLCBuZWVkc19odHRwKToKICAgICAgICAgcmV0dXJuIFRydWUKIAogICAgIGRlZiBkaWZmX2lt YWdlKHNlbGYsIGFjdHVhbF9maWxlbmFtZSwgZXhwZWN0ZWRfZmlsZW5hbWUsCkBAIC02Miw4ICs2 Miw4IEBAIGNsYXNzIFRlc3RQb3J0KGJhc2UuUG9ydCk6CiAgICAgZGVmIGNvbXBhcmVfdGV4dChz ZWxmLCBhY3R1YWxfdGV4dCwgZXhwZWN0ZWRfdGV4dCk6CiAgICAgICAgIHJldHVybiBGYWxzZQog Ci0gICAgZGVmIGRpZmZfdGV4dChzZWxmLCBhY3R1YWxfdGV4dCwgZXhwZWN0ZWRfdGV4dCwKLSAg ICAgICAgICAgICAgICAgIGFjdHVhbF9maWxlbmFtZSwgZXhwZWN0ZWRfZmlsZW5hbWUpOgorICAg IGRlZiBkaWZmX3RleHQoc2VsZiwgZXhwZWN0ZWRfdGV4dCwgYWN0dWFsX3RleHQsCisgICAgICAg ICAgICBleHBlY3RlZF9maWxlbmFtZSwgYWN0dWFsX2ZpbGVuYW1lKToKICAgICAgICAgcmV0dXJu ICcnCiAKICAgICBkZWYgbmFtZShzZWxmKToKQEAgLTEyMCw3ICsxMjAsNyBAQCBjbGFzcyBUZXN0 UG9ydChiYXNlLlBvcnQpOgogICAgIGRlZiB2ZXJzaW9uKCk6CiAgICAgICAgIHJldHVybiAnJwog Ci0gICAgZGVmIHdkaWZmX3RleHQoc2VsZiwgYWN0dWFsX2ZpbGVuYW1lLCBleHBlY3RlZF9maWxl bmFtZSk6CisgICAgZGVmIHdkaWZmX3RleHQoc2VsZiwgZXhwZWN0ZWRfZmlsZW5hbWUsIGFjdHVh bF9maWxlbmFtZSk6CiAgICAgICAgIHJldHVybiAnJwogCiAK 49664 2010-02-26 16:21:44 -0800 2010-03-01 18:59:28 -0800 posting a revised patch since Eric is OOO wk35265_backwards_diff.diff text/plain 6093 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5YzM2MmEzLi5hZTczMzg3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKyAyMDEwLTAy LTI2ICBEaXJrIFByYW5rZSA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICBuZXctY2hyb21pdW0td2Via2l0LXRl c3RzIC0tcGxhdGZvcm09bWFjLWxlb3BhcmQgZGlmZnMgYXJlIGJhY2t3YXJkcworICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1MjY1CisKKyAgICAgICAg IFNvbWUgcGFydHMgb2YgdGhlIGNvZGUgcGFzc2VkIGFyZ3VtZW50cyBhcworICAgICAgICAgImFj dHVhbCwgZXhwZWN0ZWQiIGFuZCBzb21lIHBhc3NlZCBhcyAiZXhwZWN0ZWQsIGFjdHVhbCIuCisg ICAgICAgICBBcyB5b3UgbWlnaHQgaW1hZ2luZSwgdGhpcyBsZWFkIHRvIGdyZWF0IGNvbmZ1c2lv biBhbmQgd3JvbmduZXNzLgorICAgICAgICAgU3RhbmRhcmRpemUgb24gImV4cGVjdGVkLCBhY3R1 YWwiIGFzIHRoYXQncyB0aGUgb3JkZXIgd2hpY2ggaXMKKyAgICAgICAgIHBhc3NlZCB0byB0aGUg dW5kZXJseWluZyBkaWZmIHRvb2wuCisKKyAgICAgICAgIEJhc2VkIG9uIGEgcGF0Y2ggYnkgRXJp YyBTaWVkZWwgPGVyaWNAd2Via2l0Lm9yZz4uCisKKyAgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5OgorICAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5OgorICAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHk6CisgICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvaW1hZ2VfZGlmZi5weQorCiAyMDEwLTAyLTI2ICBB bnRvbmlvIEdvbWVzICA8dG9uaWtpdG9vQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgR3VzdGF2byBOb3JvbmhhLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IGNiMWUwZTkuLmQwODg2M2QgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv YmFzZS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Jhc2UucHkKQEAgLTc1LDE1ICs3NSwxNSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAg ICAgIFJldHVybnMgd2hldGhlciB0aGUgc3lzdGVtIGlzIHByb3Blcmx5IGNvbmZpZ3VyZWQuIiIi CiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IoJ1BvcnQuY2hlY2tfc3lzX2RlcHMn KQogCi0gICAgZGVmIGNvbXBhcmVfdGV4dChzZWxmLCBhY3R1YWxfdGV4dCwgZXhwZWN0ZWRfdGV4 dCk6CisgICAgZGVmIGNvbXBhcmVfdGV4dChzZWxmLCBleHBlY3RlZF90ZXh0LCBhY3R1YWxfdGV4 dCk6CiAgICAgICAgICIiIlJldHVybiB3aGV0aGVyIG9yIG5vdCB0aGUgdHdvIHN0cmluZ3MgYXJl ICpub3QqIGVxdWFsLiBUaGlzCiAgICAgICAgIHJvdXRpbmUgaXMgdXNlZCB0byBkaWZmIHRleHQg b3V0cHV0LgogCiAgICAgICAgIFdoaWxlIHRoaXMgaXMgYSBnZW5lcmljIHJvdXRpbmUsIHdlIGlu Y2x1ZGUgaXQgaW4gdGhlIFBvcnQKICAgICAgICAgaW50ZXJmYWNlIHNvIHRoYXQgaXQgY2FuIGJl IG92ZXJyaWRlbiBmb3IgdGVzdGluZyBwdXJwb3Nlcy4iIiIKLSAgICAgICAgcmV0dXJuIGFjdHVh bF90ZXh0ICE9IGV4cGVjdGVkX3RleHQKKyAgICAgICAgcmV0dXJuIGV4cGVjdGVkX3RleHQgIT0g YWN0dWFsX3RleHQKIAotICAgIGRlZiBkaWZmX2ltYWdlKHNlbGYsIGFjdHVhbF9maWxlbmFtZSwg ZXhwZWN0ZWRfZmlsZW5hbWUsCisgICAgZGVmIGRpZmZfaW1hZ2Uoc2VsZiwgZXhwZWN0ZWRfZmls ZW5hbWUsIGFjdHVhbF9maWxlbmFtZSwKICAgICAgICAgICAgICAgICAgICBkaWZmX2ZpbGVuYW1l PU5vbmUpOgogICAgICAgICAiIiJDb21wYXJlIHR3byBpbWFnZSBmaWxlcyBhbmQgcHJvZHVjZSBh IGRlbHRhIGltYWdlIGZpbGUuCiAKQEAgLTk0LDcgKzk0LDcgQEAgY2xhc3MgUG9ydChvYmplY3Qp OgogICAgICAgICBXaGlsZSB0aGlzIGlzIGEgZ2VuZXJpYyByb3V0aW5lLCB3ZSBpbmNsdWRlIGl0 IGluIHRoZSBQb3J0CiAgICAgICAgIGludGVyZmFjZSBzbyB0aGF0IGl0IGNhbiBiZSBvdmVycmlk ZW4gZm9yIHRlc3RpbmcgcHVycG9zZXMuIiIiCiAgICAgICAgIGV4ZWN1dGFibGUgPSBzZWxmLl9w YXRoX3RvX2ltYWdlX2RpZmYoKQotICAgICAgICBjbWQgPSBbZXhlY3V0YWJsZSwgJy0tZGlmZics IGFjdHVhbF9maWxlbmFtZSwgZXhwZWN0ZWRfZmlsZW5hbWVdCisgICAgICAgIGNtZCA9IFtleGVj dXRhYmxlLCAnLS1kaWZmJywgZXhwZWN0ZWRfZmlsZW5hbWUsIGFjdHVhbF9maWxlbmFtZV0KICAg ICAgICAgaWYgZGlmZl9maWxlbmFtZToKICAgICAgICAgICAgIGNtZC5hcHBlbmQoZGlmZl9maWxl bmFtZSkKICAgICAgICAgcmVzdWx0ID0gMQpAQCAtMTExLDggKzExMSw4IEBAIGNsYXNzIFBvcnQo b2JqZWN0KToKICAgICAgICAgICAgIHBhc3MKICAgICAgICAgcmV0dXJuIHJlc3VsdAogCi0gICAg ZGVmIGRpZmZfdGV4dChzZWxmLCBhY3R1YWxfdGV4dCwgZXhwZWN0ZWRfdGV4dCwKLSAgICAgICAg ICAgICAgICAgIGFjdHVhbF9maWxlbmFtZSwgZXhwZWN0ZWRfZmlsZW5hbWUpOgorICAgIGRlZiBk aWZmX3RleHQoc2VsZiwgZXhwZWN0ZWRfdGV4dCwgYWN0dWFsX3RleHQsCisgICAgICAgICAgICAg ICAgICBleHBlY3RlZF9maWxlbmFtZSwgYWN0dWFsX2ZpbGVuYW1lKToKICAgICAgICAgIiIiUmV0 dXJucyBhIHN0cmluZyBjb250YWluaW5nIHRoZSBkaWZmIG9mIHRoZSB0d28gdGV4dCBzdHJpbmdz CiAgICAgICAgIGluICd1bmlmaWVkIGRpZmYnIGZvcm1hdC4KIApAQCAtNDc2LDggKzQ3Niw4IEBA IGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgICAgICAgICctLWVuZC1kZWxldGU9IyNXRElG Rl9FTkQjIycsCiAgICAgICAgICAgICAgICAnLS1zdGFydC1pbnNlcnQ9IyNXRElGRl9BREQjIycs CiAgICAgICAgICAgICAgICAnLS1lbmQtaW5zZXJ0PSMjV0RJRkZfRU5EIyMnLAotICAgICAgICAg ICAgICAgZXhwZWN0ZWRfZmlsZW5hbWUsCi0gICAgICAgICAgICAgICBhY3R1YWxfZmlsZW5hbWVd CisgICAgICAgICAgICAgICBhY3R1YWxfZmlsZW5hbWUsCisgICAgICAgICAgICAgICBleHBlY3Rl ZF9maWxlbmFtZV0KICAgICAgICAgZ2xvYmFsIF93ZGlmZl9hdmFpbGFibGUKICAgICAgICAgcmVz dWx0ID0gJycKICAgICAgICAgdHJ5OgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weSBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKaW5kZXggYzgxZDBhNy4u MjVhZGNkNyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC05MCw5ICs5MCw2IEBAIGNsYXNzIENo cm9taXVtUG9ydChiYXNlLlBvcnQpOgogCiAgICAgICAgIHJldHVybiByZXN1bHQKIAotICAgIGRl ZiBjb21wYXJlX3RleHQoc2VsZiwgYWN0dWFsX3RleHQsIGV4cGVjdGVkX3RleHQpOgotICAgICAg ICByZXR1cm4gYWN0dWFsX3RleHQgIT0gZXhwZWN0ZWRfdGV4dAotCiAgICAgZGVmIHBhdGhfZnJv bV9jaHJvbWl1bV9iYXNlKHNlbGYsICpjb21wcyk6CiAgICAgICAgICIiIlJldHVybnMgdGhlIGZ1 bGwgcGF0aCB0byBwYXRoIG1hZGUgYnkgam9pbmluZyB0aGUgdG9wIG9mIHRoZQogICAgICAgICBD aHJvbWl1bSBzb3VyY2UgdHJlZSBhbmQgdGhlIGxpc3Qgb2YgcGF0aCBjb21wb25lbnRzIGluIHwq Y29tcHN8LiIiIgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC90ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC90ZXN0LnB5CmluZGV4IDhmYTMyYjIuLmFiOWU2NGYgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3Qu cHkKQEAgLTU1LDE1ICs1NSwxNSBAQCBjbGFzcyBUZXN0UG9ydChiYXNlLlBvcnQpOgogICAgIGRl ZiBjaGVja19zeXNfZGVwcyhzZWxmLCBuZWVkc19odHRwKToKICAgICAgICAgcmV0dXJuIFRydWUK IAotICAgIGRlZiBkaWZmX2ltYWdlKHNlbGYsIGFjdHVhbF9maWxlbmFtZSwgZXhwZWN0ZWRfZmls ZW5hbWUsCisgICAgZGVmIGRpZmZfaW1hZ2Uoc2VsZiwgZXhwZWN0ZWRfZmlsZW5hbWUsIGFjdHVh bF9maWxlbmFtZSwKICAgICAgICAgICAgICAgICAgICBkaWZmX2ZpbGVuYW1lPU5vbmUpOgogICAg ICAgICByZXR1cm4gRmFsc2UKIAotICAgIGRlZiBjb21wYXJlX3RleHQoc2VsZiwgYWN0dWFsX3Rl eHQsIGV4cGVjdGVkX3RleHQpOgorICAgIGRlZiBjb21wYXJlX3RleHQoc2VsZiwgZXhwZWN0ZWRf dGV4dCwgYWN0dWFsX3RleHQpOgogICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgIGRlZiBkaWZm X3RleHQoc2VsZiwgYWN0dWFsX3RleHQsIGV4cGVjdGVkX3RleHQsCi0gICAgICAgICAgICAgICAg ICBhY3R1YWxfZmlsZW5hbWUsIGV4cGVjdGVkX2ZpbGVuYW1lKToKKyAgICBkZWYgZGlmZl90ZXh0 KHNlbGYsIGV4cGVjdGVkX3RleHQsIGFjdHVhbF90ZXh0LAorICAgICAgICAgICAgZXhwZWN0ZWRf ZmlsZW5hbWUsIGFjdHVhbF9maWxlbmFtZSk6CiAgICAgICAgIHJldHVybiAnJwogCiAgICAgZGVm IG5hbWUoc2VsZik6CkBAIC0xMjAsNyArMTIwLDcgQEAgY2xhc3MgVGVzdFBvcnQoYmFzZS5Qb3J0 KToKICAgICBkZWYgdmVyc2lvbigpOgogICAgICAgICByZXR1cm4gJycKIAotICAgIGRlZiB3ZGlm Zl90ZXh0KHNlbGYsIGFjdHVhbF9maWxlbmFtZSwgZXhwZWN0ZWRfZmlsZW5hbWUpOgorICAgIGRl ZiB3ZGlmZl90ZXh0KHNlbGYsIGV4cGVjdGVkX2ZpbGVuYW1lLCBhY3R1YWxfZmlsZW5hbWUpOgog ICAgICAgICByZXR1cm4gJycKIAogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYucHkK aW5kZXggMWRmN2NhMy4uOTRjMzQ2NyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy9pbWFnZV9kaWZmLnB5CisrKyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvaW1hZ2VfZGlm Zi5weQpAQCAtOTgsNyArOTgsNyBAQCBjbGFzcyBJbWFnZURpZmYodGVzdF90eXBlX2Jhc2UuVGVz dFR5cGVCYXNlKToKIAogICAgICAgICB0cnk6CiAgICAgICAgICAgICBfY29tcGFyZV9hdmFpbGFi bGUgPSBUcnVlCi0gICAgICAgICAgICByZXN1bHQgPSBwb3J0LmRpZmZfaW1hZ2UoYWN0dWFsX2Zp bGVuYW1lLCBleHBlY3RlZF9maWxlbmFtZSwKKyAgICAgICAgICAgIHJlc3VsdCA9IHBvcnQuZGlm Zl9pbWFnZShleHBlY3RlZF9maWxlbmFtZSwgYWN0dWFsX2ZpbGVuYW1lLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGRpZmZfZmlsZW5hbWUpCiAgICAgICAgIGV4Y2VwdCBW YWx1ZUVycm9yOgogICAgICAgICAgICAgX2NvbXBhcmVfYXZhaWxhYmxlID0gRmFsc2UK