58101 2011-04-07 17:17:29 -0700 new-run-webkit-tests: minor cleanup to be consistent in handling missing files 2011-04-08 12:48:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 57987 1 dpranke dpranke crogers mihaip ojan tony oldest_to_newest 381872 0 dpranke 2011-04-07 17:17:29 -0700 new-run-webkit-tests: minor cleanup to be consistent in handling missing files 381874 1 88741 dpranke 2011-04-07 17:22:34 -0700 Created attachment 88741 Patch 381936 2 88755 dpranke 2011-04-07 19:27:09 -0700 Created attachment 88755 Patch 381940 3 dpranke 2011-04-07 19:31:50 -0700 this patch is some cleanup needed prior to adding support for webaudio; it makes the changes in the webaudio patch easier to understand. 382061 4 88755 ojan 2011-04-08 00:44:55 -0700 Comment on attachment 88755 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88755&action=review > Tools/ChangeLog:10 > + new-run-webkit-tests: clean up the way we handle missing files, > + to be consistent. With this change, the Port.expected_X() and > + Driver.run_test() routines should return None if there is no > + output, not ''. > + > + https://bugs.webkit.org/show_bug.cgi?id=58101 Usually the ChangeLog format is: Reviewed by ... one-line description that usually matches the bug title http://bugs.webkit.org/... detailed description here * files modified > Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:228 > + self._port.compare_text(self._get_normalized_output_text(actual_text), > + # Assuming expected_text is already normalized. > + expected_text)): This is difficult for me to read. Could you put it all on one line and put the comment above the if-statement? 382459 5 dpranke 2011-04-08 12:34:55 -0700 (In reply to comment #4) > (From update of attachment 88755 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=88755&action=review > > > Tools/ChangeLog:10 > > + new-run-webkit-tests: clean up the way we handle missing files, > > + to be consistent. With this change, the Port.expected_X() and > > + Driver.run_test() routines should return None if there is no > > + output, not ''. > > + > > + https://bugs.webkit.org/show_bug.cgi?id=58101 > > Usually the ChangeLog format is: > > Reviewed by ... > > one-line description that usually matches the bug title > http://bugs.webkit.org/... > > detailed description here > Okay. I'm not sure how it is that I've done hundreds of commits and am learning this just now :) > * files modified > > > Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:228 > > + self._port.compare_text(self._get_normalized_output_text(actual_text), > > + # Assuming expected_text is already normalized. > > + expected_text)): > > This is difficult for me to read. Could you put it all on one line and put the comment above the if-statement? Will do as part of landing this. 382465 6 dpranke 2011-04-08 12:48:57 -0700 Committed r83327: <http://trac.webkit.org/changeset/83327> 88741 2011-04-07 17:22:34 -0700 2011-04-07 19:27:07 -0700 Patch bug-58101-20110407172232.patch text/plain 6423 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODMwOTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlOWU5ZTVjZjg5ZWNlNTA4MTEwMDhhNDIyMTg3NDNmNzJj MThhNzljLi5hNThjMjVmN2NmZDU2Y2RkNzg1YWVkNDdmMjViZGI1YjA1MDFkMDM1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDQtMDcgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJr aXQtdGVzdHM6IGNsZWFuIHVwIHRoZSB3YXkgd2UgaGFuZGxlIG1pc3NpbmcgZmlsZXMsCisgICAg ICAgIHRvIGJlIGNvbnNpc3RlbnQuIFdpdGggdGhpcyBjaGFuZ2UsIHRoZSBQb3J0LmV4cGVjdGVk X1goKSBhbmQKKyAgICAgICAgRHJpdmVyLnJ1bl90ZXN0KCkgcm91dGluZXMgc2hvdWxkIHJldHVy biBOb25lIGlmIHRoZXJlIGlzIG5vCisgICAgICAgIG91dHB1dCwgbm90ICcnLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODEwMQorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvc2luZ2xlX3Rl c3RfcnVubmVyLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvd2Via2l0LnB5OgorCiAyMDExLTA0LTA2ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0Bn bWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5n bGVfdGVzdF9ydW5uZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9s YXlvdXRfcGFja2FnZS9zaW5nbGVfdGVzdF9ydW5uZXIucHkKaW5kZXggYThjNzE2ZjhkYzBjMjhk OTI2NWQ4N2Q1Y2E5NWMxZjJhNzliYjAzMy4uZTZiYmZiNjNmMWMyYzE2Njg4ZWRkNWVjOWZlMDE5 N2E0MmE3MDgyMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGF5b3V0X3BhY2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1bm5l ci5weQpAQCAtMjIyLDEzICsyMjIsMTMgQEAgY2xhc3MgU2luZ2xlVGVzdFJ1bm5lcjoKIAogICAg IGRlZiBfY29tcGFyZV90ZXh0KHNlbGYsIGFjdHVhbF90ZXh0LCBleHBlY3RlZF90ZXh0KToKICAg ICAgICAgZmFpbHVyZXMgPSBbXQotICAgICAgICBpZiBzZWxmLl9wb3J0LmNvbXBhcmVfdGV4dChz ZWxmLl9nZXRfbm9ybWFsaXplZF9vdXRwdXRfdGV4dChhY3R1YWxfdGV4dCksCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICMgQXNzdW1pbmcgZXhwZWN0ZWRfdGV4dCBpcyBhbHJl YWR5IG5vcm1hbGl6ZWQuCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4cGVj dGVkX3RleHQpOgotICAgICAgICAgICAgaWYgZXhwZWN0ZWRfdGV4dCA9PSAnJzoKLSAgICAgICAg ICAgICAgICBmYWlsdXJlcy5hcHBlbmQodGVzdF9mYWlsdXJlcy5GYWlsdXJlTWlzc2luZ1Jlc3Vs dCgpKQotICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBmYWlsdXJlcy5hcHBlbmQo dGVzdF9mYWlsdXJlcy5GYWlsdXJlVGV4dE1pc21hdGNoKCkpCisgICAgICAgIGlmIChleHBlY3Rl ZF90ZXh0IGFuZCBhY3R1YWxfdGV4dCBhbmQKKyAgICAgICAgICAgIHNlbGYuX3BvcnQuY29tcGFy ZV90ZXh0KHNlbGYuX2dldF9ub3JtYWxpemVkX291dHB1dF90ZXh0KGFjdHVhbF90ZXh0KSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMgQXNzdW1pbmcgZXhwZWN0ZWRfdGV4 dCBpcyBhbHJlYWR5IG5vcm1hbGl6ZWQuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBleHBlY3RlZF90ZXh0KSk6CisgICAgICAgICAgICBmYWlsdXJlcy5hcHBlbmQodGVzdF9m YWlsdXJlcy5GYWlsdXJlVGV4dE1pc21hdGNoKCkpCisgICAgICAgIGVsaWYgYWN0dWFsX3RleHQg YW5kIG5vdCBleHBlY3RlZF90ZXh0OgorICAgICAgICAgICAgZmFpbHVyZXMuYXBwZW5kKHRlc3Rf ZmFpbHVyZXMuRmFpbHVyZU1pc3NpbmdSZXN1bHQoKSkKICAgICAgICAgcmV0dXJuIGZhaWx1cmVz CiAKICAgICBkZWYgX2dldF9ub3JtYWxpemVkX291dHB1dF90ZXh0KHNlbGYsIG91dHB1dCk6CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2Uu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5k ZXggYzIwNDg2YzgwNmJlMmYzODRmZjVkODRmZDUzMTYzOTZhM2VmOWNmNi4uMGJhZDExYzllZWJm MDNhNjBiOWEyYTZkMDQ4MDFmMTBiMTMzZGQ4ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQpAQCAtMzUyLDE0ICszNTIsMTUgQEAgY2xh c3MgUG9ydChvYmplY3QpOgogICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5yZWFkX2Jp bmFyeV9maWxlKHBhdGgpCiAKICAgICBkZWYgZXhwZWN0ZWRfdGV4dChzZWxmLCB0ZXN0KToKLSAg ICAgICAgIiIiUmV0dXJucyB0aGUgdGV4dCBvdXRwdXQgd2UgZXhwZWN0IHRoZSB0ZXN0IHRvIHBy b2R1Y2UuCisgICAgICAgICIiIlJldHVybnMgdGhlIHRleHQgb3V0cHV0IHdlIGV4cGVjdCB0aGUg dGVzdCB0byBwcm9kdWNlLCBvciBOb25lCisgICAgICAgIGlmIHdlIGRvbid0IGV4cGVjdCB0aGVy ZSB0byBiZSBhbnkgdGV4dCBvdXRwdXQuCiAgICAgICAgIEVuZC1vZi1saW5lIGNoYXJhY3RlcnMg YXJlIG5vcm1hbGl6ZWQgdG8gJ1xuJy4iIiIKICAgICAgICAgIyBGSVhNRTogRFJUIG91dHB1dCBp cyBhY3R1YWxseSB1dGYtOCwgYnV0IHNpbmNlIHdlIGRvbid0IGRlY29kZSB0aGUKICAgICAgICAg IyBvdXRwdXQgZnJvbSBEUlQgKGluc3RlYWQgdHJlYXRpbmcgaXQgYXMgYSBiaW5hcnkgc3RyaW5n KSwgd2UgcmVhZCB0aGUKICAgICAgICAgIyBiYXNlbGluZXMgYXMgYSBiaW5hcnkgc3RyaW5nLCB0 b28uCiAgICAgICAgIHBhdGggPSBzZWxmLmV4cGVjdGVkX2ZpbGVuYW1lKHRlc3QsICcudHh0JykK ICAgICAgICAgaWYgbm90IHNlbGYucGF0aF9leGlzdHMocGF0aCk6Ci0gICAgICAgICAgICByZXR1 cm4gJycKKyAgICAgICAgICAgIHJldHVybiBOb25lCiAgICAgICAgIHRleHQgPSBzZWxmLl9maWxl c3lzdGVtLnJlYWRfYmluYXJ5X2ZpbGUocGF0aCkKICAgICAgICAgcmV0dXJuIHRleHQucmVwbGFj ZSgiXHJcbiIsICJcbiIpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CmluZGV4IDUzNmZkMGU1M2JjZTk1MjVmNjRiYWM3M2M4 OWE1YTE1MDAzMmFjZjkuLjE4YjU3MDU4MDE1Nzg0OWM5M2Q3NGY3ODZjNDQ5NzE0N2NmZGUwNjUg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bS5weQpAQCAtNDI1LDcgKzQyNSw3IEBAIGNsYXNzIENocm9taXVtRHJpdmVyKGJhc2Uu RHJpdmVyKToKICAgICAgICAgaWYgcG5nX3BhdGggYW5kIHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0u ZXhpc3RzKHBuZ19wYXRoKToKICAgICAgICAgICAgIHJldHVybiBzZWxmLl9wb3J0Ll9maWxlc3lz dGVtLnJlYWRfYmluYXJ5X2ZpbGUocG5nX3BhdGgpCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAg ICByZXR1cm4gJycKKyAgICAgICAgICAgIHJldHVybiBOb25lCiAKICAgICBkZWYgX291dHB1dF9p bWFnZV93aXRoX3JldHJ5KHNlbGYpOgogICAgICAgICAjIFJldHJ5IGEgZmV3IG1vcmUgdGltZXMg YmVjYXVzZSBvcGVuKCkgc29tZXRpbWVzIGZhaWxzIG9uIFdpbmRvd3MsCkBAIC01MDIsOCArNTAy LDExIEBAIGNsYXNzIENocm9taXVtRHJpdmVyKGJhc2UuRHJpdmVyKToKIAogICAgICAgICBydW5f dGltZSA9IHRpbWUudGltZSgpIC0gc3RhcnRfdGltZQogICAgICAgICBvdXRwdXRfaW1hZ2UgPSBz ZWxmLl9vdXRwdXRfaW1hZ2Vfd2l0aF9yZXRyeSgpCi0gICAgICAgIGFzc2VydCBvdXRwdXRfaW1h Z2UgaXMgbm90IE5vbmUKLSAgICAgICAgcmV0dXJuIGJhc2UuRHJpdmVyT3V0cHV0KCcnLmpvaW4o b3V0cHV0KSwgb3V0cHV0X2ltYWdlLCBhY3R1YWxfY2hlY2tzdW0sCisgICAgICAgIHRleHQgPSAn Jy5qb2luKG91dHB1dCkKKyAgICAgICAgaWYgbm90IHRleHQ6CisgICAgICAgICAgICB0ZXh0ID0g Tm9uZQorCisgICAgICAgIHJldHVybiBiYXNlLkRyaXZlck91dHB1dCh0ZXh0LCBvdXRwdXRfaW1h Z2UsIGFjdHVhbF9jaGVja3N1bSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNy YXNoLCBydW5fdGltZSwgdGltZW91dCwgJycuam9pbihlcnJvcikpCiAKICAgICBkZWYgc3RvcChz ZWxmKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvd2Via2l0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93 ZWJraXQucHkKaW5kZXggMDUyMjYzMTQ5NDBjZTllMWZkMmEyY2JhMjg1ZTI1YTJjNmY3MDhiMi4u MjE1MGU0Y2NlNWJmMjQ1ZDdjODhkMTlhYzNjNGJiNDBlNWQxMGU1NSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKQEAgLTQwOSw3 ICs0MDksOCBAQCBjbGFzcyBXZWJLaXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICBoYXZl X3NlZW5fY29udGVudF90eXBlID0gRmFsc2UKICAgICAgICAgYWN0dWFsX2ltYWdlX2hhc2ggPSBO b25lCiAgICAgICAgIG91dHB1dCA9IHN0cigpICAjIFVzZSBhIGJ5dGUgYXJyYXkgZm9yIG91dHB1 dCwgZXZlbiB0aG91Z2ggaXQgc2hvdWxkIGJlIFVURi04LgotICAgICAgICBpbWFnZSA9IHN0cigp CisgICAgICAgIHRleHQgPSBOb25lCisgICAgICAgIGltYWdlID0gTm9uZQogCiAgICAgICAgIHRp bWVvdXQgPSBpbnQoZHJpdmVyX2lucHV0LnRpbWVvdXQpIC8gMTAwMC4wCiAgICAgICAgIGRlYWRs aW5lID0gdGltZS50aW1lKCkgKyB0aW1lb3V0CkBAIC00MjksNiArNDMwLDkgQEAgY2xhc3MgV2Vi S2l0RHJpdmVyKGJhc2UuRHJpdmVyKToKICAgICAgICAgICAgIGxpbmUgPSBzZWxmLl9zZXJ2ZXJf cHJvY2Vzcy5yZWFkX2xpbmUodGltZW91dCkKICAgICAgICAgICAgIHRpbWVvdXQgPSBkZWFkbGlu ZSAtIHRpbWUudGltZSgpCiAKKyAgICAgICAgaWYgb3V0cHV0OgorICAgICAgICAgICAgdGV4dCA9 IG91dHB1dAorCiAgICAgICAgICMgTm93IHJlYWQgYSBzZWNvbmQgYmxvY2sgb2YgdGV4dCBmb3Ig dGhlIG9wdGlvbmFsIGltYWdlIGRhdGEKICAgICAgICAgcmVtYWluaW5nX2xlbmd0aCA9IC0xCiAg ICAgICAgIEhBU0hfSEVBREVSID0gJ0FjdHVhbEhhc2g6ICcKQEAgLTQ1OCw3ICs0NjIsNyBAQCBj bGFzcyBXZWJLaXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICAjIEZJWE1FOiBUaGlzIHNl ZW1zIGxpa2UgdGhlIHdyb25nIHNlY3Rpb24gb2YgY29kZSB0byBiZSBkb2luZwogICAgICAgICAj IHRoaXMgcmVzZXQgaW4uCiAgICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzLmVycm9yID0gIiIK LSAgICAgICAgcmV0dXJuIGJhc2UuRHJpdmVyT3V0cHV0KG91dHB1dCwgaW1hZ2UsIGFjdHVhbF9p bWFnZV9oYXNoLAorICAgICAgICByZXR1cm4gYmFzZS5Ecml2ZXJPdXRwdXQodGV4dCwgaW1hZ2Us IGFjdHVhbF9pbWFnZV9oYXNoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Vs Zi5fc2VydmVyX3Byb2Nlc3MuY3Jhc2hlZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHRpbWUudGltZSgpIC0gc3RhcnRfdGltZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzLnRpbWVkX291dCwK 88755 2011-04-07 19:27:09 -0700 2011-04-08 00:44:55 -0700 Patch bug-58101-20110407192708.patch text/plain 6423 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODMwOTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlOWU5ZTVjZjg5ZWNlNTA4MTEwMDhhNDIyMTg3NDNmNzJj MThhNzljLi5hNThjMjVmN2NmZDU2Y2RkNzg1YWVkNDdmMjViZGI1YjA1MDFkMDM1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDQtMDcgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJr aXQtdGVzdHM6IGNsZWFuIHVwIHRoZSB3YXkgd2UgaGFuZGxlIG1pc3NpbmcgZmlsZXMsCisgICAg ICAgIHRvIGJlIGNvbnNpc3RlbnQuIFdpdGggdGhpcyBjaGFuZ2UsIHRoZSBQb3J0LmV4cGVjdGVk X1goKSBhbmQKKyAgICAgICAgRHJpdmVyLnJ1bl90ZXN0KCkgcm91dGluZXMgc2hvdWxkIHJldHVy biBOb25lIGlmIHRoZXJlIGlzIG5vCisgICAgICAgIG91dHB1dCwgbm90ICcnLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODEwMQorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvc2luZ2xlX3Rl c3RfcnVubmVyLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvd2Via2l0LnB5OgorCiAyMDExLTA0LTA2ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0Bn bWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5n bGVfdGVzdF9ydW5uZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9s YXlvdXRfcGFja2FnZS9zaW5nbGVfdGVzdF9ydW5uZXIucHkKaW5kZXggYThjNzE2ZjhkYzBjMjhk OTI2NWQ4N2Q1Y2E5NWMxZjJhNzliYjAzMy4uZTZiYmZiNjNmMWMyYzE2Njg4ZWRkNWVjOWZlMDE5 N2E0MmE3MDgyMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGF5b3V0X3BhY2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1bm5l ci5weQpAQCAtMjIyLDEzICsyMjIsMTMgQEAgY2xhc3MgU2luZ2xlVGVzdFJ1bm5lcjoKIAogICAg IGRlZiBfY29tcGFyZV90ZXh0KHNlbGYsIGFjdHVhbF90ZXh0LCBleHBlY3RlZF90ZXh0KToKICAg ICAgICAgZmFpbHVyZXMgPSBbXQotICAgICAgICBpZiBzZWxmLl9wb3J0LmNvbXBhcmVfdGV4dChz ZWxmLl9nZXRfbm9ybWFsaXplZF9vdXRwdXRfdGV4dChhY3R1YWxfdGV4dCksCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICMgQXNzdW1pbmcgZXhwZWN0ZWRfdGV4dCBpcyBhbHJl YWR5IG5vcm1hbGl6ZWQuCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4cGVj dGVkX3RleHQpOgotICAgICAgICAgICAgaWYgZXhwZWN0ZWRfdGV4dCA9PSAnJzoKLSAgICAgICAg ICAgICAgICBmYWlsdXJlcy5hcHBlbmQodGVzdF9mYWlsdXJlcy5GYWlsdXJlTWlzc2luZ1Jlc3Vs dCgpKQotICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBmYWlsdXJlcy5hcHBlbmQo dGVzdF9mYWlsdXJlcy5GYWlsdXJlVGV4dE1pc21hdGNoKCkpCisgICAgICAgIGlmIChleHBlY3Rl ZF90ZXh0IGFuZCBhY3R1YWxfdGV4dCBhbmQKKyAgICAgICAgICAgIHNlbGYuX3BvcnQuY29tcGFy ZV90ZXh0KHNlbGYuX2dldF9ub3JtYWxpemVkX291dHB1dF90ZXh0KGFjdHVhbF90ZXh0KSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMgQXNzdW1pbmcgZXhwZWN0ZWRfdGV4 dCBpcyBhbHJlYWR5IG5vcm1hbGl6ZWQuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBleHBlY3RlZF90ZXh0KSk6CisgICAgICAgICAgICBmYWlsdXJlcy5hcHBlbmQodGVzdF9m YWlsdXJlcy5GYWlsdXJlVGV4dE1pc21hdGNoKCkpCisgICAgICAgIGVsaWYgYWN0dWFsX3RleHQg YW5kIG5vdCBleHBlY3RlZF90ZXh0OgorICAgICAgICAgICAgZmFpbHVyZXMuYXBwZW5kKHRlc3Rf ZmFpbHVyZXMuRmFpbHVyZU1pc3NpbmdSZXN1bHQoKSkKICAgICAgICAgcmV0dXJuIGZhaWx1cmVz CiAKICAgICBkZWYgX2dldF9ub3JtYWxpemVkX291dHB1dF90ZXh0KHNlbGYsIG91dHB1dCk6CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2Uu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5k ZXggYzIwNDg2YzgwNmJlMmYzODRmZjVkODRmZDUzMTYzOTZhM2VmOWNmNi4uMGJhZDExYzllZWJm MDNhNjBiOWEyYTZkMDQ4MDFmMTBiMTMzZGQ4ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQpAQCAtMzUyLDE0ICszNTIsMTUgQEAgY2xh c3MgUG9ydChvYmplY3QpOgogICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5yZWFkX2Jp bmFyeV9maWxlKHBhdGgpCiAKICAgICBkZWYgZXhwZWN0ZWRfdGV4dChzZWxmLCB0ZXN0KToKLSAg ICAgICAgIiIiUmV0dXJucyB0aGUgdGV4dCBvdXRwdXQgd2UgZXhwZWN0IHRoZSB0ZXN0IHRvIHBy b2R1Y2UuCisgICAgICAgICIiIlJldHVybnMgdGhlIHRleHQgb3V0cHV0IHdlIGV4cGVjdCB0aGUg dGVzdCB0byBwcm9kdWNlLCBvciBOb25lCisgICAgICAgIGlmIHdlIGRvbid0IGV4cGVjdCB0aGVy ZSB0byBiZSBhbnkgdGV4dCBvdXRwdXQuCiAgICAgICAgIEVuZC1vZi1saW5lIGNoYXJhY3RlcnMg YXJlIG5vcm1hbGl6ZWQgdG8gJ1xuJy4iIiIKICAgICAgICAgIyBGSVhNRTogRFJUIG91dHB1dCBp cyBhY3R1YWxseSB1dGYtOCwgYnV0IHNpbmNlIHdlIGRvbid0IGRlY29kZSB0aGUKICAgICAgICAg IyBvdXRwdXQgZnJvbSBEUlQgKGluc3RlYWQgdHJlYXRpbmcgaXQgYXMgYSBiaW5hcnkgc3RyaW5n KSwgd2UgcmVhZCB0aGUKICAgICAgICAgIyBiYXNlbGluZXMgYXMgYSBiaW5hcnkgc3RyaW5nLCB0 b28uCiAgICAgICAgIHBhdGggPSBzZWxmLmV4cGVjdGVkX2ZpbGVuYW1lKHRlc3QsICcudHh0JykK ICAgICAgICAgaWYgbm90IHNlbGYucGF0aF9leGlzdHMocGF0aCk6Ci0gICAgICAgICAgICByZXR1 cm4gJycKKyAgICAgICAgICAgIHJldHVybiBOb25lCiAgICAgICAgIHRleHQgPSBzZWxmLl9maWxl c3lzdGVtLnJlYWRfYmluYXJ5X2ZpbGUocGF0aCkKICAgICAgICAgcmV0dXJuIHRleHQucmVwbGFj ZSgiXHJcbiIsICJcbiIpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CmluZGV4IDUzNmZkMGU1M2JjZTk1MjVmNjRiYWM3M2M4 OWE1YTE1MDAzMmFjZjkuLjE4YjU3MDU4MDE1Nzg0OWM5M2Q3NGY3ODZjNDQ5NzE0N2NmZGUwNjUg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bS5weQpAQCAtNDI1LDcgKzQyNSw3IEBAIGNsYXNzIENocm9taXVtRHJpdmVyKGJhc2Uu RHJpdmVyKToKICAgICAgICAgaWYgcG5nX3BhdGggYW5kIHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0u ZXhpc3RzKHBuZ19wYXRoKToKICAgICAgICAgICAgIHJldHVybiBzZWxmLl9wb3J0Ll9maWxlc3lz dGVtLnJlYWRfYmluYXJ5X2ZpbGUocG5nX3BhdGgpCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAg ICByZXR1cm4gJycKKyAgICAgICAgICAgIHJldHVybiBOb25lCiAKICAgICBkZWYgX291dHB1dF9p bWFnZV93aXRoX3JldHJ5KHNlbGYpOgogICAgICAgICAjIFJldHJ5IGEgZmV3IG1vcmUgdGltZXMg YmVjYXVzZSBvcGVuKCkgc29tZXRpbWVzIGZhaWxzIG9uIFdpbmRvd3MsCkBAIC01MDIsOCArNTAy LDExIEBAIGNsYXNzIENocm9taXVtRHJpdmVyKGJhc2UuRHJpdmVyKToKIAogICAgICAgICBydW5f dGltZSA9IHRpbWUudGltZSgpIC0gc3RhcnRfdGltZQogICAgICAgICBvdXRwdXRfaW1hZ2UgPSBz ZWxmLl9vdXRwdXRfaW1hZ2Vfd2l0aF9yZXRyeSgpCi0gICAgICAgIGFzc2VydCBvdXRwdXRfaW1h Z2UgaXMgbm90IE5vbmUKLSAgICAgICAgcmV0dXJuIGJhc2UuRHJpdmVyT3V0cHV0KCcnLmpvaW4o b3V0cHV0KSwgb3V0cHV0X2ltYWdlLCBhY3R1YWxfY2hlY2tzdW0sCisgICAgICAgIHRleHQgPSAn Jy5qb2luKG91dHB1dCkKKyAgICAgICAgaWYgbm90IHRleHQ6CisgICAgICAgICAgICB0ZXh0ID0g Tm9uZQorCisgICAgICAgIHJldHVybiBiYXNlLkRyaXZlck91dHB1dCh0ZXh0LCBvdXRwdXRfaW1h Z2UsIGFjdHVhbF9jaGVja3N1bSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNy YXNoLCBydW5fdGltZSwgdGltZW91dCwgJycuam9pbihlcnJvcikpCiAKICAgICBkZWYgc3RvcChz ZWxmKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvd2Via2l0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93 ZWJraXQucHkKaW5kZXggMDUyMjYzMTQ5NDBjZTllMWZkMmEyY2JhMjg1ZTI1YTJjNmY3MDhiMi4u MjE1MGU0Y2NlNWJmMjQ1ZDdjODhkMTlhYzNjNGJiNDBlNWQxMGU1NSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKQEAgLTQwOSw3 ICs0MDksOCBAQCBjbGFzcyBXZWJLaXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICBoYXZl X3NlZW5fY29udGVudF90eXBlID0gRmFsc2UKICAgICAgICAgYWN0dWFsX2ltYWdlX2hhc2ggPSBO b25lCiAgICAgICAgIG91dHB1dCA9IHN0cigpICAjIFVzZSBhIGJ5dGUgYXJyYXkgZm9yIG91dHB1 dCwgZXZlbiB0aG91Z2ggaXQgc2hvdWxkIGJlIFVURi04LgotICAgICAgICBpbWFnZSA9IHN0cigp CisgICAgICAgIHRleHQgPSBOb25lCisgICAgICAgIGltYWdlID0gTm9uZQogCiAgICAgICAgIHRp bWVvdXQgPSBpbnQoZHJpdmVyX2lucHV0LnRpbWVvdXQpIC8gMTAwMC4wCiAgICAgICAgIGRlYWRs aW5lID0gdGltZS50aW1lKCkgKyB0aW1lb3V0CkBAIC00MjksNiArNDMwLDkgQEAgY2xhc3MgV2Vi S2l0RHJpdmVyKGJhc2UuRHJpdmVyKToKICAgICAgICAgICAgIGxpbmUgPSBzZWxmLl9zZXJ2ZXJf cHJvY2Vzcy5yZWFkX2xpbmUodGltZW91dCkKICAgICAgICAgICAgIHRpbWVvdXQgPSBkZWFkbGlu ZSAtIHRpbWUudGltZSgpCiAKKyAgICAgICAgaWYgb3V0cHV0OgorICAgICAgICAgICAgdGV4dCA9 IG91dHB1dAorCiAgICAgICAgICMgTm93IHJlYWQgYSBzZWNvbmQgYmxvY2sgb2YgdGV4dCBmb3Ig dGhlIG9wdGlvbmFsIGltYWdlIGRhdGEKICAgICAgICAgcmVtYWluaW5nX2xlbmd0aCA9IC0xCiAg ICAgICAgIEhBU0hfSEVBREVSID0gJ0FjdHVhbEhhc2g6ICcKQEAgLTQ1OCw3ICs0NjIsNyBAQCBj bGFzcyBXZWJLaXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICAjIEZJWE1FOiBUaGlzIHNl ZW1zIGxpa2UgdGhlIHdyb25nIHNlY3Rpb24gb2YgY29kZSB0byBiZSBkb2luZwogICAgICAgICAj IHRoaXMgcmVzZXQgaW4uCiAgICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzLmVycm9yID0gIiIK LSAgICAgICAgcmV0dXJuIGJhc2UuRHJpdmVyT3V0cHV0KG91dHB1dCwgaW1hZ2UsIGFjdHVhbF9p bWFnZV9oYXNoLAorICAgICAgICByZXR1cm4gYmFzZS5Ecml2ZXJPdXRwdXQodGV4dCwgaW1hZ2Us IGFjdHVhbF9pbWFnZV9oYXNoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Vs Zi5fc2VydmVyX3Byb2Nlc3MuY3Jhc2hlZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHRpbWUudGltZSgpIC0gc3RhcnRfdGltZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzLnRpbWVkX291dCwK