61819 2011-05-31 16:25:48 -0700 nrwt: make webaudio work w/o content-length header 2011-06-03 14:00:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth ademar crogers eric ojan tony oldest_to_newest 412973 0 dpranke 2011-05-31 16:25:48 -0700 nrwt: make webaudio work w/o content-length header 412975 1 95506 dpranke 2011-05-31 16:27:42 -0700 Created attachment 95506 Patch 412980 2 dpranke 2011-05-31 16:34:00 -0700 This patch reworks the logic used by the webkit implementations for parsing the output from DRT. Chromium uses a completely different mechanism for audio so it isn't affected. Testing this revealed related issues with --print trace-everything and the mock_drt implementation that weren't handling audio properly, so those have been rolled into this as well. 413013 3 95517 dpranke 2011-05-31 17:22:18 -0700 Created attachment 95517 restore newlines in DRT output 413446 4 95517 tony 2011-06-01 09:48:40 -0700 Comment on attachment 95517 restore newlines in DRT output View in context: https://bugs.webkit.org/attachment.cgi?id=95517&action=review > Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py:319 > + self._print_baseline(filename, '.txt') > + self._print_baseline(filename, '.wav') > + self._print_baseline(filename, '.png') Nit: Maybe make this a for loop (one less line of code)? > Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:150 > + if driver_output.text: > + self._save_baseline_data(driver_output.text, ".txt", Nit: Should we just have _safe_baseline_data bail out if the first param is None? 413473 5 95517 dpranke 2011-06-01 10:31:54 -0700 Comment on attachment 95517 restore newlines in DRT output View in context: https://bugs.webkit.org/attachment.cgi?id=95517&action=review >> Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py:319 >> + self._print_baseline(filename, '.png') > > Nit: Maybe make this a for loop (one less line of code)? Will do. >> Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:150 >> + self._save_baseline_data(driver_output.text, ".txt", > > Nit: Should we just have _safe_baseline_data bail out if the first param is None? Will do. I think it's a bit of a toss-up which way is clearer. 413646 6 95658 dpranke 2011-06-01 14:05:34 -0700 Created attachment 95658 update patch w/ feedback from Tony 413648 7 dpranke 2011-06-01 14:09:14 -0700 Committed r87847: <http://trac.webkit.org/changeset/87847> 415158 8 ademar 2011-06-03 14:00:56 -0700 Revision r87847 cherry-picked into qtwebkit-2.2 with commit c783730 <http://gitorious.org/webkit/qtwebkit/commit/c783730> 95506 2011-05-31 16:27:42 -0700 2011-05-31 17:22:15 -0700 Patch bug-61819-20110531162741.patch text/plain 6476 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODc2OTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNmU5ZDE0ZTEyN2M4MzZkMzcwNGQxMDAzMDY1ZjFiNmQ1 M2VlZDc0Li4wNjUyMGIyODViNjJiNDdmZjNmNGFkYjJhMjBlZmI1Y2Y0MzJhY2UxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDUtMzEgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dDogbWFrZSB3 ZWJhdWRpbyB3b3JrIHcvbyBjb250ZW50LWxlbmd0aCBoZWFkZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxODE5CisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmludGluZy5weToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVf dGVzdF9ydW5uZXIucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9tb2NrX2RydC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3dlYmtpdC5weToKKwogMjAxMS0wNS0zMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29u LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0 X3BhY2thZ2UvcHJpbnRpbmcucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9sYXlvdXRfcGFja2FnZS9wcmludGluZy5weQppbmRleCA1M2NmMTUwYzBiZmVhMzFkMjY1YmNm ODM4MTcyODk5Njg2OWYyMDllLi4wZmM1Nzk4ZmRmNDlkYmU0MzdhNTFhZmI3OWQ4Njg1OTQ4OTM2 ZWYzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlv dXRfcGFja2FnZS9wcmludGluZy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmludGluZy5weQpAQCAtMzE0LDIzICszMTQsMjIgQEAg Y2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICBmaWxlbmFtZSA9IHJlc3VsdC5maWxlbmFt ZQogICAgICAgICB0ZXN0X25hbWUgPSBzZWxmLl9wb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUo ZmlsZW5hbWUpCiAgICAgICAgIHNlbGYuX3dyaXRlKCd0cmFjZTogJXMnICUgdGVzdF9uYW1lKQot ICAgICAgICB0eHRfZmlsZSA9IHNlbGYuX3BvcnQuZXhwZWN0ZWRfZmlsZW5hbWUoZmlsZW5hbWUs ICcudHh0JykKLSAgICAgICAgaWYgc2VsZi5fcG9ydC5wYXRoX2V4aXN0cyh0eHRfZmlsZSk6Ci0g ICAgICAgICAgICBzZWxmLl93cml0ZSgnICB0eHQ6ICVzJyAlCi0gICAgICAgICAgICAgICAgICAg ICAgICBzZWxmLl9wb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUodHh0X2ZpbGUpKQotICAgICAg ICBlbHNlOgotICAgICAgICAgICAgc2VsZi5fd3JpdGUoJyAgdHh0OiA8bm9uZT4nKQotICAgICAg ICBwbmdfZmlsZSA9IHNlbGYuX3BvcnQuZXhwZWN0ZWRfZmlsZW5hbWUoZmlsZW5hbWUsICcucG5n JykKLSAgICAgICAgaWYgc2VsZi5fcG9ydC5wYXRoX2V4aXN0cyhwbmdfZmlsZSk6Ci0gICAgICAg ICAgICBzZWxmLl93cml0ZSgnICBwbmc6ICVzJyAlCi0gICAgICAgICAgICAgICAgICAgICAgICBz ZWxmLl9wb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUocG5nX2ZpbGUpKQotICAgICAgICBlbHNl OgotICAgICAgICAgICAgc2VsZi5fd3JpdGUoJyAgcG5nOiA8bm9uZT4nKQorICAgICAgICBzZWxm Ll9wcmludF9iYXNlbGluZShmaWxlbmFtZSwgJy50eHQnKQorICAgICAgICBzZWxmLl9wcmludF9i YXNlbGluZShmaWxlbmFtZSwgJy53YXYnKQorICAgICAgICBzZWxmLl9wcmludF9iYXNlbGluZShm aWxlbmFtZSwgJy5wbmcnKQogICAgICAgICBzZWxmLl93cml0ZSgnICBleHA6ICVzJyAlIGV4cF9z dHIpCiAgICAgICAgIHNlbGYuX3dyaXRlKCcgIGdvdDogJXMnICUgZ290X3N0cikKICAgICAgICAg c2VsZi5fd3JpdGUoJyB0b29rOiAlLS4zZicgJSByZXN1bHQudGVzdF9ydW5fdGltZSkKICAgICAg ICAgc2VsZi5fd3JpdGUoJycpCiAKKyAgICBkZWYgX3ByaW50X2Jhc2VsaW5lKHNlbGYsIGZpbGVu YW1lLCBleHRlbnNpb24pOgorICAgICAgICBiYXNlbGluZSA9IHNlbGYuX3BvcnQuZXhwZWN0ZWRf ZmlsZW5hbWUoZmlsZW5hbWUsIGV4dGVuc2lvbikKKyAgICAgICAgaWYgc2VsZi5fcG9ydC5wYXRo X2V4aXN0cyhiYXNlbGluZSk6CisgICAgICAgICAgICByZWxwYXRoID0gc2VsZi5fcG9ydC5yZWxh dGl2ZV90ZXN0X2ZpbGVuYW1lKGJhc2VsaW5lKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAg cmVscGF0aCA9ICc8bm9uZT4nCisgICAgICAgIHNlbGYuX3dyaXRlKCcgICVzOiAlcycgJSAoZXh0 ZW5zaW9uWzE6XSwgcmVscGF0aCkpCisKICAgICBkZWYgX3ByaW50X3VuZXhwZWN0ZWRfdGVzdF9y ZXN1bHQoc2VsZiwgcmVzdWx0KToKICAgICAgICAgIiIiUHJpbnRzIG9uZSB1bmV4cGVjdGVkIHRl c3QgcmVzdWx0IGxpbmUuIiIiCiAgICAgICAgIGRlc2MgPSBUZXN0RXhwZWN0YXRpb25zLkVYUEVD VEFUSU9OX0RFU0NSSVBUSU9OU1tyZXN1bHQudHlwZV1bMF0KZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1 bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNr YWdlL3NpbmdsZV90ZXN0X3J1bm5lci5weQppbmRleCAyODRjNzMyZmY4MzQzZDUwMGUzYmY3NmNl ODM2MWM5OGE5ZmE1Y2U1Li41NmYzMGJmZDRjZTc2YWU0NTUxNDc2N2RmMTI5NGQ5ZWZjOTczODMw IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRf cGFja2FnZS9zaW5nbGVfdGVzdF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CkBAIC0x NDYsOCArMTQ2LDkgQEAgY2xhc3MgU2luZ2xlVGVzdFJ1bm5lcjoKICAgICAgICAgIyBBbHRob3Vn aCBhbGwgdGVzdF9zaGVsbC9EdW1wUmVuZGVyVHJlZSBvdXRwdXQgc2hvdWxkIGJlIHV0Zi04LAog ICAgICAgICAjIHdlIGRvIG5vdCBldmVyIGRlY29kZSBpdCBpbnNpZGUgcnVuLXdlYmtpdC10ZXN0 cy4gIEZvciBzb21lIHRlc3RzCiAgICAgICAgICMgRHVtcFJlbmRlclRyZWUgbWF5IG5vdCBvdXRw dXQgdXRmLTggdGV4dCAoZS5nLiB3ZWJhcmNoaXZlcykuCi0gICAgICAgIHNlbGYuX3NhdmVfYmFz ZWxpbmVfZGF0YShkcml2ZXJfb3V0cHV0LnRleHQsICIudHh0IiwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGdlbmVyYXRlX25ld19iYXNlbGluZT1zZWxmLl9vcHRpb25zLm5ld19i YXNlbGluZSkKKyAgICAgICAgaWYgZHJpdmVyX291dHB1dC50ZXh0OgorICAgICAgICAgICAgc2Vs Zi5fc2F2ZV9iYXNlbGluZV9kYXRhKGRyaXZlcl9vdXRwdXQudGV4dCwgIi50eHQiLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdlbmVyYXRlX25ld19iYXNlbGluZT1zZWxm Ll9vcHRpb25zLm5ld19iYXNlbGluZSkKICAgICAgICAgaWYgZHJpdmVyX291dHB1dC5hdWRpbzoK ICAgICAgICAgICAgIHNlbGYuX3NhdmVfYmFzZWxpbmVfZGF0YShkcml2ZXJfb3V0cHV0LmF1ZGlv LCAnLndhdicsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2VuZXJhdGVf bmV3X2Jhc2VsaW5lPXNlbGYuX29wdGlvbnMubmV3X2Jhc2VsaW5lKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnQucHkKaW5kZXggNzM5 NjdjZmJmZjg2NTdhZGQ3NTYzYzQ3ZGZhMzI0YWEyY2I1Mjc3My4uZGQ1ZTE5MGZkYjUwNGEwNDgy ODMzM2UxZDI4YzQ3MDFhOGVlMTRjOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0LnB5CkBAIC0yMTYsNyArMjE2LDYgQEAgY2xh c3MgTW9ja0RSVChvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5fc3Rkb3V0LndyaXRlKCdDb250 ZW50LVR5cGU6IGF1ZGlvL3dhdlxuJykKICAgICAgICAgICAgIHNlbGYuX3N0ZG91dC53cml0ZSgn Q29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogYmFzZTY0XG4nKQogICAgICAgICAgICAgb3V0cHV0 ID0gYmFzZTY0LmI2NGVuY29kZShhY3R1YWxfYXVkaW8pCi0gICAgICAgICAgICBzZWxmLl9zdGRv dXQud3JpdGUoJ0NvbnRlbnQtTGVuZ3RoOiAlc1xuJyAlIGxlbihvdXRwdXQpKQogICAgICAgICAg ICAgc2VsZi5fc3Rkb3V0LndyaXRlKG91dHB1dCkKICAgICAgICAgZWxzZToKICAgICAgICAgICAg IHNlbGYuX3N0ZG91dC53cml0ZSgnQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluXG4nKQpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQppbmRl eCBhZWUwNzg5ODBkZDQyMTljNDRlYzUyYzk3YTUzY2E4MGIyMWM4Y2Q4Li4zMDU4ZWM0MGRhZmIz YTQ1MDk5NDZhNTI3MTFmOWZhNzM3NmRkNjIxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQpAQCAtNDcxLDkgKzQ3MSwxMyBAQCBj bGFzcyBXZWJLaXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICBjb250ZW50ID0gJycKICAg ICAgICAgdGltZW91dCA9IGRlYWRsaW5lIC0gdGltZS50aW1lKCkKICAgICAgICAgbGluZSA9IHNl bGYuX3NlcnZlcl9wcm9jZXNzLnJlYWRfbGluZSh0aW1lb3V0KQotICAgICAgICB3aGlsZSAobm90 IHNlbGYuX3NlcnZlcl9wcm9jZXNzLnRpbWVkX291dAotICAgICAgICAgICAgICAgYW5kIG5vdCBz ZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5jcmFzaGVkCi0gICAgICAgICAgICAgICBhbmQgbGluZS5yc3Ry aXAoKSAhPSAiI0VPRiIpOgorICAgICAgICBlb2YgPSBGYWxzZQorICAgICAgICB3aGlsZSAobm90 IHNlbGYuX3NlcnZlcl9wcm9jZXNzLnRpbWVkX291dCBhbmQgbm90IHNlbGYuX3NlcnZlcl9wcm9j ZXNzLmNyYXNoZWQgYW5kIG5vdCBlb2YpOgorICAgICAgICAgICAgbGluZSA9IGxpbmUucnN0cmlw KCkKKyAgICAgICAgICAgIGlmIGxpbmUuZW5kc3dpdGgoIiNFT0YiKToKKyAgICAgICAgICAgICAg ICBlb2YgPSBUcnVlCisgICAgICAgICAgICAgICAgbGluZSA9IGxpbmVbOi00XQorCiAgICAgICAg ICAgICBpZiBsaW5lLnN0YXJ0c3dpdGgoVFlQRV9IRUFERVIpIGFuZCBjb250ZW50X3R5cGUgaXMg Tm9uZToKICAgICAgICAgICAgICAgICBjb250ZW50X3R5cGUgPSBsaW5lLnNwbGl0KClbMV0KICAg ICAgICAgICAgIGVsaWYgbGluZS5zdGFydHN3aXRoKEVOQ09ESU5HX0hFQURFUikgYW5kIGVuY29k aW5nIGlzIE5vbmU6CkBAIC00ODYsMTAgKzQ5MCwxMSBAQCBjbGFzcyBXZWJLaXREcml2ZXIoYmFz ZS5Ecml2ZXIpOgogICAgICAgICAgICAgICAgIGNvbnRlbnQgPSBzZWxmLl9zZXJ2ZXJfcHJvY2Vz cy5yZWFkKHRpbWVvdXQsIGNvbnRlbnRfbGVuZ3RoKQogICAgICAgICAgICAgZWxpZiBsaW5lLnN0 YXJ0c3dpdGgoSEFTSF9IRUFERVIpOgogICAgICAgICAgICAgICAgIGNvbnRlbnRfaGFzaCA9IGxp bmUuc3BsaXQoKVsxXQotICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgIGVsaWYgbGluZToK ICAgICAgICAgICAgICAgICBjb250ZW50ICs9IGxpbmUKLSAgICAgICAgICAgIGxpbmUgPSBzZWxm Ll9zZXJ2ZXJfcHJvY2Vzcy5yZWFkX2xpbmUodGltZW91dCkKLSAgICAgICAgICAgIHRpbWVvdXQg PSBkZWFkbGluZSAtIHRpbWUudGltZSgpCisgICAgICAgICAgICBpZiBub3QgZW9mOgorICAgICAg ICAgICAgICAgIGxpbmUgPSBzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5yZWFkX2xpbmUodGltZW91dCkK KyAgICAgICAgICAgICAgICB0aW1lb3V0ID0gZGVhZGxpbmUgLSB0aW1lLnRpbWUoKQogICAgICAg ICByZXR1cm4gQ29udGVudEJsb2NrKGNvbnRlbnRfdHlwZSwgZW5jb2RpbmcsIGNvbnRlbnRfaGFz aCwgY29udGVudCkKIAogICAgIGRlZiBzdG9wKHNlbGYpOgo= 95517 2011-05-31 17:22:18 -0700 2011-06-01 14:05:30 -0700 restore newlines in DRT output bug-61819-20110531172217.patch text/plain 6500 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODc2OTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNmU5ZDE0ZTEyN2M4MzZkMzcwNGQxMDAzMDY1ZjFiNmQ1 M2VlZDc0Li4wNjUyMGIyODViNjJiNDdmZjNmNGFkYjJhMjBlZmI1Y2Y0MzJhY2UxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDUtMzEgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dDogbWFrZSB3 ZWJhdWRpbyB3b3JrIHcvbyBjb250ZW50LWxlbmd0aCBoZWFkZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxODE5CisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmludGluZy5weToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVf dGVzdF9ydW5uZXIucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9tb2NrX2RydC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3dlYmtpdC5weToKKwogMjAxMS0wNS0zMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29u LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0 X3BhY2thZ2UvcHJpbnRpbmcucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9sYXlvdXRfcGFja2FnZS9wcmludGluZy5weQppbmRleCA1M2NmMTUwYzBiZmVhMzFkMjY1YmNm ODM4MTcyODk5Njg2OWYyMDllLi4wZmM1Nzk4ZmRmNDlkYmU0MzdhNTFhZmI3OWQ4Njg1OTQ4OTM2 ZWYzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlv dXRfcGFja2FnZS9wcmludGluZy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmludGluZy5weQpAQCAtMzE0LDIzICszMTQsMjIgQEAg Y2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICBmaWxlbmFtZSA9IHJlc3VsdC5maWxlbmFt ZQogICAgICAgICB0ZXN0X25hbWUgPSBzZWxmLl9wb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUo ZmlsZW5hbWUpCiAgICAgICAgIHNlbGYuX3dyaXRlKCd0cmFjZTogJXMnICUgdGVzdF9uYW1lKQot ICAgICAgICB0eHRfZmlsZSA9IHNlbGYuX3BvcnQuZXhwZWN0ZWRfZmlsZW5hbWUoZmlsZW5hbWUs ICcudHh0JykKLSAgICAgICAgaWYgc2VsZi5fcG9ydC5wYXRoX2V4aXN0cyh0eHRfZmlsZSk6Ci0g ICAgICAgICAgICBzZWxmLl93cml0ZSgnICB0eHQ6ICVzJyAlCi0gICAgICAgICAgICAgICAgICAg ICAgICBzZWxmLl9wb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUodHh0X2ZpbGUpKQotICAgICAg ICBlbHNlOgotICAgICAgICAgICAgc2VsZi5fd3JpdGUoJyAgdHh0OiA8bm9uZT4nKQotICAgICAg ICBwbmdfZmlsZSA9IHNlbGYuX3BvcnQuZXhwZWN0ZWRfZmlsZW5hbWUoZmlsZW5hbWUsICcucG5n JykKLSAgICAgICAgaWYgc2VsZi5fcG9ydC5wYXRoX2V4aXN0cyhwbmdfZmlsZSk6Ci0gICAgICAg ICAgICBzZWxmLl93cml0ZSgnICBwbmc6ICVzJyAlCi0gICAgICAgICAgICAgICAgICAgICAgICBz ZWxmLl9wb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUocG5nX2ZpbGUpKQotICAgICAgICBlbHNl OgotICAgICAgICAgICAgc2VsZi5fd3JpdGUoJyAgcG5nOiA8bm9uZT4nKQorICAgICAgICBzZWxm Ll9wcmludF9iYXNlbGluZShmaWxlbmFtZSwgJy50eHQnKQorICAgICAgICBzZWxmLl9wcmludF9i YXNlbGluZShmaWxlbmFtZSwgJy53YXYnKQorICAgICAgICBzZWxmLl9wcmludF9iYXNlbGluZShm aWxlbmFtZSwgJy5wbmcnKQogICAgICAgICBzZWxmLl93cml0ZSgnICBleHA6ICVzJyAlIGV4cF9z dHIpCiAgICAgICAgIHNlbGYuX3dyaXRlKCcgIGdvdDogJXMnICUgZ290X3N0cikKICAgICAgICAg c2VsZi5fd3JpdGUoJyB0b29rOiAlLS4zZicgJSByZXN1bHQudGVzdF9ydW5fdGltZSkKICAgICAg ICAgc2VsZi5fd3JpdGUoJycpCiAKKyAgICBkZWYgX3ByaW50X2Jhc2VsaW5lKHNlbGYsIGZpbGVu YW1lLCBleHRlbnNpb24pOgorICAgICAgICBiYXNlbGluZSA9IHNlbGYuX3BvcnQuZXhwZWN0ZWRf ZmlsZW5hbWUoZmlsZW5hbWUsIGV4dGVuc2lvbikKKyAgICAgICAgaWYgc2VsZi5fcG9ydC5wYXRo X2V4aXN0cyhiYXNlbGluZSk6CisgICAgICAgICAgICByZWxwYXRoID0gc2VsZi5fcG9ydC5yZWxh dGl2ZV90ZXN0X2ZpbGVuYW1lKGJhc2VsaW5lKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAg cmVscGF0aCA9ICc8bm9uZT4nCisgICAgICAgIHNlbGYuX3dyaXRlKCcgICVzOiAlcycgJSAoZXh0 ZW5zaW9uWzE6XSwgcmVscGF0aCkpCisKICAgICBkZWYgX3ByaW50X3VuZXhwZWN0ZWRfdGVzdF9y ZXN1bHQoc2VsZiwgcmVzdWx0KToKICAgICAgICAgIiIiUHJpbnRzIG9uZSB1bmV4cGVjdGVkIHRl c3QgcmVzdWx0IGxpbmUuIiIiCiAgICAgICAgIGRlc2MgPSBUZXN0RXhwZWN0YXRpb25zLkVYUEVD VEFUSU9OX0RFU0NSSVBUSU9OU1tyZXN1bHQudHlwZV1bMF0KZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1 bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNr YWdlL3NpbmdsZV90ZXN0X3J1bm5lci5weQppbmRleCAyODRjNzMyZmY4MzQzZDUwMGUzYmY3NmNl ODM2MWM5OGE5ZmE1Y2U1Li41NmYzMGJmZDRjZTc2YWU0NTUxNDc2N2RmMTI5NGQ5ZWZjOTczODMw IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRf cGFja2FnZS9zaW5nbGVfdGVzdF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CkBAIC0x NDYsOCArMTQ2LDkgQEAgY2xhc3MgU2luZ2xlVGVzdFJ1bm5lcjoKICAgICAgICAgIyBBbHRob3Vn aCBhbGwgdGVzdF9zaGVsbC9EdW1wUmVuZGVyVHJlZSBvdXRwdXQgc2hvdWxkIGJlIHV0Zi04LAog ICAgICAgICAjIHdlIGRvIG5vdCBldmVyIGRlY29kZSBpdCBpbnNpZGUgcnVuLXdlYmtpdC10ZXN0 cy4gIEZvciBzb21lIHRlc3RzCiAgICAgICAgICMgRHVtcFJlbmRlclRyZWUgbWF5IG5vdCBvdXRw dXQgdXRmLTggdGV4dCAoZS5nLiB3ZWJhcmNoaXZlcykuCi0gICAgICAgIHNlbGYuX3NhdmVfYmFz ZWxpbmVfZGF0YShkcml2ZXJfb3V0cHV0LnRleHQsICIudHh0IiwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGdlbmVyYXRlX25ld19iYXNlbGluZT1zZWxmLl9vcHRpb25zLm5ld19i YXNlbGluZSkKKyAgICAgICAgaWYgZHJpdmVyX291dHB1dC50ZXh0OgorICAgICAgICAgICAgc2Vs Zi5fc2F2ZV9iYXNlbGluZV9kYXRhKGRyaXZlcl9vdXRwdXQudGV4dCwgIi50eHQiLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdlbmVyYXRlX25ld19iYXNlbGluZT1zZWxm Ll9vcHRpb25zLm5ld19iYXNlbGluZSkKICAgICAgICAgaWYgZHJpdmVyX291dHB1dC5hdWRpbzoK ICAgICAgICAgICAgIHNlbGYuX3NhdmVfYmFzZWxpbmVfZGF0YShkcml2ZXJfb3V0cHV0LmF1ZGlv LCAnLndhdicsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2VuZXJhdGVf bmV3X2Jhc2VsaW5lPXNlbGYuX29wdGlvbnMubmV3X2Jhc2VsaW5lKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnQucHkKaW5kZXggNzM5 NjdjZmJmZjg2NTdhZGQ3NTYzYzQ3ZGZhMzI0YWEyY2I1Mjc3My4uZGQ1ZTE5MGZkYjUwNGEwNDgy ODMzM2UxZDI4YzQ3MDFhOGVlMTRjOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0LnB5CkBAIC0yMTYsNyArMjE2LDYgQEAgY2xh c3MgTW9ja0RSVChvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5fc3Rkb3V0LndyaXRlKCdDb250 ZW50LVR5cGU6IGF1ZGlvL3dhdlxuJykKICAgICAgICAgICAgIHNlbGYuX3N0ZG91dC53cml0ZSgn Q29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogYmFzZTY0XG4nKQogICAgICAgICAgICAgb3V0cHV0 ID0gYmFzZTY0LmI2NGVuY29kZShhY3R1YWxfYXVkaW8pCi0gICAgICAgICAgICBzZWxmLl9zdGRv dXQud3JpdGUoJ0NvbnRlbnQtTGVuZ3RoOiAlc1xuJyAlIGxlbihvdXRwdXQpKQogICAgICAgICAg ICAgc2VsZi5fc3Rkb3V0LndyaXRlKG91dHB1dCkKICAgICAgICAgZWxzZToKICAgICAgICAgICAg IHNlbGYuX3N0ZG91dC53cml0ZSgnQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluXG4nKQpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQppbmRl eCBhZWUwNzg5ODBkZDQyMTljNDRlYzUyYzk3YTUzY2E4MGIyMWM4Y2Q4Li5iYmM1NjNkYmE0ZDc4 NDM4MGQ3MzUzNDU3MDM4YTg5MTJlNjliNGM2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQpAQCAtNDcxLDkgKzQ3MSwxMyBAQCBj bGFzcyBXZWJLaXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICBjb250ZW50ID0gJycKICAg ICAgICAgdGltZW91dCA9IGRlYWRsaW5lIC0gdGltZS50aW1lKCkKICAgICAgICAgbGluZSA9IHNl bGYuX3NlcnZlcl9wcm9jZXNzLnJlYWRfbGluZSh0aW1lb3V0KQotICAgICAgICB3aGlsZSAobm90 IHNlbGYuX3NlcnZlcl9wcm9jZXNzLnRpbWVkX291dAotICAgICAgICAgICAgICAgYW5kIG5vdCBz ZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5jcmFzaGVkCi0gICAgICAgICAgICAgICBhbmQgbGluZS5yc3Ry aXAoKSAhPSAiI0VPRiIpOgorICAgICAgICBlb2YgPSBGYWxzZQorICAgICAgICB3aGlsZSAobm90 IHNlbGYuX3NlcnZlcl9wcm9jZXNzLnRpbWVkX291dCBhbmQgbm90IHNlbGYuX3NlcnZlcl9wcm9j ZXNzLmNyYXNoZWQgYW5kIG5vdCBlb2YpOgorICAgICAgICAgICAgY2hvbXBlZF9saW5lID0gbGlu ZS5yc3RyaXAoKQorICAgICAgICAgICAgaWYgY2hvbXBlZF9saW5lLmVuZHN3aXRoKCIjRU9GIik6 CisgICAgICAgICAgICAgICAgZW9mID0gVHJ1ZQorICAgICAgICAgICAgICAgIGxpbmUgPSBjaG9t cGVkX2xpbmVbOi00XQorCiAgICAgICAgICAgICBpZiBsaW5lLnN0YXJ0c3dpdGgoVFlQRV9IRUFE RVIpIGFuZCBjb250ZW50X3R5cGUgaXMgTm9uZToKICAgICAgICAgICAgICAgICBjb250ZW50X3R5 cGUgPSBsaW5lLnNwbGl0KClbMV0KICAgICAgICAgICAgIGVsaWYgbGluZS5zdGFydHN3aXRoKEVO Q09ESU5HX0hFQURFUikgYW5kIGVuY29kaW5nIGlzIE5vbmU6CkBAIC00ODYsMTAgKzQ5MCwxMSBA QCBjbGFzcyBXZWJLaXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICAgICAgICAgIGNvbnRl bnQgPSBzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5yZWFkKHRpbWVvdXQsIGNvbnRlbnRfbGVuZ3RoKQog ICAgICAgICAgICAgZWxpZiBsaW5lLnN0YXJ0c3dpdGgoSEFTSF9IRUFERVIpOgogICAgICAgICAg ICAgICAgIGNvbnRlbnRfaGFzaCA9IGxpbmUuc3BsaXQoKVsxXQotICAgICAgICAgICAgZWxzZToK KyAgICAgICAgICAgIGVsaWYgbGluZToKICAgICAgICAgICAgICAgICBjb250ZW50ICs9IGxpbmUK LSAgICAgICAgICAgIGxpbmUgPSBzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5yZWFkX2xpbmUodGltZW91 dCkKLSAgICAgICAgICAgIHRpbWVvdXQgPSBkZWFkbGluZSAtIHRpbWUudGltZSgpCisgICAgICAg ICAgICBpZiBub3QgZW9mOgorICAgICAgICAgICAgICAgIGxpbmUgPSBzZWxmLl9zZXJ2ZXJfcHJv Y2Vzcy5yZWFkX2xpbmUodGltZW91dCkKKyAgICAgICAgICAgICAgICB0aW1lb3V0ID0gZGVhZGxp bmUgLSB0aW1lLnRpbWUoKQogICAgICAgICByZXR1cm4gQ29udGVudEJsb2NrKGNvbnRlbnRfdHlw ZSwgZW5jb2RpbmcsIGNvbnRlbnRfaGFzaCwgY29udGVudCkKIAogICAgIGRlZiBzdG9wKHNlbGYp Ogo= 95658 2011-06-01 14:05:34 -0700 2011-06-01 14:06:05 -0700 update patch w/ feedback from Tony bug-61819-20110601140533.patch text/plain 6890 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODc2OTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNmU5ZDE0ZTEyN2M4MzZkMzcwNGQxMDAzMDY1ZjFiNmQ1 M2VlZDc0Li4wNjUyMGIyODViNjJiNDdmZjNmNGFkYjJhMjBlZmI1Y2Y0MzJhY2UxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDUtMzEgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dDogbWFrZSB3 ZWJhdWRpbyB3b3JrIHcvbyBjb250ZW50LWxlbmd0aCBoZWFkZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxODE5CisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmludGluZy5weToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVf dGVzdF9ydW5uZXIucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9tb2NrX2RydC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3dlYmtpdC5weToKKwogMjAxMS0wNS0zMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29u LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0 X3BhY2thZ2UvcHJpbnRpbmcucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9sYXlvdXRfcGFja2FnZS9wcmludGluZy5weQppbmRleCA1M2NmMTUwYzBiZmVhMzFkMjY1YmNm ODM4MTcyODk5Njg2OWYyMDllLi43NGU1ZjcyZTk2MTFkNTIzMWI5YmE3YzU4NjFhM2NkMjUwM2Zm NmNhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlv dXRfcGFja2FnZS9wcmludGluZy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmludGluZy5weQpAQCAtMzE0LDIzICszMTQsMjEgQEAg Y2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICBmaWxlbmFtZSA9IHJlc3VsdC5maWxlbmFt ZQogICAgICAgICB0ZXN0X25hbWUgPSBzZWxmLl9wb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUo ZmlsZW5hbWUpCiAgICAgICAgIHNlbGYuX3dyaXRlKCd0cmFjZTogJXMnICUgdGVzdF9uYW1lKQot ICAgICAgICB0eHRfZmlsZSA9IHNlbGYuX3BvcnQuZXhwZWN0ZWRfZmlsZW5hbWUoZmlsZW5hbWUs ICcudHh0JykKLSAgICAgICAgaWYgc2VsZi5fcG9ydC5wYXRoX2V4aXN0cyh0eHRfZmlsZSk6Ci0g ICAgICAgICAgICBzZWxmLl93cml0ZSgnICB0eHQ6ICVzJyAlCi0gICAgICAgICAgICAgICAgICAg ICAgICBzZWxmLl9wb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUodHh0X2ZpbGUpKQotICAgICAg ICBlbHNlOgotICAgICAgICAgICAgc2VsZi5fd3JpdGUoJyAgdHh0OiA8bm9uZT4nKQotICAgICAg ICBwbmdfZmlsZSA9IHNlbGYuX3BvcnQuZXhwZWN0ZWRfZmlsZW5hbWUoZmlsZW5hbWUsICcucG5n JykKLSAgICAgICAgaWYgc2VsZi5fcG9ydC5wYXRoX2V4aXN0cyhwbmdfZmlsZSk6Ci0gICAgICAg ICAgICBzZWxmLl93cml0ZSgnICBwbmc6ICVzJyAlCi0gICAgICAgICAgICAgICAgICAgICAgICBz ZWxmLl9wb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUocG5nX2ZpbGUpKQotICAgICAgICBlbHNl OgotICAgICAgICAgICAgc2VsZi5fd3JpdGUoJyAgcG5nOiA8bm9uZT4nKQorICAgICAgICBmb3Ig ZXh0ZW5zaW9uIGluICgnLnR4dCcsICcud2F2JywgJy5wbmcnKToKKyAgICAgICAgICAgIHNlbGYu X3ByaW50X2Jhc2VsaW5lKGZpbGVuYW1lLCBleHRlbnNpb24pCiAgICAgICAgIHNlbGYuX3dyaXRl KCcgIGV4cDogJXMnICUgZXhwX3N0cikKICAgICAgICAgc2VsZi5fd3JpdGUoJyAgZ290OiAlcycg JSBnb3Rfc3RyKQogICAgICAgICBzZWxmLl93cml0ZSgnIHRvb2s6ICUtLjNmJyAlIHJlc3VsdC50 ZXN0X3J1bl90aW1lKQogICAgICAgICBzZWxmLl93cml0ZSgnJykKIAorICAgIGRlZiBfcHJpbnRf YmFzZWxpbmUoc2VsZiwgZmlsZW5hbWUsIGV4dGVuc2lvbik6CisgICAgICAgIGJhc2VsaW5lID0g c2VsZi5fcG9ydC5leHBlY3RlZF9maWxlbmFtZShmaWxlbmFtZSwgZXh0ZW5zaW9uKQorICAgICAg ICBpZiBzZWxmLl9wb3J0LnBhdGhfZXhpc3RzKGJhc2VsaW5lKToKKyAgICAgICAgICAgIHJlbHBh dGggPSBzZWxmLl9wb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUoYmFzZWxpbmUpCisgICAgICAg IGVsc2U6CisgICAgICAgICAgICByZWxwYXRoID0gJzxub25lPicKKyAgICAgICAgc2VsZi5fd3Jp dGUoJyAgJXM6ICVzJyAlIChleHRlbnNpb25bMTpdLCByZWxwYXRoKSkKKwogICAgIGRlZiBfcHJp bnRfdW5leHBlY3RlZF90ZXN0X3Jlc3VsdChzZWxmLCByZXN1bHQpOgogICAgICAgICAiIiJQcmlu dHMgb25lIHVuZXhwZWN0ZWQgdGVzdCByZXN1bHQgbGluZS4iIiIKICAgICAgICAgZGVzYyA9IFRl c3RFeHBlY3RhdGlvbnMuRVhQRUNUQVRJT05fREVTQ1JJUFRJT05TW3Jlc3VsdC50eXBlXVswXQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3Bh Y2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CmluZGV4IDI4NGM3 MzJmZjgzNDNkNTAwZTNiZjc2Y2U4MzYxYzk4YTlmYTVjZTUuLmY3NDY0MzhjYjA1OGU3ZDE5OTA5 ZGU4NzRjMGZhODM5ZTRiNjJjYzkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1bm5lci5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVf dGVzdF9ydW5uZXIucHkKQEAgLTE0OCwxMCArMTQ4LDkgQEAgY2xhc3MgU2luZ2xlVGVzdFJ1bm5l cjoKICAgICAgICAgIyBEdW1wUmVuZGVyVHJlZSBtYXkgbm90IG91dHB1dCB1dGYtOCB0ZXh0IChl LmcuIHdlYmFyY2hpdmVzKS4KICAgICAgICAgc2VsZi5fc2F2ZV9iYXNlbGluZV9kYXRhKGRyaXZl cl9vdXRwdXQudGV4dCwgIi50eHQiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Z2VuZXJhdGVfbmV3X2Jhc2VsaW5lPXNlbGYuX29wdGlvbnMubmV3X2Jhc2VsaW5lKQotICAgICAg ICBpZiBkcml2ZXJfb3V0cHV0LmF1ZGlvOgotICAgICAgICAgICAgc2VsZi5fc2F2ZV9iYXNlbGlu ZV9kYXRhKGRyaXZlcl9vdXRwdXQuYXVkaW8sICcud2F2JywKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBnZW5lcmF0ZV9uZXdfYmFzZWxpbmU9c2VsZi5fb3B0aW9ucy5uZXdf YmFzZWxpbmUpCi0gICAgICAgIGlmIHNlbGYuX29wdGlvbnMucGl4ZWxfdGVzdHMgYW5kIGRyaXZl cl9vdXRwdXQuaW1hZ2U6CisgICAgICAgIHNlbGYuX3NhdmVfYmFzZWxpbmVfZGF0YShkcml2ZXJf b3V0cHV0LmF1ZGlvLCAnLndhdicsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBn ZW5lcmF0ZV9uZXdfYmFzZWxpbmU9c2VsZi5fb3B0aW9ucy5uZXdfYmFzZWxpbmUpCisgICAgICAg IGlmIHNlbGYuX29wdGlvbnMucGl4ZWxfdGVzdHM6CiAgICAgICAgICAgICBzZWxmLl9zYXZlX2Jh c2VsaW5lX2RhdGEoZHJpdmVyX291dHB1dC5pbWFnZSwgIi5wbmciLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGdlbmVyYXRlX25ld19iYXNlbGluZT1zZWxmLl9vcHRpb25z Lm5ld19iYXNlbGluZSkKIApAQCAtMTY3LDcgKzE2Niw4IEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5u ZXI6CiAgICAgICAgICAgZ2VuZXJhdGVfbmV3X2Jhc2VsaW5lOiB3aGV0aGVyIHRvIGVuZXJhdGUg YSBuZXcsIHBsYXRmb3JtLXNwZWNpZmljCiAgICAgICAgICAgICBiYXNlbGluZSwgb3IgdXBkYXRl IHRoZSBleGlzdGluZyBvbmUKICAgICAgICAgIiIiCi0gICAgICAgIGFzc2VydCBkYXRhIGlzIG5v dCBOb25lCisgICAgICAgIGlmIGRhdGEgaXMgTm9uZToKKyAgICAgICAgICAgIHJldHVybgogICAg ICAgICBwb3J0ID0gc2VsZi5fcG9ydAogICAgICAgICBmcyA9IHBvcnQuX2ZpbGVzeXN0ZW0KICAg ICAgICAgaWYgZ2VuZXJhdGVfbmV3X2Jhc2VsaW5lOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnQucHkKaW5kZXggNzM5NjdjZmJmZjg2 NTdhZGQ3NTYzYzQ3ZGZhMzI0YWEyY2I1Mjc3My4uZGQ1ZTE5MGZkYjUwNGEwNDgyODMzM2UxZDI4 YzQ3MDFhOGVlMTRjOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9tb2NrX2RydC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L21vY2tfZHJ0LnB5CkBAIC0yMTYsNyArMjE2LDYgQEAgY2xhc3MgTW9ja0RS VChvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5fc3Rkb3V0LndyaXRlKCdDb250ZW50LVR5cGU6 IGF1ZGlvL3dhdlxuJykKICAgICAgICAgICAgIHNlbGYuX3N0ZG91dC53cml0ZSgnQ29udGVudC1U cmFuc2Zlci1FbmNvZGluZzogYmFzZTY0XG4nKQogICAgICAgICAgICAgb3V0cHV0ID0gYmFzZTY0 LmI2NGVuY29kZShhY3R1YWxfYXVkaW8pCi0gICAgICAgICAgICBzZWxmLl9zdGRvdXQud3JpdGUo J0NvbnRlbnQtTGVuZ3RoOiAlc1xuJyAlIGxlbihvdXRwdXQpKQogICAgICAgICAgICAgc2VsZi5f c3Rkb3V0LndyaXRlKG91dHB1dCkKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNlbGYuX3N0 ZG91dC53cml0ZSgnQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluXG4nKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQppbmRleCBhZWUwNzg5 ODBkZDQyMTljNDRlYzUyYzk3YTUzY2E4MGIyMWM4Y2Q4Li5iYmM1NjNkYmE0ZDc4NDM4MGQ3MzUz NDU3MDM4YTg5MTJlNjliNGM2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQpAQCAtNDcxLDkgKzQ3MSwxMyBAQCBjbGFzcyBXZWJL aXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICBjb250ZW50ID0gJycKICAgICAgICAgdGlt ZW91dCA9IGRlYWRsaW5lIC0gdGltZS50aW1lKCkKICAgICAgICAgbGluZSA9IHNlbGYuX3NlcnZl cl9wcm9jZXNzLnJlYWRfbGluZSh0aW1lb3V0KQotICAgICAgICB3aGlsZSAobm90IHNlbGYuX3Nl cnZlcl9wcm9jZXNzLnRpbWVkX291dAotICAgICAgICAgICAgICAgYW5kIG5vdCBzZWxmLl9zZXJ2 ZXJfcHJvY2Vzcy5jcmFzaGVkCi0gICAgICAgICAgICAgICBhbmQgbGluZS5yc3RyaXAoKSAhPSAi I0VPRiIpOgorICAgICAgICBlb2YgPSBGYWxzZQorICAgICAgICB3aGlsZSAobm90IHNlbGYuX3Nl cnZlcl9wcm9jZXNzLnRpbWVkX291dCBhbmQgbm90IHNlbGYuX3NlcnZlcl9wcm9jZXNzLmNyYXNo ZWQgYW5kIG5vdCBlb2YpOgorICAgICAgICAgICAgY2hvbXBlZF9saW5lID0gbGluZS5yc3RyaXAo KQorICAgICAgICAgICAgaWYgY2hvbXBlZF9saW5lLmVuZHN3aXRoKCIjRU9GIik6CisgICAgICAg ICAgICAgICAgZW9mID0gVHJ1ZQorICAgICAgICAgICAgICAgIGxpbmUgPSBjaG9tcGVkX2xpbmVb Oi00XQorCiAgICAgICAgICAgICBpZiBsaW5lLnN0YXJ0c3dpdGgoVFlQRV9IRUFERVIpIGFuZCBj b250ZW50X3R5cGUgaXMgTm9uZToKICAgICAgICAgICAgICAgICBjb250ZW50X3R5cGUgPSBsaW5l LnNwbGl0KClbMV0KICAgICAgICAgICAgIGVsaWYgbGluZS5zdGFydHN3aXRoKEVOQ09ESU5HX0hF QURFUikgYW5kIGVuY29kaW5nIGlzIE5vbmU6CkBAIC00ODYsMTAgKzQ5MCwxMSBAQCBjbGFzcyBX ZWJLaXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICAgICAgICAgIGNvbnRlbnQgPSBzZWxm Ll9zZXJ2ZXJfcHJvY2Vzcy5yZWFkKHRpbWVvdXQsIGNvbnRlbnRfbGVuZ3RoKQogICAgICAgICAg ICAgZWxpZiBsaW5lLnN0YXJ0c3dpdGgoSEFTSF9IRUFERVIpOgogICAgICAgICAgICAgICAgIGNv bnRlbnRfaGFzaCA9IGxpbmUuc3BsaXQoKVsxXQotICAgICAgICAgICAgZWxzZToKKyAgICAgICAg ICAgIGVsaWYgbGluZToKICAgICAgICAgICAgICAgICBjb250ZW50ICs9IGxpbmUKLSAgICAgICAg ICAgIGxpbmUgPSBzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5yZWFkX2xpbmUodGltZW91dCkKLSAgICAg ICAgICAgIHRpbWVvdXQgPSBkZWFkbGluZSAtIHRpbWUudGltZSgpCisgICAgICAgICAgICBpZiBu b3QgZW9mOgorICAgICAgICAgICAgICAgIGxpbmUgPSBzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5yZWFk X2xpbmUodGltZW91dCkKKyAgICAgICAgICAgICAgICB0aW1lb3V0ID0gZGVhZGxpbmUgLSB0aW1l LnRpbWUoKQogICAgICAgICByZXR1cm4gQ29udGVudEJsb2NrKGNvbnRlbnRfdHlwZSwgZW5jb2Rp bmcsIGNvbnRlbnRfaGFzaCwgY29udGVudCkKIAogICAgIGRlZiBzdG9wKHNlbGYpOgo=