134763 2014-07-09 06:41:49 -0700 W3C test importer should have an option to disable testharness.js/testharnessreport.js link conversion 2014-12-24 16:54:21 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf bjonesbe commit-queue glenn rhauck rniwa oldest_to_newest 1021346 0 youennf 2014-07-09 06:41:49 -0700 Some W3C tests are using functions present in W3C testharness.js, but not in WebKit version. It may just be simpler to import the W3C version and update the test converter to point to that version. The same may be done for testharnessreport.js, but WebKit version should overwrite the W3C version. This would allow the WPT server to correctly send testharness.js and testharnessreport.js. 1021348 1 234632 youennf 2014-07-09 06:47:57 -0700 Created attachment 234632 Patch 1022782 2 235009 youennf 2014-07-16 11:28:00 -0700 Created attachment 235009 Added parameter to resources folder 1035411 3 238159 youennf 2014-09-16 01:37:45 -0700 Created attachment 238159 Updating webkitpy tests 1035566 4 238203 youennf 2014-09-16 13:42:56 -0700 Created attachment 238203 fixing import test executable 1035567 5 238204 youennf 2014-09-16 13:43:30 -0700 Created attachment 238204 fixing import test executable 1036556 6 bjonesbe 2014-09-22 10:39:12 -0700 (In reply to comment #0) > Some W3C tests are using functions present in W3C testharness.js, but not in WebKit version. > It may just be simpler to import the W3C version and update the test converter to point to that version. Why don't we just update the webkit version with the newest upstream changes from the W3C? > The same may be done for testharnessreport.js, but WebKit version should overwrite the W3C version. Are there features in the W3C version of testharnessreport.js that the WPT tests need that aren't in the WebKit version? > This would allow the WPT server to correctly send testharness.js and testharnessreport.js. If we updated the WebKit versions testharness.js and testharnessreport.js, the WPT server could send those instead of having multiple copies in the tree, right? 1036577 7 youennf 2014-09-22 12:47:22 -0700 (In reply to comment #6) > (In reply to comment #0) > > Some W3C tests are using functions present in W3C testharness.js, but not in WebKit version. > > It may just be simpler to import the W3C version and update the test converter to point to that version. > > Why don't we just update the webkit version with the newest upstream changes from the W3C? That is a possibility, but there is always a risk that legacy WebKit tests break. > > The same may be done for testharnessreport.js, but WebKit version should overwrite the W3C version. > > Are there features in the W3C version of testharnessreport.js that the WPT tests need that aren't in the WebKit version? My explanation was not clear. I did not see any issue when using WebKit version. We cannot use W3C version for WebKit test runner to output meaningful results. > > This would allow the WPT server to correctly send testharness.js and testharnessreport.js. > > If we updated the WebKit versions testharness.js and testharnessreport.js, the WPT server could send those instead of having multiple copies in the tree, right? Not directly, the WPT server is implemented to only serve files in his doc_root, which is set to the imported WPT base folder. 1036675 8 238522 youennf 2014-09-23 01:27:01 -0700 Created attachment 238522 Updated changelog 1036742 9 bjonesbe 2014-09-23 09:31:34 -0700 (In reply to comment #7) > (In reply to comment #6) > > (In reply to comment #0) > > > Some W3C tests are using functions present in W3C testharness.js, but not in WebKit version. > > > It may just be simpler to import the W3C version and update the test converter to point to that version. > > > > Why don't we just update the webkit version with the newest upstream changes from the W3C? > > That is a possibility, but there is always a risk that legacy WebKit tests break. I think we should update our copy of testharness.js and fix any tests that break. I don't think that having multiple copies of testharness.js in the tree would be a good thing. > > > This would allow the WPT server to correctly send testharness.js and testharnessreport.js. > > > > If we updated the WebKit versions testharness.js and testharnessreport.js, the WPT server could send those instead of having multiple copies in the tree, right? > > Not directly, the WPT server is implemented to only serve files in his doc_root, which is set to the imported WPT base folder. We could make it possible to serve common resources through the WPT server even if they are outside of the default root, correct? 1036786 10 youennf 2014-09-23 12:19:10 -0700 > I think we should update our copy of testharness.js and fix any tests that break. I don't think that having multiple copies of testharness.js in the tree would be a good thing. Doing so adds burden each time one wants to bump WPT test version. This is manageable as long as done manually. We can try it this way and revisit it later on. > We could make it possible to serve common resources through the WPT server even if they are outside of the default root, correct? Not without hacking the wpt server. I dit in the first version of bug 127094 and would prefer avoiding that. How about copying WebKit testharness.js/testharnessreport.js to WPT resources sub-folder when starting WPT tests run, and to clean that folder at the end of the run? 1036804 11 bjonesbe 2014-09-23 13:04:48 -0700 (In reply to comment #10) > > I think we should update our copy of testharness.js and fix any tests that break. I don't think that having multiple copies of testharness.js in the tree would be a good thing. > > Doing so adds burden each time one wants to bump WPT test version. > This is manageable as long as done manually. > We can try it this way and revisit it later on. How many times do updates to testharness.js have backwards incompatible changes? I'd think they'd like to minimize those, because of the sheer number of tests that use it. So hopefully updating it regularly won't be hard. > > > We could make it possible to serve common resources through the WPT server even if they are outside of the default root, correct? > > Not without hacking the wpt server. > I dit in the first version of bug 127094 and would prefer avoiding that. > > How about copying WebKit testharness.js/testharnessreport.js to WPT resources sub-folder when starting WPT tests run, and to clean that folder at the end of the run? That sounds like a perfectly good plan to me. 1036806 12 238522 bjonesbe 2014-09-23 13:05:19 -0700 Comment on attachment 238522 Updated changelog Just because I don't think we should go this path. 1037216 13 youennf 2014-09-25 05:36:22 -0700 > > How about copying WebKit testharness.js/testharnessreport.js to WPT resources sub-folder when starting WPT tests run, and to clean that folder at the end of the run? > > That sounds like a perfectly good plan to me. But test importer is still converting links to map to WebKit resources folder. How about adding an option to disallow testharness link conversion? 1037229 14 bjonesbe 2014-09-25 08:20:46 -0700 (In reply to comment #13) > > > How about copying WebKit testharness.js/testharnessreport.js to WPT resources sub-folder when starting WPT tests run, and to clean that folder at the end of the run? > > > > That sounds like a perfectly good plan to me. > > But test importer is still converting links to map to WebKit resources folder. > How about adding an option to disallow testharness link conversion? Is there any way to determine from the test itself if it should be converted or not? Do all of the Web Platform Tests need to be served by the HTTP server? 1037240 15 youennf 2014-09-25 09:40:26 -0700 (In reply to comment #14) > (In reply to comment #13) > > > > How about copying WebKit testharness.js/testharnessreport.js to WPT resources sub-folder when starting WPT tests run, and to clean that folder at the end of the run? > > > > > > That sounds like a perfectly good plan to me. > > > > But test importer is still converting links to map to WebKit resources folder. > > How about adding an option to disallow testharness link conversion? > > Is there any way to determine from the test itself if it should be converted or not? Do all of the Web Platform Tests need to be served by the HTTP server? Not from the test itself. We could specify rules using the filename but we would need to keep them in sync with the testname2uri mapping... The original plan was to run all tests through WPT server. If it was taking too much time to run, we could restrict the use of WPT server to some specific folders. That is why the initial idea behind this patch is to convert the absolute testharness URLs as relative URLs (working with both file:// and http:// urls). 1037258 16 bjonesbe 2014-09-25 11:55:42 -0700 (In reply to comment #15) > (In reply to comment #14) > > (In reply to comment #13) > > > > > How about copying WebKit testharness.js/testharnessreport.js to WPT resources sub-folder when starting WPT tests run, and to clean that folder at the end of the run? > > > > > > > > That sounds like a perfectly good plan to me. > > > > > > But test importer is still converting links to map to WebKit resources folder. > > > How about adding an option to disallow testharness link conversion? > > > > Is there any way to determine from the test itself if it should be converted or not? Do all of the Web Platform Tests need to be served by the HTTP server? > > Not from the test itself. > We could specify rules using the filename but we would need to keep them in sync with the testname2uri mapping... Is the testname2uri mapping not stored in the WPT repo? If there's a file there that says which tests need to run using a web server, it seems to me like we could use that during the import process to decide if we should rewrite or not. (And we could use that to configure the WebKit test scripts to only run those tests via the WPT server) The CSSWG's tests have metadata in the test header, for example, that say if the test needs to run on a web server or not. > > The original plan was to run all tests through WPT server. > If it was taking too much time to run, we could restrict the use of WPT server to some specific folders. Are most of the WPT tests intended to be run using the WPT server? How do others run the test suite? To me, aside from any performance concerns, running tests via a server adds another potential point of failure, so I'd like to have it be as simple as possible to run the tests. > > That is why the initial idea behind this patch is to convert the absolute testharness URLs as relative URLs (working with both file:// and http:// urls). If there is no reasonable way to tell which tests need an HTTP server and which don't, then I'm fine with adding a flag to indicate that HTTP server tests are being imported, and use that to not rewrite the testharness URLs. But I feel that's a last resort. 1037291 17 youennf 2014-09-25 14:00:38 -0700 > Is the testname2uri mapping not stored in the WPT repo? If there's a file there that says which tests need to run using a web server, it seems to me like we could use that during the import process to decide if we should rewrite or not. (And we could use that to configure the WebKit test scripts to only run those tests via the WPT server) The CSSWG's tests have metadata in the test header, for example, that say if the test needs to run on a web server or not. I am not aware of any such metadata in WPT. Tests using python scripts URLs and/or XHR seem scattered in various folders (html, XMLHttpRequest, workers...) As of testname2uri mapping, I was meaning the one implemented in WebKit driver.py. Currently, the mapping generates http:// URLs for LayoutTests/http tests and file:// URLs otherwise. As part of patch for bug 127094, another rule would be added for WPT tests. > Are most of the WPT tests intended to be run using the WPT server? How do others run the test suite? To me, aside from any performance concerns, running tests via a server adds another potential point of failure, so I'd like to have it be as simple as possible to run the tests. Firefox seems to run all WPT tests through the WPT server. Blink is not running any WPT test that requires a web server (see http://www.chromium.org/blink/importing-the-w3c-tests) https://code.google.com/p/chromium/issues/detail?id=360762 presents different alternatives. At the end, using python wptserver seems the way to go. WPT tests are designed and tested with that server in mind. 1037313 18 bjonesbe 2014-09-25 15:09:36 -0700 (In reply to comment #17) > > Is the testname2uri mapping not stored in the WPT repo? If there's a file there that says which tests need to run using a web server, it seems to me like we could use that during the import process to decide if we should rewrite or not. (And we could use that to configure the WebKit test scripts to only run those tests via the WPT server) The CSSWG's tests have metadata in the test header, for example, that say if the test needs to run on a web server or not. > > I am not aware of any such metadata in WPT. > Tests using python scripts URLs and/or XHR seem scattered in various folders (html, XMLHttpRequest, workers...) > > As of testname2uri mapping, I was meaning the one implemented in WebKit driver.py. > Currently, the mapping generates http:// URLs for LayoutTests/http tests and file:// URLs otherwise. > As part of patch for bug 127094, another rule would be added for WPT tests. Ok, sounds like we should add the flag for now. Depending on how the performance is, maybe we could consider moving imported CSSWG tests to use the wpt server as well, and never rewriting paths to testharness. 1057582 19 243672 youennf 2014-12-23 06:58:42 -0800 Created attachment 243672 Patch 1057618 20 243672 rniwa 2014-12-23 11:34:47 -0800 Comment on attachment 243672 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243672&action=review > Tools/ChangeLog:8 > + Reviewed by NOBODY (OOPS!). This line should appear before the description but after the bug URL. > Tools/Scripts/webkitpy/w3c/test_importer.py:127 > + parser.add_option('-l', '--no-links-conversion', dest='no_links_conversion', action='store_true', default=False, > + help='Do not change links (testharness js or css). By default, links are converted to point to WebKit testharness files.') I'd prefer storing convert_test_harness_links and set the default to True instead. 1057668 21 243698 youennf 2014-12-23 15:20:40 -0800 Created attachment 243698 Updated new option name 1057669 22 243699 youennf 2014-12-23 15:23:52 -0800 Created attachment 243699 Updated new option name 1057786 23 243699 commit-queue 2014-12-24 16:54:16 -0800 Comment on attachment 243699 Updated new option name Clearing flags on attachment: 243699 Committed r177727: <http://trac.webkit.org/changeset/177727> 1057787 24 commit-queue 2014-12-24 16:54:21 -0800 All reviewed patches have been landed. Closing bug. 234632 2014-07-09 06:47:57 -0700 2014-07-16 11:27:54 -0700 Patch bug-134763-20140709154738.patch text/plain 1046 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNzk5CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNj L3Rlc3RfY29udmVydGVyLnB5CmluZGV4IDJiYjA0NTZmMzRiN2VlZDhkMGVmMTI1ZTBhNDU1ZGY5 MDIxOWE5OTcuLmYyOTc3Y2NkNjA2OWZmYWYyZTBhY2YyMWVhMjZiZGY2ZmMwNGVmZTQgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5CkBAIC02NSw3ICs2 NSw5IEBAIGNsYXNzIF9XM0NUZXN0Q29udmVydGVyKEhUTUxQYXJzZXIpOgogICAgICAgICBzZWxm LnN0eWxlX2RhdGEgPSBbXQogICAgICAgICBzZWxmLmZpbGVuYW1lID0gZmlsZW5hbWUKIAotICAg ICAgICByZXNvdXJjZXNfcGF0aCA9IHNlbGYucGF0aF9mcm9tX3dlYmtpdF9yb290KCdMYXlvdXRU ZXN0cycsICdyZXNvdXJjZXMnKQorICAgICAgICAjIE1vZGlmeWluZyBwYXRoIHRvIHRlc3RoYXJu ZXNzIGZpbGVzIGlzIG5vdCBuZWVkZWQgaW4gY2FzZSBpdCBpcyBzZXJ2ZWQgYnkgd3B0IHNlcnZl ci4gSWYgc2VydmVkIGZyb20gbG9jYWwgZmlsZXMsIGhhdmluZyByZWxhdGl2ZSBwYXRoIGhlbHAK KyAgICAgICAgIyBUT0RPOiBpZiB3ZSB3YW50IHRvIHJ1biB0ZXN0cyB1c2luZyB0aGUgZmlsZSBz eXN0ZW0sIGl0IG1heSBiZSBnb29kIHRvIHBhc3MgcmVzb3VyY2VzX3BhdGggYXMgYSBwYXJhbWV0 ZXIKKyAgICAgICAgcmVzb3VyY2VzX3BhdGggPSBzZWxmLnBhdGhfZnJvbV93ZWJraXRfcm9vdCgn TGF5b3V0VGVzdHMnLCAnaW1wb3J0ZWQnLCAndzNjJywgJ3dwdCcsICdyZXNvdXJjZXMnKQogICAg ICAgICByZXNvdXJjZXNfcmVscGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0ucmVscGF0aChyZXNvdXJj ZXNfcGF0aCwgbmV3X3BhdGgpCiAgICAgICAgIHNlbGYubmV3X3Rlc3RfaGFybmVzc19wYXRoID0g cmVzb3VyY2VzX3JlbHBhdGgKIAo= 235009 2014-07-16 11:28:00 -0700 2014-09-16 01:37:40 -0700 Added parameter to resources folder bug-134763-20140716202742.patch text/plain 3348 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNzk5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWQ4MTIyY2IxM2M2YTUyOTY4ZWEwZTA5MjIxZWQ0NDQ5 YzBjMzE0My4uNjhmODExZjExZjAyMGVjZTBmOGYxY2ZiNjMwODU1ZDI4OWIwY2Y5MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE0LTA3LTE0ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnI+CisKKyAgICAgICAgdXBkYXRpbmcgdzNjIHRlc3QgY29udmVydGVyIHRvIGVuYWJsZSBzcGVj aWZ5aW5nIHRoZSBsb2NhdGlvbiBvZiB0aGUgcmVzb3VyY2VzIGZvbGRlciB0aGF0IGNvbnRhaW5z IHRlc3RoYXJuZXNzLmhzIGFuZCB0ZXN0aGFybmVzc3JlcG9ydC5qcworCisgICAgICAgIHVwZGF0 aW5nIHRlc3RoYXJuZXNzLmpzL3Rlc3Rhcm5lc3NyZXBvcnQuanMgbGlua3MgY29udmVyc2lvbiBz byB0aGF0IGxpbmtzIHBvaW50IHRvIHdwdCB2ZXJzaW9ucworCisgICAgICAgIFczQyB0ZXN0IGlt cG9ydGVyIHNob3VsZCBjb252ZXJ0IHRlc3RoYXJuZXNzLmpzL3Rlc3RoYXJuZXNzcmVwb3J0Lmpz IGxpbmtzIGFzIHJlbGF0aXZlIGxpbmtzIHRvIGltcG9ydGVkIFdQVCByZXNvdXJjZXMgZm9sZGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ3NjMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5OgorICAgICAgICAoY29udmVydF9mb3Jf d2Via2l0KTogQWRkZWQgcGFyYW1ldGVyIHRvIHRoZSByZXNvdXJjZXMgcGF0aCB0byB3aGljaCBz aG91bGQgcG9pbnQgdGVzdGhhcm5lc3MqLmpzIGZpbGVzLgorICAgICAgICAoX1czQ1Rlc3RDb252 ZXJ0ZXIuX19pbml0X18pOiBDb21wdXRlIHRoZSByZWxhdGl2ZSBwYXRoIHRvIHRlc3RoYXJuZXNz Ki5qcyBmaWxlcyBiYXNlZCBvbiBuZXcgcGFyYW1ldGVyLgorCiAyMDE0LTA3LTAzICBTaGl2YWt1 bWFyIEpNICA8c2hpdmEuam1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF1bV0syXSBFbmhh bmNlIHRoZSBNaW5pYnJvd3NlciB0byBzaG93IHRleHQgc2VhcmNoIGNvdW50IGFuZCBjbG9zZSBz ZWFyY2ggYmFyLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9j b252ZXJ0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5w eQppbmRleCAyYmIwNDU2ZjM0YjdlZWQ4ZDBlZjEyNWUwYTQ1NWRmOTAyMTlhOTk3Li44NGIxMTRh ZjUxMWNhMThlOWJmNzNhYTM3ODE5Y2YzNWNkMTE3YjdhIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQpAQCAtMzcsMTIgKzM3LDEyIEBAIGZyb20gSFRN TFBhcnNlciBpbXBvcnQgSFRNTFBhcnNlcgogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFt ZV9fKQogCiAKLWRlZiBjb252ZXJ0X2Zvcl93ZWJraXQobmV3X3BhdGgsIGZpbGVuYW1lLCBob3N0 PUhvc3QoKSk6CitkZWYgY29udmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBmaWxlbmFtZSwgaG9z dD1Ib3N0KCksIHJlc291cmNlc19wYXRoPU5vbmUpOgogICAgICIiIiBDb252ZXJ0cyBhIGZpbGUn cyB8Y29udGVudHN8IHNvIGl0IHdpbGwgZnVuY3Rpb24gY29ycmVjdGx5IGluIGl0cyB8bmV3X3Bh dGh8IGluIFdlYmtpdC4KIAogICAgIFJldHVybnMgdGhlIGxpc3Qgb2YgbW9kaWZpZWQgcHJvcGVy dGllcyBhbmQgdGhlIG1vZGlmaWVkIHRleHQgaWYgdGhlIGZpbGUgd2FzIG1vZGlmZWQsIE5vbmUg b3RoZXJ3aXNlLiIiIgogICAgIGNvbnRlbnRzID0gaG9zdC5maWxlc3lzdGVtLnJlYWRfYmluYXJ5 X2ZpbGUoZmlsZW5hbWUpCi0gICAgY29udmVydGVyID0gX1czQ1Rlc3RDb252ZXJ0ZXIobmV3X3Bh dGgsIGZpbGVuYW1lLCBob3N0KQorICAgIGNvbnZlcnRlciA9IF9XM0NUZXN0Q29udmVydGVyKG5l d19wYXRoLCBmaWxlbmFtZSwgaG9zdCwgcmVzb3VyY2VzX3BhdGgpCiAgICAgaWYgZmlsZW5hbWUu ZW5kc3dpdGgoJy5jc3MnKToKICAgICAgICAgcmV0dXJuIGNvbnZlcnRlci5hZGRfd2Via2l0X3By ZWZpeF90b191bnByZWZpeGVkX3Byb3BlcnRpZXMoY29udGVudHMpCiAgICAgZWxzZToKQEAgLTUy LDcgKzUyLDcgQEAgZGVmIGNvbnZlcnRfZm9yX3dlYmtpdChuZXdfcGF0aCwgZmlsZW5hbWUsIGhv c3Q9SG9zdCgpKToKIAogCiBjbGFzcyBfVzNDVGVzdENvbnZlcnRlcihIVE1MUGFyc2VyKToKLSAg ICBkZWYgX19pbml0X18oc2VsZiwgbmV3X3BhdGgsIGZpbGVuYW1lLCBob3N0PUhvc3QoKSk6Cisg ICAgZGVmIF9faW5pdF9fKHNlbGYsIG5ld19wYXRoLCBmaWxlbmFtZSwgaG9zdD1Ib3N0KCksIHJl c291cmNlc19wYXRoPU5vbmUpOgogICAgICAgICBIVE1MUGFyc2VyLl9faW5pdF9fKHNlbGYpCiAK ICAgICAgICAgc2VsZi5faG9zdCA9IGhvc3QKQEAgLTY1LDcgKzY1LDEwIEBAIGNsYXNzIF9XM0NU ZXN0Q29udmVydGVyKEhUTUxQYXJzZXIpOgogICAgICAgICBzZWxmLnN0eWxlX2RhdGEgPSBbXQog ICAgICAgICBzZWxmLmZpbGVuYW1lID0gZmlsZW5hbWUKIAotICAgICAgICByZXNvdXJjZXNfcGF0 aCA9IHNlbGYucGF0aF9mcm9tX3dlYmtpdF9yb290KCdMYXlvdXRUZXN0cycsICdyZXNvdXJjZXMn KQorICAgICAgICAjIE1vZGlmeWluZyBwYXRoIHRvIHRlc3RoYXJuZXNzIGZpbGVzIGlzIG5vdCBu ZWVkZWQgaW4gY2FzZSBpdCBpcyBzZXJ2ZWQgYnkgd3B0IHNlcnZlci4gSWYgc2VydmVkIGZyb20g bG9jYWwgZmlsZXMsIGhhdmluZyByZWxhdGl2ZSBwYXRoIGhlbHAKKyAgICAgICAgIyBUT0RPOiBp ZiB3ZSB3YW50IHRvIHJ1biB0ZXN0cyB1c2luZyB0aGUgZmlsZSBzeXN0ZW0sIGl0IG1heSBiZSBn b29kIHRvIHBhc3MgcmVzb3VyY2VzX3BhdGggYXMgYSBwYXJhbWV0ZXIKKyAgICAgICAgaWYgcmVz b3VyY2VzX3BhdGggaXMgTm9uZToKKyAgICAgICAgICAgIHJlc291cmNlc19wYXRoID0gc2VsZi5w YXRoX2Zyb21fd2Via2l0X3Jvb3QoJ0xheW91dFRlc3RzJywgJ2ltcG9ydGVkJywgJ3czYycsICd3 cHQnLCAncmVzb3VyY2VzJykKICAgICAgICAgcmVzb3VyY2VzX3JlbHBhdGggPSBzZWxmLl9maWxl c3lzdGVtLnJlbHBhdGgocmVzb3VyY2VzX3BhdGgsIG5ld19wYXRoKQogICAgICAgICBzZWxmLm5l d190ZXN0X2hhcm5lc3NfcGF0aCA9IHJlc291cmNlc19yZWxwYXRoCiAK 238159 2014-09-16 01:37:45 -0700 2014-09-16 13:42:51 -0700 Updating webkitpy tests bug-134763-20140916103741.patch text/plain 5737 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNjE0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjAxYjEwMjM2OGU4YzVmZGE3NWZiZjI1NjQwOWYxYzJj NjVlZmFiNy4uM2NjNjVkMTczMmUxNTE4YWRlMzQzNzI5MTM3ZWJhNWYyYjFlMTFhZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDE0LTA5LTE2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnI+CisKKyAgICAgICAgVzNDIHRlc3QgaW1wb3J0ZXIgc2hvdWxkIGNvbnZlcnQgdGVzdGhhcm5l c3MuanMvdGVzdGhhcm5lc3NyZXBvcnQuanMgbGlua3MgYXMgcmVsYXRpdmUgbGlua3MgdG8gaW1w b3J0ZWQgV1BUIHJlc291cmNlcyBmb2xkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNDc2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFVwZGF0aW5nIHczYyB0ZXN0IGNvbnZlcnRlciB0byBlbmFibGUg c3BlY2lmeWluZyB0aGUgbG9jYXRpb24gb2YgdGhlIHJlc291cmNlcyBmb2xkZXIgdGhhdCBjb250 YWlucyB0ZXN0aGFybmVzcy5qcyBhbmQgdGVzdGhhcm5lc3NyZXBvcnQuanMuCisgICAgICAgIFVw ZGF0aW5nIHRlc3RoYXJuZXNzLmpzL3Rlc3Rhcm5lc3NyZXBvcnQuanMgbGlua3MgY29udmVyc2lv biBzbyB0aGF0IGxpbmtzIHBvaW50IHRvIHdwdCB2ZXJzaW9ucyBieSBkZWZhdWx0LgorCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHk6CisgICAgICAgIChj b252ZXJ0X2Zvcl93ZWJraXQpOgorICAgICAgICAoX1czQ1Rlc3RDb252ZXJ0ZXIuX19pbml0X18p OgorICAgICAgICAoX1czQ1Rlc3RDb252ZXJ0ZXIuaGFuZGxlX3BpKToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlcl91bml0dGVzdC5weToKKyAgICAgICAgKHZl cmlmeV90ZXN0X2hhcm5lc3NfcGF0aHMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNj L3Rlc3RfaW1wb3J0ZXIucHk6CisgICAgICAgIChUZXN0SW1wb3J0ZXIuX19pbml0X18pOgorICAg ICAgICAoVGVzdEltcG9ydGVyLmltcG9ydF90ZXN0cyk6CisKIDIwMTQtMDktMTIgIEJyaWFuIEou IEJ1cmcgIDxidXJnQGNzLndhc2hpbmd0b24uZWR1PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IHJlbWluZCBhYm91dCByZWJhc2VsaW5pbmcgZ2VuZXJhdG9yIHRlc3QgcmVzdWx0cwpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQppbmRleCA1Y2NiZDZmMmY2 ZjUxNzMyYzBlNWRhODMzODY1Zjc0NzIwYmY0YmFhLi42Njc0ZmQyYmNiNThiN2E0MjQxODYyYzE2 ODU0YTExNWY3OTY5NmRhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90 ZXN0X2NvbnZlcnRlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2Nv bnZlcnRlci5weQpAQCAtMzcsMTIgKzM3LDEyIEBAIGZyb20gSFRNTFBhcnNlciBpbXBvcnQgSFRN TFBhcnNlcgogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiAKLWRlZiBjb252 ZXJ0X2Zvcl93ZWJraXQobmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZv LCBob3N0PUhvc3QoKSk6CitkZWYgY29udmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBmaWxlbmFt ZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5mbywgcmVzb3VyY2VzX3BhdGg9Tm9uZSwgaG9zdD1Ib3N0 KCkpOgogICAgICIiIiBDb252ZXJ0cyBhIGZpbGUncyB8Y29udGVudHN8IHNvIGl0IHdpbGwgZnVu Y3Rpb24gY29ycmVjdGx5IGluIGl0cyB8bmV3X3BhdGh8IGluIFdlYmtpdC4KIAogICAgIFJldHVy bnMgdGhlIGxpc3Qgb2YgbW9kaWZpZWQgcHJvcGVydGllcyBhbmQgdGhlIG1vZGlmaWVkIHRleHQg aWYgdGhlIGZpbGUgd2FzIG1vZGlmZWQsIE5vbmUgb3RoZXJ3aXNlLiIiIgogICAgIGNvbnRlbnRz ID0gaG9zdC5maWxlc3lzdGVtLnJlYWRfYmluYXJ5X2ZpbGUoZmlsZW5hbWUpCi0gICAgY29udmVy dGVyID0gX1czQ1Rlc3RDb252ZXJ0ZXIobmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3Vw cG9ydF9pbmZvLCBob3N0KQorICAgIGNvbnZlcnRlciA9IF9XM0NUZXN0Q29udmVydGVyKG5ld19w YXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5mbywgcmVzb3VyY2VzX3BhdGgsIGhv c3QpCiAgICAgaWYgZmlsZW5hbWUuZW5kc3dpdGgoJy5jc3MnKToKICAgICAgICAgcmV0dXJuIGNv bnZlcnRlci5hZGRfd2Via2l0X3ByZWZpeF90b191bnByZWZpeGVkX3Byb3BlcnRpZXMoY29udGVu dHMpCiAgICAgZWxzZToKQEAgLTUyLDcgKzUyLDcgQEAgZGVmIGNvbnZlcnRfZm9yX3dlYmtpdChu ZXdfcGF0aCwgZmlsZW5hbWUsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgpKToK IAogCiBjbGFzcyBfVzNDVGVzdENvbnZlcnRlcihIVE1MUGFyc2VyKToKLSAgICBkZWYgX19pbml0 X18oc2VsZiwgbmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0 PUhvc3QoKSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5ld19wYXRoLCBmaWxlbmFtZSwgcmVm ZXJlbmNlX3N1cHBvcnRfaW5mbywgcmVzb3VyY2VzX3BhdGg9Tm9uZSwgaG9zdD1Ib3N0KCkpOgog ICAgICAgICBIVE1MUGFyc2VyLl9faW5pdF9fKHNlbGYpCiAKICAgICAgICAgc2VsZi5faG9zdCA9 IGhvc3QKQEAgLTY2LDcgKzY2LDggQEAgY2xhc3MgX1czQ1Rlc3RDb252ZXJ0ZXIoSFRNTFBhcnNl cik6CiAgICAgICAgIHNlbGYuZmlsZW5hbWUgPSBmaWxlbmFtZQogICAgICAgICBzZWxmLnJlZmVy ZW5jZV9zdXBwb3J0X2luZm8gPSByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvCiAKLSAgICAgICAgcmVz b3VyY2VzX3BhdGggPSBzZWxmLnBhdGhfZnJvbV93ZWJraXRfcm9vdCgnTGF5b3V0VGVzdHMnLCAn cmVzb3VyY2VzJykKKyAgICAgICAgaWYgcmVzb3VyY2VzX3BhdGggaXMgTm9uZToKKyAgICAgICAg ICAgIHJlc291cmNlc19wYXRoID0gc2VsZi5wYXRoX2Zyb21fd2Via2l0X3Jvb3QoJ0xheW91dFRl c3RzJywgJ2ltcG9ydGVkJywgJ3czYycsICd3cHQnLCAncmVzb3VyY2VzJykKICAgICAgICAgcmVz b3VyY2VzX3JlbHBhdGggPSBzZWxmLl9maWxlc3lzdGVtLnJlbHBhdGgocmVzb3VyY2VzX3BhdGgs IG5ld19wYXRoKQogICAgICAgICBzZWxmLm5ld190ZXN0X2hhcm5lc3NfcGF0aCA9IHJlc291cmNl c19yZWxwYXRoCiAKQEAgLTIwOCw0ICsyMDksMyBAQCBjbGFzcyBfVzNDVGVzdENvbnZlcnRlcihI VE1MUGFyc2VyKToKIAogICAgIGRlZiBoYW5kbGVfcGkoc2VsZiwgZGF0YSk6CiAgICAgICAgIHNl bGYuY29udmVydGVkX2RhdGEuZXh0ZW5kKFsnPD8nLCBkYXRhLCAnPiddKQotCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlcl91bml0dGVzdC5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyX3VuaXR0ZXN0LnB5Cmlu ZGV4IGIwYzQ2OWIwOTYzMGQwYmQyMTFjOTI2ZGUyMjFiYTdhNzFhNGJiMjUuLjkzYmZkYjlkNzk5 ZDMyNTg1NTYxODY3ZGUzN2NiYTgwNGY5MzkzNjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyX3VuaXR0ZXN0LnB5CkBAIC0yOTMsNyArMjkz LDcgQEAgQ09OVEVOVCBPRiBURVNUCiAgICAgICAgIGlmIGlzaW5zdGFuY2UoY29udmVydGVkLCBi YXNlc3RyaW5nKToKICAgICAgICAgICAgIGNvbnZlcnRlZCA9IEJlYXV0aWZ1bFNvdXAoY29udmVy dGVkKQogCi0gICAgICAgIHJlc291cmNlc19kaXIgPSBjb252ZXJ0ZXIucGF0aF9mcm9tX3dlYmtp dF9yb290KCJMYXlvdXRUZXN0cyIsICJyZXNvdXJjZXMiKQorICAgICAgICByZXNvdXJjZXNfZGly ID0gY29udmVydGVyLnBhdGhfZnJvbV93ZWJraXRfcm9vdCgnTGF5b3V0VGVzdHMnLCAnaW1wb3J0 ZWQnLCAndzNjJywgJ3dwdCcsICdyZXNvdXJjZXMnKQogCiAgICAgICAgICMgVmVyaWZ5IHRoZSBv cmlnaW5hbCBwYXRocyBhcmUgZ29uZSwgYW5kIHRoZSBuZXcgcGF0aHMgYXJlIHByZXNlbnQuCiAg ICAgICAgIG9yaWdfcGF0aF9wYXR0ZXJuID0gcmUuY29tcGlsZSgnXCIvcmVzb3VyY2VzL3Rlc3Ro YXJuZXNzJykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1w b3J0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5Cmlu ZGV4IGQwYTE5NDUxZTQ3YzNjNDg3NDA1NzY2NWRjNzQ4ZTIzZWUyODIyNmIuLmQ4MmMxYjQ3Nzlh ZGEyZThmYzE0YTUwOWY0ODNiNzVkMjJjMmFmNWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS93M2MvdGVzdF9pbXBvcnRlci5weQpAQCAtMTQ4LDYgKzE0OCw3IEBAIGNsYXNzIFRlc3RJbXBv cnRlcihvYmplY3QpOgogICAgICAgICBzZWxmLl93ZWJraXRfcm9vdCA9IHdlYmtpdF9maW5kZXIu d2Via2l0X2Jhc2UoKQogCiAgICAgICAgIHNlbGYuZGVzdGluYXRpb25fZGlyZWN0b3J5ID0gd2Vi a2l0X2ZpbmRlci5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoIkxheW91dFRlc3RzIiwgb3B0aW9ucy5k ZXN0aW5hdGlvbikKKyAgICAgICAgc2VsZi5yZXNvdXJjZXNfcGF0aCA9IHdlYmtpdF9maW5kZXIu cGF0aF9mcm9tX3dlYmtpdF9iYXNlKCJMYXlvdXRUZXN0cyIsIG9wdGlvbnMucmVzb3VyY2VzX3Bh dGgpCiAKICAgICAgICAgc2VsZi5pbXBvcnRfbGlzdCA9IFtdCiAKQEAgLTI4Nyw3ICsyODgsNyBA QCBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICBtaW1ldHlwZSA9 IG1pbWV0eXBlcy5ndWVzc190eXBlKG9yaWdfZmlsZXBhdGgpCiAgICAgICAgICAgICAgICAgaWYg J2h0bWwnIGluIHN0cihtaW1ldHlwZVswXSkgb3IgJ3htbCcgaW4gc3RyKG1pbWV0eXBlWzBdKSAg b3IgJ2NzcycgaW4gc3RyKG1pbWV0eXBlWzBdKToKICAgICAgICAgICAgICAgICAgICAgdHJ5Ogot ICAgICAgICAgICAgICAgICAgICAgICAgY29udmVydGVkX2ZpbGUgPSBjb252ZXJ0X2Zvcl93ZWJr aXQobmV3X3BhdGgsIGZpbGVuYW1lPW9yaWdfZmlsZXBhdGgsIHJlZmVyZW5jZV9zdXBwb3J0X2lu Zm89cmVmZXJlbmNlX3N1cHBvcnRfaW5mbykKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnZl cnRlZF9maWxlID0gY29udmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBmaWxlbmFtZT1vcmlnX2Zp bGVwYXRoLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvPXJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIHJl c291cmNlc19wYXRoPXNlbGYucmVzb3VyY2VzX3BhdGgpCiAgICAgICAgICAgICAgICAgICAgIGV4 Y2VwdDoKICAgICAgICAgICAgICAgICAgICAgICAgIF9sb2cud2FybignRmFpbGVkIGNvbnZlcnRp bmcgJXMnLCBvcmlnX2ZpbGVwYXRoKQogICAgICAgICAgICAgICAgICAgICAgICAgZmFpbGVkX2Nv bnZlcnNpb25fZmlsZXMuYXBwZW5kKG9yaWdfZmlsZXBhdGgpCg== 238203 2014-09-16 13:42:56 -0700 2014-09-16 13:43:25 -0700 fixing import test executable bug-134763-20140916224252.patch text/plain 7476 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNjY1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjIwODQwOTFiZDdjMmVjNzlhYzQ4YzM2MmI1NzQ3Zjlk NjBmOTkyNC4uMmI3MjVlMjhmY2YxMmZjODljNjU5ZmM0MDg3ZTFiN2FkYTg3NDVhMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDE0LTA5LTE2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uZkBnbWFpbC5jb20+CisKKyAg ICAgICAgVzNDIHRlc3QgaW1wb3J0ZXIgc2hvdWxkIGNvbnZlcnQgdGVzdGhhcm5lc3MuanMvdGVz dGhhcm5lc3NyZXBvcnQuanMgbGlua3MgYXMgcmVsYXRpdmUgbGlua3MgdG8gaW1wb3J0ZWQgV1BU IHJlc291cmNlcyBmb2xkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNDc2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFVwZGF0aW5nIHczYyB0ZXN0IGNvbnZlcnRlciB0byBlbmFibGUgc3BlY2lmeWlu ZyB0aGUgbG9jYXRpb24gb2YgdGhlIHJlc291cmNlcyBmb2xkZXIgdGhhdCBjb250YWlucyB0ZXN0 aGFybmVzcy5qcyBhbmQgdGVzdGhhcm5lc3NyZXBvcnQuanMuCisgICAgICAgIFVwZGF0aW5nIHRl c3RoYXJuZXNzLmpzL3Rlc3Rhcm5lc3NyZXBvcnQuanMgbGlua3MgY29udmVyc2lvbiBzbyB0aGF0 IGxpbmtzIHBvaW50IHRvIHdwdCB2ZXJzaW9ucyBieSBkZWZhdWx0LgorICAgICAgICBBZGRpbmcg Y29ycmVzcG9uZGluZyBuZXcgcGFyYW1ldGVyIHRvIHRoZSB0aGUgaW1wb3J0IGV4ZWN1dGFibGUu CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weToKKyAg ICAgICAgKGNvbnZlcnRfZm9yX3dlYmtpdCk6CisgICAgICAgIChfVzNDVGVzdENvbnZlcnRlci5f X2luaXRfXyk6IEFkZGluZyByZXNvdXJjZXNfcGF0aCBwYXJhbWV0ZXIuCisgICAgICAgIChfVzND VGVzdENvbnZlcnRlci5oYW5kbGVfcGkpOiBSZW1vdmluZyBlbXB0eSBsaW5lLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHk6CisgICAgICAgIChwYXJzZV9h cmdzKTogIEFkZGluZyBuZXcgb3B0aW9uIHRvIHNldCByZXNvdXJjZXNfcGF0aC4KKyAgICAgICAg KFRlc3RJbXBvcnRlci5fX2luaXRfXyk6CisgICAgICAgIChUZXN0SW1wb3J0ZXIuaW1wb3J0X3Rl c3RzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyX3VuaXR0 ZXN0LnB5OgorICAgICAgICAoVGVzdEltcG9ydGVyVGVzdC50ZXN0X2ltcG9ydF9kaXJfd2l0aF9u b190ZXN0c19hbmRfbm9faGcpOgorICAgICAgICAoVGVzdEltcG9ydGVyVGVzdC50ZXN0X2ltcG9y dF9kaXJfd2l0aF9ub190ZXN0cyk6CisKIDIwMTQtMDktMTYgIENzYWJhIE9zenRyb2dvbsOhYyAg PG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIGdhcmRlbmluZywgc2tpcCBv bmUgbW9yZSB0ZXN0cyBvbiBXaW5kb3dzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90 ZXN0X2NvbnZlcnRlci5weQppbmRleCA1Y2NiZDZmMmY2ZjUxNzMyYzBlNWRhODMzODY1Zjc0NzIw YmY0YmFhLi43YTYwNzNmOWE0N2I5Yjg2OTQ5MjFiZmQ4NDhlNTgzMDY4MjkyMDg5IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQpAQCAtMzcsMTIgKzM3 LDEyIEBAIGZyb20gSFRNTFBhcnNlciBpbXBvcnQgSFRNTFBhcnNlcgogX2xvZyA9IGxvZ2dpbmcu Z2V0TG9nZ2VyKF9fbmFtZV9fKQogCiAKLWRlZiBjb252ZXJ0X2Zvcl93ZWJraXQobmV3X3BhdGgs IGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0PUhvc3QoKSk6CitkZWYgY29u dmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5m bywgcmVzb3VyY2VzX3BhdGg9Tm9uZSwgaG9zdD1Ib3N0KCkpOgogICAgICIiIiBDb252ZXJ0cyBh IGZpbGUncyB8Y29udGVudHN8IHNvIGl0IHdpbGwgZnVuY3Rpb24gY29ycmVjdGx5IGluIGl0cyB8 bmV3X3BhdGh8IGluIFdlYmtpdC4KIAogICAgIFJldHVybnMgdGhlIGxpc3Qgb2YgbW9kaWZpZWQg cHJvcGVydGllcyBhbmQgdGhlIG1vZGlmaWVkIHRleHQgaWYgdGhlIGZpbGUgd2FzIG1vZGlmZWQs IE5vbmUgb3RoZXJ3aXNlLiIiIgogICAgIGNvbnRlbnRzID0gaG9zdC5maWxlc3lzdGVtLnJlYWRf YmluYXJ5X2ZpbGUoZmlsZW5hbWUpCi0gICAgY29udmVydGVyID0gX1czQ1Rlc3RDb252ZXJ0ZXIo bmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0KQorICAgIGNv bnZlcnRlciA9IF9XM0NUZXN0Q29udmVydGVyKG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNl X3N1cHBvcnRfaW5mbywgcmVzb3VyY2VzX3BhdGgsIGhvc3QpCiAgICAgaWYgZmlsZW5hbWUuZW5k c3dpdGgoJy5jc3MnKToKICAgICAgICAgcmV0dXJuIGNvbnZlcnRlci5hZGRfd2Via2l0X3ByZWZp eF90b191bnByZWZpeGVkX3Byb3BlcnRpZXMoY29udGVudHMpCiAgICAgZWxzZToKQEAgLTUyLDcg KzUyLDcgQEAgZGVmIGNvbnZlcnRfZm9yX3dlYmtpdChuZXdfcGF0aCwgZmlsZW5hbWUsIHJlZmVy ZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgpKToKIAogCiBjbGFzcyBfVzNDVGVzdENvbnZl cnRlcihIVE1MUGFyc2VyKToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgbmV3X3BhdGgsIGZpbGVu YW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0PUhvc3QoKSk6CisgICAgZGVmIF9faW5p dF9fKHNlbGYsIG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5mbywgcmVz b3VyY2VzX3BhdGg9Tm9uZSwgaG9zdD1Ib3N0KCkpOgogICAgICAgICBIVE1MUGFyc2VyLl9faW5p dF9fKHNlbGYpCiAKICAgICAgICAgc2VsZi5faG9zdCA9IGhvc3QKQEAgLTY2LDcgKzY2LDggQEAg Y2xhc3MgX1czQ1Rlc3RDb252ZXJ0ZXIoSFRNTFBhcnNlcik6CiAgICAgICAgIHNlbGYuZmlsZW5h bWUgPSBmaWxlbmFtZQogICAgICAgICBzZWxmLnJlZmVyZW5jZV9zdXBwb3J0X2luZm8gPSByZWZl cmVuY2Vfc3VwcG9ydF9pbmZvCiAKLSAgICAgICAgcmVzb3VyY2VzX3BhdGggPSBzZWxmLnBhdGhf ZnJvbV93ZWJraXRfcm9vdCgnTGF5b3V0VGVzdHMnLCAncmVzb3VyY2VzJykKKyAgICAgICAgaWYg cmVzb3VyY2VzX3BhdGggaXMgTm9uZToKKyAgICAgICAgICAgIHJlc291cmNlc19wYXRoID0gc2Vs Zi5wYXRoX2Zyb21fd2Via2l0X3Jvb3QoJ0xheW91dFRlc3RzJywgJ3Jlc291cmNlcycpCiAgICAg ICAgIHJlc291cmNlc19yZWxwYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5yZWxwYXRoKHJlc291cmNl c19wYXRoLCBuZXdfcGF0aCkKICAgICAgICAgc2VsZi5uZXdfdGVzdF9oYXJuZXNzX3BhdGggPSBy ZXNvdXJjZXNfcmVscGF0aAogCkBAIC0yMDgsNCArMjA5LDMgQEAgY2xhc3MgX1czQ1Rlc3RDb252 ZXJ0ZXIoSFRNTFBhcnNlcik6CiAKICAgICBkZWYgaGFuZGxlX3BpKHNlbGYsIGRhdGEpOgogICAg ICAgICBzZWxmLmNvbnZlcnRlZF9kYXRhLmV4dGVuZChbJzw/JywgZGF0YSwgJz4nXSkKLQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKaW5kZXggZDBhMTk0NTFl NDdjM2M0ODc0MDU3NjY1ZGM3NDhlMjNlZTI4MjI2Yi4uMThiYjRmMjRlMzNkNDMzYmU5ZjA1MmMy NDk5NGE4NDNhZGYzMDNkZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2Mv dGVzdF9pbXBvcnRlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2lt cG9ydGVyLnB5CkBAIC0xMjgsNiArMTI4LDggQEAgZGVmIHBhcnNlX2FyZ3MoKToKICAgICAgICAg aGVscD0nSW1wb3J0IGludG8gYSBzcGVjaWZpZWQgZGlyZWN0b3J5IHJlbGF0aXZlIHRvIHRoZSBM YXlvdXRUZXN0cyByb290LiBCeSBkZWZhdWx0LCBpbXBvcnRzIGludG8gdzNjJykKICAgICBwYXJz ZXIuYWRkX29wdGlvbignLXQnLCAnLS10ZXN0LXBhdGgnLCBhY3Rpb249J2FwcGVuZCcsIGRlc3Q9 J3Rlc3RfcGF0aHMnLCBkZWZhdWx0PVtdLAogICAgICAgICBoZWxwPSdJbXBvcnQgb25seSB0ZXN0 cyBpbiB0aGUgc3VwcGxpZWQgc3ViZGlyZWN0b3J5IG9mIHRoZSB3M2NfdGVzdF9kaXJlY3Rvcnku IENhbiBiZSBzdXBwbGllZCBtdWx0aXBsZSB0aW1lcyB0byBnaXZlIG11bHRpcGxlIHBhdGhzJykK KyAgICBwYXJzZXIuYWRkX29wdGlvbignLXInLCAnLS1yZXMtZGlyJywgZGVzdD0ncmVzb3VyY2Vz X3BhdGgnLCBkZWZhdWx0PSdyZXNvdXJjZXMnLAorICAgICAgICBoZWxwPSdUcmFuc2xhdGUgdGVz dGhhcm5lc3Mgc2NyaXB0cyBsaW5rIHRvIHBvaW50IHRvIHRoZSBzdXBwbGllZCBzdWJkaXJlY3Rv cnkgcmVsYXRpdmUgdG8gdGhlIExheW91dFRlc3RzIHJvb3QuIEJ5IGRlZmF1bHQsIHRyYW5zbGF0 ZSB0byBmaWxlcyBpbnRvICJyZXNvdXJjZXMiIGZvbGRlcicpCiAKICAgICBvcHRpb25zLCBhcmdz ID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQogICAgIGlmIGxlbihhcmdzKSAhPSAxOgpAQCAtMTQ4LDYg KzE1MCw3IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAgICAgICBzZWxmLl93ZWJr aXRfcm9vdCA9IHdlYmtpdF9maW5kZXIud2Via2l0X2Jhc2UoKQogCiAgICAgICAgIHNlbGYuZGVz dGluYXRpb25fZGlyZWN0b3J5ID0gd2Via2l0X2ZpbmRlci5wYXRoX2Zyb21fd2Via2l0X2Jhc2Uo IkxheW91dFRlc3RzIiwgb3B0aW9ucy5kZXN0aW5hdGlvbikKKyAgICAgICAgc2VsZi5yZXNvdXJj ZXNfcGF0aCA9IHdlYmtpdF9maW5kZXIucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCJMYXlvdXRUZXN0 cyIsIG9wdGlvbnMucmVzb3VyY2VzX3BhdGgpCiAKICAgICAgICAgc2VsZi5pbXBvcnRfbGlzdCA9 IFtdCiAKQEAgLTI4Nyw3ICsyOTAsNyBAQCBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0KToKICAg ICAgICAgICAgICAgICBtaW1ldHlwZSA9IG1pbWV0eXBlcy5ndWVzc190eXBlKG9yaWdfZmlsZXBh dGgpCiAgICAgICAgICAgICAgICAgaWYgJ2h0bWwnIGluIHN0cihtaW1ldHlwZVswXSkgb3IgJ3ht bCcgaW4gc3RyKG1pbWV0eXBlWzBdKSAgb3IgJ2NzcycgaW4gc3RyKG1pbWV0eXBlWzBdKToKICAg ICAgICAgICAgICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgICAgICAgICAgY29udmVydGVk X2ZpbGUgPSBjb252ZXJ0X2Zvcl93ZWJraXQobmV3X3BhdGgsIGZpbGVuYW1lPW9yaWdfZmlsZXBh dGgsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm89cmVmZXJlbmNlX3N1cHBvcnRfaW5mbykKKyAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnZlcnRlZF9maWxlID0gY29udmVydF9mb3Jfd2Via2l0KG5l d19wYXRoLCBmaWxlbmFtZT1vcmlnX2ZpbGVwYXRoLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvPXJl ZmVyZW5jZV9zdXBwb3J0X2luZm8sIHJlc291cmNlc19wYXRoPXNlbGYucmVzb3VyY2VzX3BhdGgp CiAgICAgICAgICAgICAgICAgICAgIGV4Y2VwdDoKICAgICAgICAgICAgICAgICAgICAgICAgIF9s b2cud2FybignRmFpbGVkIGNvbnZlcnRpbmcgJXMnLCBvcmlnX2ZpbGVwYXRoKQogICAgICAgICAg ICAgICAgICAgICAgICAgZmFpbGVkX2NvbnZlcnNpb25fZmlsZXMuYXBwZW5kKG9yaWdfZmlsZXBh dGgpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVy X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlcl91 bml0dGVzdC5weQppbmRleCA1ZDVhN2VmNGEzYjY4ZDVjMDUwYzQ2MjBiNjYzNzQxZjBjYTM2MGE4 Li41MDBjMzhjNmU4YzE4NTVkNzgxOTRiNzA2NDg0NmU2ZmI5ZGQ0OTA3IDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyX3VuaXR0ZXN0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3QucHkKQEAg LTU0LDcgKzU0LDcgQEAgY2xhc3MgVGVzdEltcG9ydGVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgICAgIGhvc3QuZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIoZXhjZXB0aW9uPU9TRXJy b3IoKSkKICAgICAgICAgaG9zdC5maWxlc3lzdGVtID0gTW9ja0ZpbGVTeXN0ZW0oZmlsZXM9RkFL RV9GSUxFUykKIAotICAgICAgICBpbXBvcnRlciA9IFRlc3RJbXBvcnRlcihob3N0LCBGQUtFX1NP VVJDRV9ESVIsIG9wdHBhcnNlLlZhbHVlcyh7Im92ZXJ3cml0ZSI6IEZhbHNlLCAnZGVzdGluYXRp b24nOiAndzNjJywgJ3Rlc3RfcGF0aHMnOiBbRkFLRV9URVNUX1BBVEhdfSkpCisgICAgICAgIGlt cG9ydGVyID0gVGVzdEltcG9ydGVyKGhvc3QsIEZBS0VfU09VUkNFX0RJUiwgb3B0cGFyc2UuVmFs dWVzKHsnb3ZlcndyaXRlJzogRmFsc2UsICdkZXN0aW5hdGlvbic6ICd3M2MnLCAncmVzb3VyY2Vz X3BhdGgnOiAncmVzb3VyY2VzJywgJ3Rlc3RfcGF0aHMnOiBbRkFLRV9URVNUX1BBVEhdfSkpCiAK ICAgICAgICAgb2MgPSBPdXRwdXRDYXB0dXJlKCkKICAgICAgICAgb2MuY2FwdHVyZV9vdXRwdXQo KQpAQCAtNjgsNyArNjgsNyBAQCBjbGFzcyBUZXN0SW1wb3J0ZXJUZXN0KHVuaXR0ZXN0LlRlc3RD YXNlKToKICAgICAgICAgaG9zdC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihleGNlcHRpb249 U2NyaXB0RXJyb3IoImFib3J0OiBubyByZXBvc2l0b3J5IGZvdW5kIGluICcvVm9sdW1lcy9Tb3Vy Y2Uvc3JjL3drL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjJyAoLmhnIG5vdCBmb3VuZCkhIikp CiAgICAgICAgIGhvc3QuZmlsZXN5c3RlbSA9IE1vY2tGaWxlU3lzdGVtKGZpbGVzPUZBS0VfRklM RVMpCiAKLSAgICAgICAgaW1wb3J0ZXIgPSBUZXN0SW1wb3J0ZXIoaG9zdCwgRkFLRV9TT1VSQ0Vf RElSLCBvcHRwYXJzZS5WYWx1ZXMoeyJvdmVyd3JpdGUiOiBGYWxzZSwgJ2Rlc3RpbmF0aW9uJzog J3czYycsICd0ZXN0X3BhdGhzJzogW0ZBS0VfVEVTVF9QQVRIXX0pKQorICAgICAgICBpbXBvcnRl ciA9IFRlc3RJbXBvcnRlcihob3N0LCBGQUtFX1NPVVJDRV9ESVIsIG9wdHBhcnNlLlZhbHVlcyh7 Im92ZXJ3cml0ZSI6IEZhbHNlLCAnZGVzdGluYXRpb24nOiAndzNjJywgJ3Jlc291cmNlc19wYXRo JzogJ3Jlc291cmNlcycsICd0ZXN0X3BhdGhzJzogW0ZBS0VfVEVTVF9QQVRIXX0pKQogICAgICAg ICBvYyA9IE91dHB1dENhcHR1cmUoKQogICAgICAgICBvYy5jYXB0dXJlX291dHB1dCgpCiAgICAg ICAgIHRyeToK 238204 2014-09-16 13:43:30 -0700 2014-09-23 01:26:55 -0700 fixing import test executable bug-134763-20140916224326.patch text/plain 7476 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNjY1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjIwODQwOTFiZDdjMmVjNzlhYzQ4YzM2MmI1NzQ3Zjlk NjBmOTkyNC4uMmI3MjVlMjhmY2YxMmZjODljNjU5ZmM0MDg3ZTFiN2FkYTg3NDVhMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDE0LTA5LTE2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uZkBnbWFpbC5jb20+CisKKyAg ICAgICAgVzNDIHRlc3QgaW1wb3J0ZXIgc2hvdWxkIGNvbnZlcnQgdGVzdGhhcm5lc3MuanMvdGVz dGhhcm5lc3NyZXBvcnQuanMgbGlua3MgYXMgcmVsYXRpdmUgbGlua3MgdG8gaW1wb3J0ZWQgV1BU IHJlc291cmNlcyBmb2xkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNDc2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFVwZGF0aW5nIHczYyB0ZXN0IGNvbnZlcnRlciB0byBlbmFibGUgc3BlY2lmeWlu ZyB0aGUgbG9jYXRpb24gb2YgdGhlIHJlc291cmNlcyBmb2xkZXIgdGhhdCBjb250YWlucyB0ZXN0 aGFybmVzcy5qcyBhbmQgdGVzdGhhcm5lc3NyZXBvcnQuanMuCisgICAgICAgIFVwZGF0aW5nIHRl c3RoYXJuZXNzLmpzL3Rlc3Rhcm5lc3NyZXBvcnQuanMgbGlua3MgY29udmVyc2lvbiBzbyB0aGF0 IGxpbmtzIHBvaW50IHRvIHdwdCB2ZXJzaW9ucyBieSBkZWZhdWx0LgorICAgICAgICBBZGRpbmcg Y29ycmVzcG9uZGluZyBuZXcgcGFyYW1ldGVyIHRvIHRoZSB0aGUgaW1wb3J0IGV4ZWN1dGFibGUu CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weToKKyAg ICAgICAgKGNvbnZlcnRfZm9yX3dlYmtpdCk6CisgICAgICAgIChfVzNDVGVzdENvbnZlcnRlci5f X2luaXRfXyk6IEFkZGluZyByZXNvdXJjZXNfcGF0aCBwYXJhbWV0ZXIuCisgICAgICAgIChfVzND VGVzdENvbnZlcnRlci5oYW5kbGVfcGkpOiBSZW1vdmluZyBlbXB0eSBsaW5lLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHk6CisgICAgICAgIChwYXJzZV9h cmdzKTogIEFkZGluZyBuZXcgb3B0aW9uIHRvIHNldCByZXNvdXJjZXNfcGF0aC4KKyAgICAgICAg KFRlc3RJbXBvcnRlci5fX2luaXRfXyk6CisgICAgICAgIChUZXN0SW1wb3J0ZXIuaW1wb3J0X3Rl c3RzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyX3VuaXR0 ZXN0LnB5OgorICAgICAgICAoVGVzdEltcG9ydGVyVGVzdC50ZXN0X2ltcG9ydF9kaXJfd2l0aF9u b190ZXN0c19hbmRfbm9faGcpOgorICAgICAgICAoVGVzdEltcG9ydGVyVGVzdC50ZXN0X2ltcG9y dF9kaXJfd2l0aF9ub190ZXN0cyk6CisKIDIwMTQtMDktMTYgIENzYWJhIE9zenRyb2dvbsOhYyAg PG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIGdhcmRlbmluZywgc2tpcCBv bmUgbW9yZSB0ZXN0cyBvbiBXaW5kb3dzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90 ZXN0X2NvbnZlcnRlci5weQppbmRleCA1Y2NiZDZmMmY2ZjUxNzMyYzBlNWRhODMzODY1Zjc0NzIw YmY0YmFhLi43YTYwNzNmOWE0N2I5Yjg2OTQ5MjFiZmQ4NDhlNTgzMDY4MjkyMDg5IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQpAQCAtMzcsMTIgKzM3 LDEyIEBAIGZyb20gSFRNTFBhcnNlciBpbXBvcnQgSFRNTFBhcnNlcgogX2xvZyA9IGxvZ2dpbmcu Z2V0TG9nZ2VyKF9fbmFtZV9fKQogCiAKLWRlZiBjb252ZXJ0X2Zvcl93ZWJraXQobmV3X3BhdGgs IGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0PUhvc3QoKSk6CitkZWYgY29u dmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5m bywgcmVzb3VyY2VzX3BhdGg9Tm9uZSwgaG9zdD1Ib3N0KCkpOgogICAgICIiIiBDb252ZXJ0cyBh IGZpbGUncyB8Y29udGVudHN8IHNvIGl0IHdpbGwgZnVuY3Rpb24gY29ycmVjdGx5IGluIGl0cyB8 bmV3X3BhdGh8IGluIFdlYmtpdC4KIAogICAgIFJldHVybnMgdGhlIGxpc3Qgb2YgbW9kaWZpZWQg cHJvcGVydGllcyBhbmQgdGhlIG1vZGlmaWVkIHRleHQgaWYgdGhlIGZpbGUgd2FzIG1vZGlmZWQs IE5vbmUgb3RoZXJ3aXNlLiIiIgogICAgIGNvbnRlbnRzID0gaG9zdC5maWxlc3lzdGVtLnJlYWRf YmluYXJ5X2ZpbGUoZmlsZW5hbWUpCi0gICAgY29udmVydGVyID0gX1czQ1Rlc3RDb252ZXJ0ZXIo bmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0KQorICAgIGNv bnZlcnRlciA9IF9XM0NUZXN0Q29udmVydGVyKG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNl X3N1cHBvcnRfaW5mbywgcmVzb3VyY2VzX3BhdGgsIGhvc3QpCiAgICAgaWYgZmlsZW5hbWUuZW5k c3dpdGgoJy5jc3MnKToKICAgICAgICAgcmV0dXJuIGNvbnZlcnRlci5hZGRfd2Via2l0X3ByZWZp eF90b191bnByZWZpeGVkX3Byb3BlcnRpZXMoY29udGVudHMpCiAgICAgZWxzZToKQEAgLTUyLDcg KzUyLDcgQEAgZGVmIGNvbnZlcnRfZm9yX3dlYmtpdChuZXdfcGF0aCwgZmlsZW5hbWUsIHJlZmVy ZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgpKToKIAogCiBjbGFzcyBfVzNDVGVzdENvbnZl cnRlcihIVE1MUGFyc2VyKToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgbmV3X3BhdGgsIGZpbGVu YW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0PUhvc3QoKSk6CisgICAgZGVmIF9faW5p dF9fKHNlbGYsIG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5mbywgcmVz b3VyY2VzX3BhdGg9Tm9uZSwgaG9zdD1Ib3N0KCkpOgogICAgICAgICBIVE1MUGFyc2VyLl9faW5p dF9fKHNlbGYpCiAKICAgICAgICAgc2VsZi5faG9zdCA9IGhvc3QKQEAgLTY2LDcgKzY2LDggQEAg Y2xhc3MgX1czQ1Rlc3RDb252ZXJ0ZXIoSFRNTFBhcnNlcik6CiAgICAgICAgIHNlbGYuZmlsZW5h bWUgPSBmaWxlbmFtZQogICAgICAgICBzZWxmLnJlZmVyZW5jZV9zdXBwb3J0X2luZm8gPSByZWZl cmVuY2Vfc3VwcG9ydF9pbmZvCiAKLSAgICAgICAgcmVzb3VyY2VzX3BhdGggPSBzZWxmLnBhdGhf ZnJvbV93ZWJraXRfcm9vdCgnTGF5b3V0VGVzdHMnLCAncmVzb3VyY2VzJykKKyAgICAgICAgaWYg cmVzb3VyY2VzX3BhdGggaXMgTm9uZToKKyAgICAgICAgICAgIHJlc291cmNlc19wYXRoID0gc2Vs Zi5wYXRoX2Zyb21fd2Via2l0X3Jvb3QoJ0xheW91dFRlc3RzJywgJ3Jlc291cmNlcycpCiAgICAg ICAgIHJlc291cmNlc19yZWxwYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5yZWxwYXRoKHJlc291cmNl c19wYXRoLCBuZXdfcGF0aCkKICAgICAgICAgc2VsZi5uZXdfdGVzdF9oYXJuZXNzX3BhdGggPSBy ZXNvdXJjZXNfcmVscGF0aAogCkBAIC0yMDgsNCArMjA5LDMgQEAgY2xhc3MgX1czQ1Rlc3RDb252 ZXJ0ZXIoSFRNTFBhcnNlcik6CiAKICAgICBkZWYgaGFuZGxlX3BpKHNlbGYsIGRhdGEpOgogICAg ICAgICBzZWxmLmNvbnZlcnRlZF9kYXRhLmV4dGVuZChbJzw/JywgZGF0YSwgJz4nXSkKLQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKaW5kZXggZDBhMTk0NTFl NDdjM2M0ODc0MDU3NjY1ZGM3NDhlMjNlZTI4MjI2Yi4uMThiYjRmMjRlMzNkNDMzYmU5ZjA1MmMy NDk5NGE4NDNhZGYzMDNkZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2Mv dGVzdF9pbXBvcnRlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2lt cG9ydGVyLnB5CkBAIC0xMjgsNiArMTI4LDggQEAgZGVmIHBhcnNlX2FyZ3MoKToKICAgICAgICAg aGVscD0nSW1wb3J0IGludG8gYSBzcGVjaWZpZWQgZGlyZWN0b3J5IHJlbGF0aXZlIHRvIHRoZSBM YXlvdXRUZXN0cyByb290LiBCeSBkZWZhdWx0LCBpbXBvcnRzIGludG8gdzNjJykKICAgICBwYXJz ZXIuYWRkX29wdGlvbignLXQnLCAnLS10ZXN0LXBhdGgnLCBhY3Rpb249J2FwcGVuZCcsIGRlc3Q9 J3Rlc3RfcGF0aHMnLCBkZWZhdWx0PVtdLAogICAgICAgICBoZWxwPSdJbXBvcnQgb25seSB0ZXN0 cyBpbiB0aGUgc3VwcGxpZWQgc3ViZGlyZWN0b3J5IG9mIHRoZSB3M2NfdGVzdF9kaXJlY3Rvcnku IENhbiBiZSBzdXBwbGllZCBtdWx0aXBsZSB0aW1lcyB0byBnaXZlIG11bHRpcGxlIHBhdGhzJykK KyAgICBwYXJzZXIuYWRkX29wdGlvbignLXInLCAnLS1yZXMtZGlyJywgZGVzdD0ncmVzb3VyY2Vz X3BhdGgnLCBkZWZhdWx0PSdyZXNvdXJjZXMnLAorICAgICAgICBoZWxwPSdUcmFuc2xhdGUgdGVz dGhhcm5lc3Mgc2NyaXB0cyBsaW5rIHRvIHBvaW50IHRvIHRoZSBzdXBwbGllZCBzdWJkaXJlY3Rv cnkgcmVsYXRpdmUgdG8gdGhlIExheW91dFRlc3RzIHJvb3QuIEJ5IGRlZmF1bHQsIHRyYW5zbGF0 ZSB0byBmaWxlcyBpbnRvICJyZXNvdXJjZXMiIGZvbGRlcicpCiAKICAgICBvcHRpb25zLCBhcmdz ID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQogICAgIGlmIGxlbihhcmdzKSAhPSAxOgpAQCAtMTQ4LDYg KzE1MCw3IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAgICAgICBzZWxmLl93ZWJr aXRfcm9vdCA9IHdlYmtpdF9maW5kZXIud2Via2l0X2Jhc2UoKQogCiAgICAgICAgIHNlbGYuZGVz dGluYXRpb25fZGlyZWN0b3J5ID0gd2Via2l0X2ZpbmRlci5wYXRoX2Zyb21fd2Via2l0X2Jhc2Uo IkxheW91dFRlc3RzIiwgb3B0aW9ucy5kZXN0aW5hdGlvbikKKyAgICAgICAgc2VsZi5yZXNvdXJj ZXNfcGF0aCA9IHdlYmtpdF9maW5kZXIucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCJMYXlvdXRUZXN0 cyIsIG9wdGlvbnMucmVzb3VyY2VzX3BhdGgpCiAKICAgICAgICAgc2VsZi5pbXBvcnRfbGlzdCA9 IFtdCiAKQEAgLTI4Nyw3ICsyOTAsNyBAQCBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0KToKICAg ICAgICAgICAgICAgICBtaW1ldHlwZSA9IG1pbWV0eXBlcy5ndWVzc190eXBlKG9yaWdfZmlsZXBh dGgpCiAgICAgICAgICAgICAgICAgaWYgJ2h0bWwnIGluIHN0cihtaW1ldHlwZVswXSkgb3IgJ3ht bCcgaW4gc3RyKG1pbWV0eXBlWzBdKSAgb3IgJ2NzcycgaW4gc3RyKG1pbWV0eXBlWzBdKToKICAg ICAgICAgICAgICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgICAgICAgICAgY29udmVydGVk X2ZpbGUgPSBjb252ZXJ0X2Zvcl93ZWJraXQobmV3X3BhdGgsIGZpbGVuYW1lPW9yaWdfZmlsZXBh dGgsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm89cmVmZXJlbmNlX3N1cHBvcnRfaW5mbykKKyAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnZlcnRlZF9maWxlID0gY29udmVydF9mb3Jfd2Via2l0KG5l d19wYXRoLCBmaWxlbmFtZT1vcmlnX2ZpbGVwYXRoLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvPXJl ZmVyZW5jZV9zdXBwb3J0X2luZm8sIHJlc291cmNlc19wYXRoPXNlbGYucmVzb3VyY2VzX3BhdGgp CiAgICAgICAgICAgICAgICAgICAgIGV4Y2VwdDoKICAgICAgICAgICAgICAgICAgICAgICAgIF9s b2cud2FybignRmFpbGVkIGNvbnZlcnRpbmcgJXMnLCBvcmlnX2ZpbGVwYXRoKQogICAgICAgICAg ICAgICAgICAgICAgICAgZmFpbGVkX2NvbnZlcnNpb25fZmlsZXMuYXBwZW5kKG9yaWdfZmlsZXBh dGgpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVy X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlcl91 bml0dGVzdC5weQppbmRleCA1ZDVhN2VmNGEzYjY4ZDVjMDUwYzQ2MjBiNjYzNzQxZjBjYTM2MGE4 Li41MDBjMzhjNmU4YzE4NTVkNzgxOTRiNzA2NDg0NmU2ZmI5ZGQ0OTA3IDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyX3VuaXR0ZXN0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3QucHkKQEAg LTU0LDcgKzU0LDcgQEAgY2xhc3MgVGVzdEltcG9ydGVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgICAgIGhvc3QuZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIoZXhjZXB0aW9uPU9TRXJy b3IoKSkKICAgICAgICAgaG9zdC5maWxlc3lzdGVtID0gTW9ja0ZpbGVTeXN0ZW0oZmlsZXM9RkFL RV9GSUxFUykKIAotICAgICAgICBpbXBvcnRlciA9IFRlc3RJbXBvcnRlcihob3N0LCBGQUtFX1NP VVJDRV9ESVIsIG9wdHBhcnNlLlZhbHVlcyh7Im92ZXJ3cml0ZSI6IEZhbHNlLCAnZGVzdGluYXRp b24nOiAndzNjJywgJ3Rlc3RfcGF0aHMnOiBbRkFLRV9URVNUX1BBVEhdfSkpCisgICAgICAgIGlt cG9ydGVyID0gVGVzdEltcG9ydGVyKGhvc3QsIEZBS0VfU09VUkNFX0RJUiwgb3B0cGFyc2UuVmFs dWVzKHsnb3ZlcndyaXRlJzogRmFsc2UsICdkZXN0aW5hdGlvbic6ICd3M2MnLCAncmVzb3VyY2Vz X3BhdGgnOiAncmVzb3VyY2VzJywgJ3Rlc3RfcGF0aHMnOiBbRkFLRV9URVNUX1BBVEhdfSkpCiAK ICAgICAgICAgb2MgPSBPdXRwdXRDYXB0dXJlKCkKICAgICAgICAgb2MuY2FwdHVyZV9vdXRwdXQo KQpAQCAtNjgsNyArNjgsNyBAQCBjbGFzcyBUZXN0SW1wb3J0ZXJUZXN0KHVuaXR0ZXN0LlRlc3RD YXNlKToKICAgICAgICAgaG9zdC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihleGNlcHRpb249 U2NyaXB0RXJyb3IoImFib3J0OiBubyByZXBvc2l0b3J5IGZvdW5kIGluICcvVm9sdW1lcy9Tb3Vy Y2Uvc3JjL3drL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjJyAoLmhnIG5vdCBmb3VuZCkhIikp CiAgICAgICAgIGhvc3QuZmlsZXN5c3RlbSA9IE1vY2tGaWxlU3lzdGVtKGZpbGVzPUZBS0VfRklM RVMpCiAKLSAgICAgICAgaW1wb3J0ZXIgPSBUZXN0SW1wb3J0ZXIoaG9zdCwgRkFLRV9TT1VSQ0Vf RElSLCBvcHRwYXJzZS5WYWx1ZXMoeyJvdmVyd3JpdGUiOiBGYWxzZSwgJ2Rlc3RpbmF0aW9uJzog J3czYycsICd0ZXN0X3BhdGhzJzogW0ZBS0VfVEVTVF9QQVRIXX0pKQorICAgICAgICBpbXBvcnRl ciA9IFRlc3RJbXBvcnRlcihob3N0LCBGQUtFX1NPVVJDRV9ESVIsIG9wdHBhcnNlLlZhbHVlcyh7 Im92ZXJ3cml0ZSI6IEZhbHNlLCAnZGVzdGluYXRpb24nOiAndzNjJywgJ3Jlc291cmNlc19wYXRo JzogJ3Jlc291cmNlcycsICd0ZXN0X3BhdGhzJzogW0ZBS0VfVEVTVF9QQVRIXX0pKQogICAgICAg ICBvYyA9IE91dHB1dENhcHR1cmUoKQogICAgICAgICBvYy5jYXB0dXJlX291dHB1dCgpCiAgICAg ICAgIHRyeToK 238522 2014-09-23 01:27:01 -0700 2014-12-23 06:58:36 -0800 Updated changelog bug-134763-20140923102659.patch text/plain 7517 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTczODMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzE4YzU2NDQ3MzdmMDgwMWY1YmI5M2Y0OTgzZWZiZTk3 ZmEzMDM3OC4uMGZhMmZlNTgyZmJhMTAzMzE4NzJmZmViNmQzYmQxMzlmM2ZmYjU0NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDE0LTA5LTIzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uZkBnbWFpbC5jb20+CisKKyAg ICAgICAgVzNDIHRlc3QgaW1wb3J0ZXIgc2hvdWxkIGNvbnZlcnQgdGVzdGhhcm5lc3MuanMvdGVz dGhhcm5lc3NyZXBvcnQuanMgbGlua3MgYXMgcmVsYXRpdmUgbGlua3MgdG8gaW1wb3J0ZWQgV1BU IHJlc291cmNlcyBmb2xkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNDc2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFVwZGF0aW5nIHczYyB0ZXN0IGNvbnZlcnRlciB0byBlbmFibGUgc3BlY2lmeWlu ZyB0aGUgbG9jYXRpb24gb2YgdGhlIHJlc291cmNlcyBmb2xkZXIgdGhhdCBjb250YWlucyB0ZXN0 aGFybmVzcy5qcyBhbmQgdGVzdGhhcm5lc3NyZXBvcnQuanMuCisgICAgICAgIEFkZGluZyBjb3Jy ZXNwb25kaW5nIG5ldyBwYXJhbWV0ZXIgdG8gdGhlIHRoZSBpbXBvcnQgZXhlY3V0YWJsZS4KKyAg ICAgICAgQnkgZGVmYXVsdCwgdGVzdGhhcm5lc3MuanMvdGVzdGFybmVzc3JlcG9ydC5qcyBjb252 ZXJ0ZWQgbGlua3MgcG9pbnQgdG8gTGF5b3V0VGVzdHMvcmVzb3VyY2VzIGZvbGRlci4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5OgorICAgICAgICAo Y29udmVydF9mb3Jfd2Via2l0KToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLl9faW5pdF9f KTogQWRkaW5nIHJlc291cmNlc19wYXRoIHBhcmFtZXRlci4KKyAgICAgICAgKF9XM0NUZXN0Q29u dmVydGVyLmhhbmRsZV9waSk6IFJlbW92aW5nIGVtcHR5IGxpbmUuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weToKKyAgICAgICAgKHBhcnNlX2FyZ3MpOiAg QWRkaW5nIG5ldyBvcHRpb24gdG8gc2V0IHJlc291cmNlc19wYXRoLgorICAgICAgICAoVGVzdElt cG9ydGVyLl9faW5pdF9fKToKKyAgICAgICAgKFRlc3RJbXBvcnRlci5pbXBvcnRfdGVzdHMpOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3QucHk6 CisgICAgICAgIChUZXN0SW1wb3J0ZXJUZXN0LnRlc3RfaW1wb3J0X2Rpcl93aXRoX25vX3Rlc3Rz X2FuZF9ub19oZyk6CisgICAgICAgIChUZXN0SW1wb3J0ZXJUZXN0LnRlc3RfaW1wb3J0X2Rpcl93 aXRoX25vX3Rlc3RzKToKKwogMjAxNC0wOS0yMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gVGVzdCAvd2Via2l0Mi9XZWJLaXRXZWJW aWV3L2Nhbi1zaG93LW1pbWUtdHlwZSBmYWlscyBpZiBldmluY2UgYnJvd3NlciBwbHVnaW4gaXMg aW5zdGFsbGVkCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2Nv bnZlcnRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5 CmluZGV4IDVjY2JkNmYyZjZmNTE3MzJjMGU1ZGE4MzM4NjVmNzQ3MjBiZjRiYWEuLjdhNjA3M2Y5 YTQ3YjliODY5NDkyMWJmZDg0OGU1ODMwNjgyOTIwODkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5CkBAIC0zNywxMiArMzcsMTIgQEAgZnJvbSBIVE1M UGFyc2VyIGltcG9ydCBIVE1MUGFyc2VyCiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1l X18pCiAKIAotZGVmIGNvbnZlcnRfZm9yX3dlYmtpdChuZXdfcGF0aCwgZmlsZW5hbWUsIHJlZmVy ZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgpKToKK2RlZiBjb252ZXJ0X2Zvcl93ZWJraXQo bmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCByZXNvdXJjZXNfcGF0 aD1Ob25lLCBob3N0PUhvc3QoKSk6CiAgICAgIiIiIENvbnZlcnRzIGEgZmlsZSdzIHxjb250ZW50 c3wgc28gaXQgd2lsbCBmdW5jdGlvbiBjb3JyZWN0bHkgaW4gaXRzIHxuZXdfcGF0aHwgaW4gV2Vi a2l0LgogCiAgICAgUmV0dXJucyB0aGUgbGlzdCBvZiBtb2RpZmllZCBwcm9wZXJ0aWVzIGFuZCB0 aGUgbW9kaWZpZWQgdGV4dCBpZiB0aGUgZmlsZSB3YXMgbW9kaWZlZCwgTm9uZSBvdGhlcndpc2Uu IiIiCiAgICAgY29udGVudHMgPSBob3N0LmZpbGVzeXN0ZW0ucmVhZF9iaW5hcnlfZmlsZShmaWxl bmFtZSkKLSAgICBjb252ZXJ0ZXIgPSBfVzNDVGVzdENvbnZlcnRlcihuZXdfcGF0aCwgZmlsZW5h bWUsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIGhvc3QpCisgICAgY29udmVydGVyID0gX1czQ1Rl c3RDb252ZXJ0ZXIobmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBy ZXNvdXJjZXNfcGF0aCwgaG9zdCkKICAgICBpZiBmaWxlbmFtZS5lbmRzd2l0aCgnLmNzcycpOgog ICAgICAgICByZXR1cm4gY29udmVydGVyLmFkZF93ZWJraXRfcHJlZml4X3RvX3VucHJlZml4ZWRf cHJvcGVydGllcyhjb250ZW50cykKICAgICBlbHNlOgpAQCAtNTIsNyArNTIsNyBAQCBkZWYgY29u dmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5m bywgaG9zdD1Ib3N0KCkpOgogCiAKIGNsYXNzIF9XM0NUZXN0Q29udmVydGVyKEhUTUxQYXJzZXIp OgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuZXdfcGF0aCwgZmlsZW5hbWUsIHJlZmVyZW5jZV9z dXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgpKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgbmV3X3Bh dGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCByZXNvdXJjZXNfcGF0aD1Ob25l LCBob3N0PUhvc3QoKSk6CiAgICAgICAgIEhUTUxQYXJzZXIuX19pbml0X18oc2VsZikKIAogICAg ICAgICBzZWxmLl9ob3N0ID0gaG9zdApAQCAtNjYsNyArNjYsOCBAQCBjbGFzcyBfVzNDVGVzdENv bnZlcnRlcihIVE1MUGFyc2VyKToKICAgICAgICAgc2VsZi5maWxlbmFtZSA9IGZpbGVuYW1lCiAg ICAgICAgIHNlbGYucmVmZXJlbmNlX3N1cHBvcnRfaW5mbyA9IHJlZmVyZW5jZV9zdXBwb3J0X2lu Zm8KIAotICAgICAgICByZXNvdXJjZXNfcGF0aCA9IHNlbGYucGF0aF9mcm9tX3dlYmtpdF9yb290 KCdMYXlvdXRUZXN0cycsICdyZXNvdXJjZXMnKQorICAgICAgICBpZiByZXNvdXJjZXNfcGF0aCBp cyBOb25lOgorICAgICAgICAgICAgcmVzb3VyY2VzX3BhdGggPSBzZWxmLnBhdGhfZnJvbV93ZWJr aXRfcm9vdCgnTGF5b3V0VGVzdHMnLCAncmVzb3VyY2VzJykKICAgICAgICAgcmVzb3VyY2VzX3Jl bHBhdGggPSBzZWxmLl9maWxlc3lzdGVtLnJlbHBhdGgocmVzb3VyY2VzX3BhdGgsIG5ld19wYXRo KQogICAgICAgICBzZWxmLm5ld190ZXN0X2hhcm5lc3NfcGF0aCA9IHJlc291cmNlc19yZWxwYXRo CiAKQEAgLTIwOCw0ICsyMDksMyBAQCBjbGFzcyBfVzNDVGVzdENvbnZlcnRlcihIVE1MUGFyc2Vy KToKIAogICAgIGRlZiBoYW5kbGVfcGkoc2VsZiwgZGF0YSk6CiAgICAgICAgIHNlbGYuY29udmVy dGVkX2RhdGEuZXh0ZW5kKFsnPD8nLCBkYXRhLCAnPiddKQotCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS93M2MvdGVzdF9pbXBvcnRlci5weQppbmRleCBkMGExOTQ1MWU0N2MzYzQ4NzQwNTc2NjVk Yzc0OGUyM2VlMjgyMjZiLi4xOGJiNGYyNGUzM2Q0MzNiZTlmMDUyYzI0OTk0YTg0M2FkZjMwM2Rl IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKQEAgLTEy OCw2ICsxMjgsOCBAQCBkZWYgcGFyc2VfYXJncygpOgogICAgICAgICBoZWxwPSdJbXBvcnQgaW50 byBhIHNwZWNpZmllZCBkaXJlY3RvcnkgcmVsYXRpdmUgdG8gdGhlIExheW91dFRlc3RzIHJvb3Qu IEJ5IGRlZmF1bHQsIGltcG9ydHMgaW50byB3M2MnKQogICAgIHBhcnNlci5hZGRfb3B0aW9uKCct dCcsICctLXRlc3QtcGF0aCcsIGFjdGlvbj0nYXBwZW5kJywgZGVzdD0ndGVzdF9wYXRocycsIGRl ZmF1bHQ9W10sCiAgICAgICAgIGhlbHA9J0ltcG9ydCBvbmx5IHRlc3RzIGluIHRoZSBzdXBwbGll ZCBzdWJkaXJlY3Rvcnkgb2YgdGhlIHczY190ZXN0X2RpcmVjdG9yeS4gQ2FuIGJlIHN1cHBsaWVk IG11bHRpcGxlIHRpbWVzIHRvIGdpdmUgbXVsdGlwbGUgcGF0aHMnKQorICAgIHBhcnNlci5hZGRf b3B0aW9uKCctcicsICctLXJlcy1kaXInLCBkZXN0PSdyZXNvdXJjZXNfcGF0aCcsIGRlZmF1bHQ9 J3Jlc291cmNlcycsCisgICAgICAgIGhlbHA9J1RyYW5zbGF0ZSB0ZXN0aGFybmVzcyBzY3JpcHRz IGxpbmsgdG8gcG9pbnQgdG8gdGhlIHN1cHBsaWVkIHN1YmRpcmVjdG9yeSByZWxhdGl2ZSB0byB0 aGUgTGF5b3V0VGVzdHMgcm9vdC4gQnkgZGVmYXVsdCwgdHJhbnNsYXRlIHRvIGZpbGVzIGludG8g InJlc291cmNlcyIgZm9sZGVyJykKIAogICAgIG9wdGlvbnMsIGFyZ3MgPSBwYXJzZXIucGFyc2Vf YXJncygpCiAgICAgaWYgbGVuKGFyZ3MpICE9IDE6CkBAIC0xNDgsNiArMTUwLDcgQEAgY2xhc3Mg VGVzdEltcG9ydGVyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3dlYmtpdF9yb290ID0gd2Via2l0 X2ZpbmRlci53ZWJraXRfYmFzZSgpCiAKICAgICAgICAgc2VsZi5kZXN0aW5hdGlvbl9kaXJlY3Rv cnkgPSB3ZWJraXRfZmluZGVyLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgiTGF5b3V0VGVzdHMiLCBv cHRpb25zLmRlc3RpbmF0aW9uKQorICAgICAgICBzZWxmLnJlc291cmNlc19wYXRoID0gd2Via2l0 X2ZpbmRlci5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoIkxheW91dFRlc3RzIiwgb3B0aW9ucy5yZXNv dXJjZXNfcGF0aCkKIAogICAgICAgICBzZWxmLmltcG9ydF9saXN0ID0gW10KIApAQCAtMjg3LDcg KzI5MCw3IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAgICAgICAgICAgICAgIG1p bWV0eXBlID0gbWltZXR5cGVzLmd1ZXNzX3R5cGUob3JpZ19maWxlcGF0aCkKICAgICAgICAgICAg ICAgICBpZiAnaHRtbCcgaW4gc3RyKG1pbWV0eXBlWzBdKSBvciAneG1sJyBpbiBzdHIobWltZXR5 cGVbMF0pICBvciAnY3NzJyBpbiBzdHIobWltZXR5cGVbMF0pOgogICAgICAgICAgICAgICAgICAg ICB0cnk6Ci0gICAgICAgICAgICAgICAgICAgICAgICBjb252ZXJ0ZWRfZmlsZSA9IGNvbnZlcnRf Zm9yX3dlYmtpdChuZXdfcGF0aCwgZmlsZW5hbWU9b3JpZ19maWxlcGF0aCwgcmVmZXJlbmNlX3N1 cHBvcnRfaW5mbz1yZWZlcmVuY2Vfc3VwcG9ydF9pbmZvKQorICAgICAgICAgICAgICAgICAgICAg ICAgY29udmVydGVkX2ZpbGUgPSBjb252ZXJ0X2Zvcl93ZWJraXQobmV3X3BhdGgsIGZpbGVuYW1l PW9yaWdfZmlsZXBhdGgsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm89cmVmZXJlbmNlX3N1cHBvcnRf aW5mbywgcmVzb3VyY2VzX3BhdGg9c2VsZi5yZXNvdXJjZXNfcGF0aCkKICAgICAgICAgICAgICAg ICAgICAgZXhjZXB0OgogICAgICAgICAgICAgICAgICAgICAgICAgX2xvZy53YXJuKCdGYWlsZWQg Y29udmVydGluZyAlcycsIG9yaWdfZmlsZXBhdGgpCiAgICAgICAgICAgICAgICAgICAgICAgICBm YWlsZWRfY29udmVyc2lvbl9maWxlcy5hcHBlbmQob3JpZ19maWxlcGF0aCkKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3QucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyX3VuaXR0ZXN0LnB5CmluZGV4 IDVkNWE3ZWY0YTNiNjhkNWMwNTBjNDYyMGI2NjM3NDFmMGNhMzYwYTguLjUwMGMzOGM2ZThjMTg1 NWQ3ODE5NGI3MDY0ODQ2ZTZmYjlkZDQ5MDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlcl91bml0dGVzdC5weQpAQCAtNTQsNyArNTQsNyBAQCBj bGFzcyBUZXN0SW1wb3J0ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgaG9zdC5l eGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihleGNlcHRpb249T1NFcnJvcigpKQogICAgICAgICBo b3N0LmZpbGVzeXN0ZW0gPSBNb2NrRmlsZVN5c3RlbShmaWxlcz1GQUtFX0ZJTEVTKQogCi0gICAg ICAgIGltcG9ydGVyID0gVGVzdEltcG9ydGVyKGhvc3QsIEZBS0VfU09VUkNFX0RJUiwgb3B0cGFy c2UuVmFsdWVzKHsib3ZlcndyaXRlIjogRmFsc2UsICdkZXN0aW5hdGlvbic6ICd3M2MnLCAndGVz dF9wYXRocyc6IFtGQUtFX1RFU1RfUEFUSF19KSkKKyAgICAgICAgaW1wb3J0ZXIgPSBUZXN0SW1w b3J0ZXIoaG9zdCwgRkFLRV9TT1VSQ0VfRElSLCBvcHRwYXJzZS5WYWx1ZXMoeydvdmVyd3JpdGUn OiBGYWxzZSwgJ2Rlc3RpbmF0aW9uJzogJ3czYycsICdyZXNvdXJjZXNfcGF0aCc6ICdyZXNvdXJj ZXMnLCAndGVzdF9wYXRocyc6IFtGQUtFX1RFU1RfUEFUSF19KSkKIAogICAgICAgICBvYyA9IE91 dHB1dENhcHR1cmUoKQogICAgICAgICBvYy5jYXB0dXJlX291dHB1dCgpCkBAIC02OCw3ICs2OCw3 IEBAIGNsYXNzIFRlc3RJbXBvcnRlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBo b3N0LmV4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKGV4Y2VwdGlvbj1TY3JpcHRFcnJvcigiYWJv cnQ6IG5vIHJlcG9zaXRvcnkgZm91bmQgaW4gJy9Wb2x1bWVzL1NvdXJjZS9zcmMvd2svVG9vbHMv U2NyaXB0cy93ZWJraXRweS93M2MnICguaGcgbm90IGZvdW5kKSEiKSkKICAgICAgICAgaG9zdC5m aWxlc3lzdGVtID0gTW9ja0ZpbGVTeXN0ZW0oZmlsZXM9RkFLRV9GSUxFUykKIAotICAgICAgICBp bXBvcnRlciA9IFRlc3RJbXBvcnRlcihob3N0LCBGQUtFX1NPVVJDRV9ESVIsIG9wdHBhcnNlLlZh bHVlcyh7Im92ZXJ3cml0ZSI6IEZhbHNlLCAnZGVzdGluYXRpb24nOiAndzNjJywgJ3Rlc3RfcGF0 aHMnOiBbRkFLRV9URVNUX1BBVEhdfSkpCisgICAgICAgIGltcG9ydGVyID0gVGVzdEltcG9ydGVy KGhvc3QsIEZBS0VfU09VUkNFX0RJUiwgb3B0cGFyc2UuVmFsdWVzKHsib3ZlcndyaXRlIjogRmFs c2UsICdkZXN0aW5hdGlvbic6ICd3M2MnLCAncmVzb3VyY2VzX3BhdGgnOiAncmVzb3VyY2VzJywg J3Rlc3RfcGF0aHMnOiBbRkFLRV9URVNUX1BBVEhdfSkpCiAgICAgICAgIG9jID0gT3V0cHV0Q2Fw dHVyZSgpCiAgICAgICAgIG9jLmNhcHR1cmVfb3V0cHV0KCkKICAgICAgICAgdHJ5Ogo= 243672 2014-12-23 06:58:42 -0800 2014-12-23 15:20:33 -0800 Patch bug-134763-20141223155842.patch text/plain 5784 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NjIwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGM2N2ZmOWVjZDIxOWYwYjhjOGEyZDcwNmY1MWQ2Yjgx NjU3Y2UxYS4uYWRjNzQxMmVkYjg1OTMyNmRiYzlhOWIyODZiYWNiMDhlYjlmODE1YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE0LTEyLTIzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnI+CisKKyAgICAgICAgVzNDIHRlc3QgaW1wb3J0ZXIgc2hvdWxkIGhhdmUgYW4gb3B0aW9uIHRv IGRpc2FibGUgdGVzdGhhcm5lc3MuanMvdGVzdGhhcm5lc3NyZXBvcnQuanMgbGluayBjb252ZXJz aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ3 NjMKKworICAgICAgICBBZGRpbmcgYW4gb3B0aW9uIHRvIGRpc2FibGUgbGluayBjb252ZXJzaW9u LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHk6CisgICAgICAgIChjb252ZXJ0X2Zv cl93ZWJraXQpOgorICAgICAgICAoX1czQ1Rlc3RDb252ZXJ0ZXIuX19pbml0X18pOgorICAgICAg ICAoX1czQ1Rlc3RDb252ZXJ0ZXIuY29udmVydF9hdHRyaWJ1dGVzX2lmX25lZWRlZCk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weToKKyAgICAgICAgKHBh cnNlX2FyZ3MpOgorICAgICAgICAoVGVzdEltcG9ydGVyLmltcG9ydF90ZXN0cyk6CisKIDIwMTQt MTItMTkgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dp bl0gUmV2aXNlIERSVCBsb2dpYyB0byBtYXRjaCBNYWMuCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5CmluZGV4IDQ5OTA3OGU1YzBlOTJjOWJlMzFkYzJlMTg3 YWEwNmYyMDJjNzZjMTguLjhkNGI5OTI0YTY3YzM1OTllN2VkNjdmYTkwZWYxOTk3Njg3NzU4ZGYg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5CkBAIC0z NywxMiArMzcsMTIgQEAgZnJvbSBIVE1MUGFyc2VyIGltcG9ydCBIVE1MUGFyc2VyCiBfbG9nID0g bG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKIAotZGVmIGNvbnZlcnRfZm9yX3dlYmtpdChu ZXdfcGF0aCwgZmlsZW5hbWUsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgpKToK K2RlZiBjb252ZXJ0X2Zvcl93ZWJraXQobmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3Vw cG9ydF9pbmZvLCBob3N0PUhvc3QoKSwgY29udmVydF90ZXN0X2hhcm5lc3NfbGlua3M9VHJ1ZSk6 CiAgICAgIiIiIENvbnZlcnRzIGEgZmlsZSdzIHxjb250ZW50c3wgc28gaXQgd2lsbCBmdW5jdGlv biBjb3JyZWN0bHkgaW4gaXRzIHxuZXdfcGF0aHwgaW4gV2Via2l0LgogCiAgICAgUmV0dXJucyB0 aGUgbGlzdCBvZiBtb2RpZmllZCBwcm9wZXJ0aWVzIGFuZCB0aGUgbW9kaWZpZWQgdGV4dCBpZiB0 aGUgZmlsZSB3YXMgbW9kaWZlZCwgTm9uZSBvdGhlcndpc2UuIiIiCiAgICAgY29udGVudHMgPSBo b3N0LmZpbGVzeXN0ZW0ucmVhZF9iaW5hcnlfZmlsZShmaWxlbmFtZSkKLSAgICBjb252ZXJ0ZXIg PSBfVzNDVGVzdENvbnZlcnRlcihuZXdfcGF0aCwgZmlsZW5hbWUsIHJlZmVyZW5jZV9zdXBwb3J0 X2luZm8sIGhvc3QpCisgICAgY29udmVydGVyID0gX1czQ1Rlc3RDb252ZXJ0ZXIobmV3X3BhdGgs IGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0LCBjb252ZXJ0X3Rlc3RfaGFy bmVzc19saW5rcykKICAgICBpZiBmaWxlbmFtZS5lbmRzd2l0aCgnLmNzcycpOgogICAgICAgICBy ZXR1cm4gY29udmVydGVyLmFkZF93ZWJraXRfcHJlZml4X3RvX3VucHJlZml4ZWRfcHJvcGVydGll c19hbmRfdmFsdWVzKGNvbnRlbnRzKQogICAgIGVsc2U6CkBAIC01Miw3ICs1Miw3IEBAIGRlZiBj b252ZXJ0X2Zvcl93ZWJraXQobmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9p bmZvLCBob3N0PUhvc3QoKSk6CiAKIAogY2xhc3MgX1czQ1Rlc3RDb252ZXJ0ZXIoSFRNTFBhcnNl cik6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNl X3N1cHBvcnRfaW5mbywgaG9zdD1Ib3N0KCkpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuZXdf cGF0aCwgZmlsZW5hbWUsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgpLCBjb252 ZXJ0X3Rlc3RfaGFybmVzc19saW5rcz1UcnVlKToKICAgICAgICAgSFRNTFBhcnNlci5fX2luaXRf XyhzZWxmKQogCiAgICAgICAgIHNlbGYuX2hvc3QgPSBob3N0CkBAIC03MCw2ICs3MCw3IEBAIGNs YXNzIF9XM0NUZXN0Q29udmVydGVyKEhUTUxQYXJzZXIpOgogICAgICAgICByZXNvdXJjZXNfcGF0 aCA9IHNlbGYucGF0aF9mcm9tX3dlYmtpdF9yb290KCdMYXlvdXRUZXN0cycsICdyZXNvdXJjZXMn KQogICAgICAgICByZXNvdXJjZXNfcmVscGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0ucmVscGF0aChy ZXNvdXJjZXNfcGF0aCwgbmV3X3BhdGgpCiAgICAgICAgIHNlbGYubmV3X3Rlc3RfaGFybmVzc19w YXRoID0gcmVzb3VyY2VzX3JlbHBhdGgKKyAgICAgICAgc2VsZi5jb252ZXJ0X3Rlc3RfaGFybmVz c19saW5rcyA9IGNvbnZlcnRfdGVzdF9oYXJuZXNzX2xpbmtzCiAKICAgICAgICAgIyBUaGVzZSBz ZXR0aW5ncyBtaWdodCB2YXJ5IGJldHdlZW4gV2ViS2l0IGFuZCBCbGluawogICAgICAgICBzZWxm Ll9jc3NfcHJvcGVydHlfZmlsZSA9IHNlbGYucGF0aF9mcm9tX3dlYmtpdF9yb290KCdTb3VyY2Un LCAnV2ViQ29yZScsICdjc3MnLCAnQ1NTUHJvcGVydHlOYW1lcy5pbicpCkBAIC0xNjUsNyArMTY2 LDcgQEAgY2xhc3MgX1czQ1Rlc3RDb252ZXJ0ZXIoSFRNTFBhcnNlcik6CiAKICAgICBkZWYgY29u dmVydF9hdHRyaWJ1dGVzX2lmX25lZWRlZChzZWxmLCB0YWcsIGF0dHJzKToKICAgICAgICAgY29u dmVydGVkID0gc2VsZi5nZXRfc3RhcnR0YWdfdGV4dCgpCi0gICAgICAgIGlmIHRhZyBpbiAoJ3Nj cmlwdCcsICdsaW5rJyk6CisgICAgICAgIGlmIHNlbGYuY29udmVydF90ZXN0X2hhcm5lc3NfbGlu a3MgYW5kIHRhZyBpbiAoJ3NjcmlwdCcsICdsaW5rJyk6CiAgICAgICAgICAgICBhdHRyX25hbWUg PSAnc3JjJwogICAgICAgICAgICAgaWYgdGFnICE9ICdzY3JpcHQnOgogICAgICAgICAgICAgICAg IGF0dHJfbmFtZSA9ICdocmVmJwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93 M2MvdGVzdF9pbXBvcnRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1w b3J0ZXIucHkKaW5kZXggMDAxNzc3OTgyMTE2OTM3ZjA5ZThiZTEzOGVhNTVkZTZiYTYxZTQyYS4u ZWQzNzQ2MGY2MTczYjgxYzkzYzJmNzVmZDkzNmExZmFmZDM4NDZmOSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5CkBAIC0xMjAsOCArMTIwLDEyIEBAIGRl ZiBjb25maWd1cmVfbG9nZ2luZygpOgogCiBkZWYgcGFyc2VfYXJncygpOgogICAgIHBhcnNlciA9 IG9wdHBhcnNlLk9wdGlvblBhcnNlcih1c2FnZT0ndXNhZ2U6ICVwcm9nIFtvcHRpb25zXSB3M2Nf dGVzdF9kaXJlY3RvcnknKQorCiAgICAgcGFyc2VyLmFkZF9vcHRpb24oJy1uJywgJy0tbm8tb3Zl cndyaXRlJywgZGVzdD0nb3ZlcndyaXRlJywgYWN0aW9uPSdzdG9yZV9mYWxzZScsIGRlZmF1bHQ9 VHJ1ZSwKICAgICAgICAgaGVscD0nRmxhZyB0byBwcmV2ZW50IGR1cGxpY2F0ZSB0ZXN0IGZpbGVz IGZyb20gb3ZlcndyaXRpbmcgZXhpc3RpbmcgdGVzdHMuIEJ5IGRlZmF1bHQsIHRoZXkgd2lsbCBi ZSBvdmVyd3JpdHRlbicpCisgICAgcGFyc2VyLmFkZF9vcHRpb24oJy1sJywgJy0tbm8tbGlua3Mt Y29udmVyc2lvbicsIGRlc3Q9J25vX2xpbmtzX2NvbnZlcnNpb24nLCBhY3Rpb249J3N0b3JlX3Ry dWUnLCBkZWZhdWx0PUZhbHNlLAorICAgICAgICBoZWxwPSdEbyBub3QgY2hhbmdlIGxpbmtzICh0 ZXN0aGFybmVzcyBqcyBvciBjc3MpLiBCeSBkZWZhdWx0LCBsaW5rcyBhcmUgY29udmVydGVkIHRv IHBvaW50IHRvIFdlYktpdCB0ZXN0aGFybmVzcyBmaWxlcy4nKQorCiAgICAgcGFyc2VyLmFkZF9v cHRpb24oJy1hJywgJy0tYWxsJywgYWN0aW9uPSdzdG9yZV90cnVlJywgZGVmYXVsdD1GYWxzZSwK ICAgICAgICAgaGVscD0nSW1wb3J0IGFsbCB0ZXN0cyBpbmNsdWRpbmcgcmVmdGVzdHMsIEpTIHRl c3RzLCBhbmQgbWFudWFsL3BpeGVsIHRlc3RzLiBCeSBkZWZhdWx0LCBvbmx5IHJlZnRlc3RzIGFu ZCBKUyB0ZXN0cyBhcmUgaW1wb3J0ZWQnKQogICAgIHBhcnNlci5hZGRfb3B0aW9uKCctZCcsICct LWRlc3QtZGlyJywgZGVzdD0nZGVzdGluYXRpb24nLCBkZWZhdWx0PSd3M2MnLApAQCAtMjgzLDYg KzI4Nyw4IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAgICAgICAgICAgICAgIGVs c2U6CiAgICAgICAgICAgICAgICAgICAgIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8gPSBOb25lCiAK KyAgICAgICAgICAgICAgICBjb252ZXJ0X3Rlc3RfaGFybmVzc19saW5rcyA9IEZhbHNlIGlmIHNl bGYub3B0aW9ucy5ub19saW5rc19jb252ZXJzaW9uIGVsc2UgVHJ1ZQorCiAgICAgICAgICAgICAg ICAgaWYgbm90KG9zLnBhdGguZXhpc3RzKG9zLnBhdGguZGlybmFtZShuZXdfZmlsZXBhdGgpKSk6 CiAgICAgICAgICAgICAgICAgICAgIG9zLm1ha2VkaXJzKG9zLnBhdGguZGlybmFtZShuZXdfZmls ZXBhdGgpKQogCkBAIC0zMDAsNyArMzA2LDcgQEAgY2xhc3MgVGVzdEltcG9ydGVyKG9iamVjdCk6 CiAgICAgICAgICAgICAgICAgbWltZXR5cGUgPSBtaW1ldHlwZXMuZ3Vlc3NfdHlwZShvcmlnX2Zp bGVwYXRoKQogICAgICAgICAgICAgICAgIGlmICdodG1sJyBpbiBzdHIobWltZXR5cGVbMF0pIG9y ICd4bWwnIGluIHN0cihtaW1ldHlwZVswXSkgIG9yICdjc3MnIGluIHN0cihtaW1ldHlwZVswXSk6 CiAgICAgICAgICAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICAgICAgICAgIGNvbnZl cnRlZF9maWxlID0gY29udmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBmaWxlbmFtZT1vcmlnX2Zp bGVwYXRoLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvPXJlZmVyZW5jZV9zdXBwb3J0X2luZm8pCisg ICAgICAgICAgICAgICAgICAgICAgICBjb252ZXJ0ZWRfZmlsZSA9IGNvbnZlcnRfZm9yX3dlYmtp dChuZXdfcGF0aCwgZmlsZW5hbWU9b3JpZ19maWxlcGF0aCwgcmVmZXJlbmNlX3N1cHBvcnRfaW5m bz1yZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBjb252ZXJ0X3Rlc3RfaGFybmVzc19saW5rcz1jb252 ZXJ0X3Rlc3RfaGFybmVzc19saW5rcykKICAgICAgICAgICAgICAgICAgICAgZXhjZXB0OgogICAg ICAgICAgICAgICAgICAgICAgICAgX2xvZy53YXJuKCdGYWlsZWQgY29udmVydGluZyAlcycsIG9y aWdfZmlsZXBhdGgpCiAgICAgICAgICAgICAgICAgICAgICAgICBmYWlsZWRfY29udmVyc2lvbl9m aWxlcy5hcHBlbmQob3JpZ19maWxlcGF0aCkK 243698 2014-12-23 15:20:40 -0800 2014-12-23 15:23:45 -0800 Updated new option name bug-134763-20141224002040.patch text/plain 5440 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NjIwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGM2N2ZmOWVjZDIxOWYwYjhjOGEyZDcwNmY1MWQ2Yjgx NjU3Y2UxYS4uYjIyMGE4MjMyMjY0MzU0MTFlNGQ3ZDEzNWQ4YTdiNzk0MjdiNzRmNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE0LTEyLTIzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnI+CisKKyAgICAgICAgVzNDIHRlc3QgaW1wb3J0ZXIgc2hvdWxkIGhhdmUgYW4gb3B0aW9uIHRv IGRpc2FibGUgdGVzdGhhcm5lc3MuanMvdGVzdGhhcm5lc3NyZXBvcnQuanMgbGluayBjb252ZXJz aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ3 NjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRp bmcgYW4gb3B0aW9uIHRvIGRpc2FibGUgdGVzdCBoYXJuZXNzIGxpbmsgY29udmVyc2lvbi4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5OgorICAgICAg ICAoY29udmVydF9mb3Jfd2Via2l0KToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLl9faW5p dF9fKToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLmNvbnZlcnRfYXR0cmlidXRlc19pZl9u ZWVkZWQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHk6 CisgICAgICAgIChwYXJzZV9hcmdzKToKKyAgICAgICAgKFRlc3RJbXBvcnRlci5pbXBvcnRfdGVz dHMpOgorCiAyMDE0LTEyLTE5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgog CiAgICAgICAgIFtXaW5dIFJldmlzZSBEUlQgbG9naWMgdG8gbWF0Y2ggTWFjLgpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQppbmRleCA0OTkwNzhlNWMwZTky YzliZTMxZGMyZTE4N2FhMDZmMjAyYzc2YzE4Li44ZDRiOTkyNGE2N2MzNTk5ZTdlZDY3ZmE5MGVm MTk5NzY4Nzc1OGRmIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0 X2NvbnZlcnRlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZl cnRlci5weQpAQCAtMzcsMTIgKzM3LDEyIEBAIGZyb20gSFRNTFBhcnNlciBpbXBvcnQgSFRNTFBh cnNlcgogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiAKLWRlZiBjb252ZXJ0 X2Zvcl93ZWJraXQobmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBo b3N0PUhvc3QoKSk6CitkZWYgY29udmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBmaWxlbmFtZSwg cmVmZXJlbmNlX3N1cHBvcnRfaW5mbywgaG9zdD1Ib3N0KCksIGNvbnZlcnRfdGVzdF9oYXJuZXNz X2xpbmtzPVRydWUpOgogICAgICIiIiBDb252ZXJ0cyBhIGZpbGUncyB8Y29udGVudHN8IHNvIGl0 IHdpbGwgZnVuY3Rpb24gY29ycmVjdGx5IGluIGl0cyB8bmV3X3BhdGh8IGluIFdlYmtpdC4KIAog ICAgIFJldHVybnMgdGhlIGxpc3Qgb2YgbW9kaWZpZWQgcHJvcGVydGllcyBhbmQgdGhlIG1vZGlm aWVkIHRleHQgaWYgdGhlIGZpbGUgd2FzIG1vZGlmZWQsIE5vbmUgb3RoZXJ3aXNlLiIiIgogICAg IGNvbnRlbnRzID0gaG9zdC5maWxlc3lzdGVtLnJlYWRfYmluYXJ5X2ZpbGUoZmlsZW5hbWUpCi0g ICAgY29udmVydGVyID0gX1czQ1Rlc3RDb252ZXJ0ZXIobmV3X3BhdGgsIGZpbGVuYW1lLCByZWZl cmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0KQorICAgIGNvbnZlcnRlciA9IF9XM0NUZXN0Q29udmVy dGVyKG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5mbywgaG9zdCwgY29u dmVydF90ZXN0X2hhcm5lc3NfbGlua3MpCiAgICAgaWYgZmlsZW5hbWUuZW5kc3dpdGgoJy5jc3Mn KToKICAgICAgICAgcmV0dXJuIGNvbnZlcnRlci5hZGRfd2Via2l0X3ByZWZpeF90b191bnByZWZp eGVkX3Byb3BlcnRpZXNfYW5kX3ZhbHVlcyhjb250ZW50cykKICAgICBlbHNlOgpAQCAtNTIsNyAr NTIsNyBAQCBkZWYgY29udmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJl bmNlX3N1cHBvcnRfaW5mbywgaG9zdD1Ib3N0KCkpOgogCiAKIGNsYXNzIF9XM0NUZXN0Q29udmVy dGVyKEhUTUxQYXJzZXIpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuZXdfcGF0aCwgZmlsZW5h bWUsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgpKToKKyAgICBkZWYgX19pbml0 X18oc2VsZiwgbmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0 PUhvc3QoKSwgY29udmVydF90ZXN0X2hhcm5lc3NfbGlua3M9VHJ1ZSk6CiAgICAgICAgIEhUTUxQ YXJzZXIuX19pbml0X18oc2VsZikKIAogICAgICAgICBzZWxmLl9ob3N0ID0gaG9zdApAQCAtNzAs NiArNzAsNyBAQCBjbGFzcyBfVzNDVGVzdENvbnZlcnRlcihIVE1MUGFyc2VyKToKICAgICAgICAg cmVzb3VyY2VzX3BhdGggPSBzZWxmLnBhdGhfZnJvbV93ZWJraXRfcm9vdCgnTGF5b3V0VGVzdHMn LCAncmVzb3VyY2VzJykKICAgICAgICAgcmVzb3VyY2VzX3JlbHBhdGggPSBzZWxmLl9maWxlc3lz dGVtLnJlbHBhdGgocmVzb3VyY2VzX3BhdGgsIG5ld19wYXRoKQogICAgICAgICBzZWxmLm5ld190 ZXN0X2hhcm5lc3NfcGF0aCA9IHJlc291cmNlc19yZWxwYXRoCisgICAgICAgIHNlbGYuY29udmVy dF90ZXN0X2hhcm5lc3NfbGlua3MgPSBjb252ZXJ0X3Rlc3RfaGFybmVzc19saW5rcwogCiAgICAg ICAgICMgVGhlc2Ugc2V0dGluZ3MgbWlnaHQgdmFyeSBiZXR3ZWVuIFdlYktpdCBhbmQgQmxpbmsK ICAgICAgICAgc2VsZi5fY3NzX3Byb3BlcnR5X2ZpbGUgPSBzZWxmLnBhdGhfZnJvbV93ZWJraXRf cm9vdCgnU291cmNlJywgJ1dlYkNvcmUnLCAnY3NzJywgJ0NTU1Byb3BlcnR5TmFtZXMuaW4nKQpA QCAtMTY1LDcgKzE2Niw3IEBAIGNsYXNzIF9XM0NUZXN0Q29udmVydGVyKEhUTUxQYXJzZXIpOgog CiAgICAgZGVmIGNvbnZlcnRfYXR0cmlidXRlc19pZl9uZWVkZWQoc2VsZiwgdGFnLCBhdHRycyk6 CiAgICAgICAgIGNvbnZlcnRlZCA9IHNlbGYuZ2V0X3N0YXJ0dGFnX3RleHQoKQotICAgICAgICBp ZiB0YWcgaW4gKCdzY3JpcHQnLCAnbGluaycpOgorICAgICAgICBpZiBzZWxmLmNvbnZlcnRfdGVz dF9oYXJuZXNzX2xpbmtzIGFuZCB0YWcgaW4gKCdzY3JpcHQnLCAnbGluaycpOgogICAgICAgICAg ICAgYXR0cl9uYW1lID0gJ3NyYycKICAgICAgICAgICAgIGlmIHRhZyAhPSAnc2NyaXB0JzoKICAg ICAgICAgICAgICAgICBhdHRyX25hbWUgPSAnaHJlZicKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3czYy90ZXN0X2ltcG9ydGVyLnB5CmluZGV4IDAwMTc3Nzk4MjExNjkzN2YwOWU4YmUxMzhlYTU1 ZGU2YmE2MWU0MmEuLjkzNjJhMGExYjJmNDdmNjJhMjdjMjc0MzE5MGI5N2NiOWRmMGZmNTUgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQpAQCAtMTIwLDgg KzEyMCwxMiBAQCBkZWYgY29uZmlndXJlX2xvZ2dpbmcoKToKIAogZGVmIHBhcnNlX2FyZ3MoKToK ICAgICBwYXJzZXIgPSBvcHRwYXJzZS5PcHRpb25QYXJzZXIodXNhZ2U9J3VzYWdlOiAlcHJvZyBb b3B0aW9uc10gdzNjX3Rlc3RfZGlyZWN0b3J5JykKKwogICAgIHBhcnNlci5hZGRfb3B0aW9uKCct bicsICctLW5vLW92ZXJ3cml0ZScsIGRlc3Q9J292ZXJ3cml0ZScsIGFjdGlvbj0nc3RvcmVfZmFs c2UnLCBkZWZhdWx0PVRydWUsCiAgICAgICAgIGhlbHA9J0ZsYWcgdG8gcHJldmVudCBkdXBsaWNh dGUgdGVzdCBmaWxlcyBmcm9tIG92ZXJ3cml0aW5nIGV4aXN0aW5nIHRlc3RzLiBCeSBkZWZhdWx0 LCB0aGV5IHdpbGwgYmUgb3ZlcndyaXR0ZW4nKQorICAgIHBhcnNlci5hZGRfb3B0aW9uKCctbCcs ICctLW5vLWxpbmtzLWNvbnZlcnNpb24nLCBkZXN0PSdsaW5rc19jb252ZXJzaW9uJywgYWN0aW9u PSdzdG9yZV9mYWxzZScsIGRlZmF1bHQ9VHJ1ZSwKKyAgICAgICAgaGVscD0nRG8gbm90IGNoYW5n ZSBsaW5rcyAodGVzdGhhcm5lc3MganMgb3IgY3NzIGUuZy4pLiBCeSBkZWZhdWx0LCBsaW5rcyBh cmUgY29udmVydGVkIHRvIHBvaW50IHRvIFdlYktpdCB0ZXN0aGFybmVzcyBmaWxlcy4nKQorCiAg ICAgcGFyc2VyLmFkZF9vcHRpb24oJy1hJywgJy0tYWxsJywgYWN0aW9uPSdzdG9yZV90cnVlJywg ZGVmYXVsdD1GYWxzZSwKICAgICAgICAgaGVscD0nSW1wb3J0IGFsbCB0ZXN0cyBpbmNsdWRpbmcg cmVmdGVzdHMsIEpTIHRlc3RzLCBhbmQgbWFudWFsL3BpeGVsIHRlc3RzLiBCeSBkZWZhdWx0LCBv bmx5IHJlZnRlc3RzIGFuZCBKUyB0ZXN0cyBhcmUgaW1wb3J0ZWQnKQogICAgIHBhcnNlci5hZGRf b3B0aW9uKCctZCcsICctLWRlc3QtZGlyJywgZGVzdD0nZGVzdGluYXRpb24nLCBkZWZhdWx0PSd3 M2MnLApAQCAtMzAwLDcgKzMwNCw3IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAg ICAgICAgICAgICAgIG1pbWV0eXBlID0gbWltZXR5cGVzLmd1ZXNzX3R5cGUob3JpZ19maWxlcGF0 aCkKICAgICAgICAgICAgICAgICBpZiAnaHRtbCcgaW4gc3RyKG1pbWV0eXBlWzBdKSBvciAneG1s JyBpbiBzdHIobWltZXR5cGVbMF0pICBvciAnY3NzJyBpbiBzdHIobWltZXR5cGVbMF0pOgogICAg ICAgICAgICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgICAgICAgICBjb252ZXJ0ZWRf ZmlsZSA9IGNvbnZlcnRfZm9yX3dlYmtpdChuZXdfcGF0aCwgZmlsZW5hbWU9b3JpZ19maWxlcGF0 aCwgcmVmZXJlbmNlX3N1cHBvcnRfaW5mbz1yZWZlcmVuY2Vfc3VwcG9ydF9pbmZvKQorICAgICAg ICAgICAgICAgICAgICAgICAgY29udmVydGVkX2ZpbGUgPSBjb252ZXJ0X2Zvcl93ZWJraXQobmV3 X3BhdGgsIGZpbGVuYW1lPW9yaWdfZmlsZXBhdGgsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm89cmVm ZXJlbmNlX3N1cHBvcnRfaW5mbywgY29udmVydF90ZXN0X2hhcm5lc3NfbGlua3M9c2VsZi5vcHRp b25zLmxpbmtzX2NvbnZlcnNpb24pCiAgICAgICAgICAgICAgICAgICAgIGV4Y2VwdDoKICAgICAg ICAgICAgICAgICAgICAgICAgIF9sb2cud2FybignRmFpbGVkIGNvbnZlcnRpbmcgJXMnLCBvcmln X2ZpbGVwYXRoKQogICAgICAgICAgICAgICAgICAgICAgICAgZmFpbGVkX2NvbnZlcnNpb25fZmls ZXMuYXBwZW5kKG9yaWdfZmlsZXBhdGgpCg== 243699 2014-12-23 15:23:52 -0800 2014-12-24 16:54:16 -0800 Updated new option name bug-134763-20141224002352.patch text/plain 5460 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NjIwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGM2N2ZmOWVjZDIxOWYwYjhjOGEyZDcwNmY1MWQ2Yjgx NjU3Y2UxYS4uYjIyMGE4MjMyMjY0MzU0MTFlNGQ3ZDEzNWQ4YTdiNzk0MjdiNzRmNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE0LTEyLTIzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnI+CisKKyAgICAgICAgVzNDIHRlc3QgaW1wb3J0ZXIgc2hvdWxkIGhhdmUgYW4gb3B0aW9uIHRv IGRpc2FibGUgdGVzdGhhcm5lc3MuanMvdGVzdGhhcm5lc3NyZXBvcnQuanMgbGluayBjb252ZXJz aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ3 NjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRp bmcgYW4gb3B0aW9uIHRvIGRpc2FibGUgdGVzdCBoYXJuZXNzIGxpbmsgY29udmVyc2lvbi4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyLnB5OgorICAgICAg ICAoY29udmVydF9mb3Jfd2Via2l0KToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLl9faW5p dF9fKToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLmNvbnZlcnRfYXR0cmlidXRlc19pZl9u ZWVkZWQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHk6 CisgICAgICAgIChwYXJzZV9hcmdzKToKKyAgICAgICAgKFRlc3RJbXBvcnRlci5pbXBvcnRfdGVz dHMpOgorCiAyMDE0LTEyLTE5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgog CiAgICAgICAgIFtXaW5dIFJldmlzZSBEUlQgbG9naWMgdG8gbWF0Y2ggTWFjLgpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlci5weQppbmRleCA0OTkwNzhlNWMwZTky YzliZTMxZGMyZTE4N2FhMDZmMjAyYzc2YzE4Li44ZDRiOTkyNGE2N2MzNTk5ZTdlZDY3ZmE5MGVm MTk5NzY4Nzc1OGRmIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0 X2NvbnZlcnRlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZl cnRlci5weQpAQCAtMzcsMTIgKzM3LDEyIEBAIGZyb20gSFRNTFBhcnNlciBpbXBvcnQgSFRNTFBh cnNlcgogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiAKLWRlZiBjb252ZXJ0 X2Zvcl93ZWJraXQobmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBo b3N0PUhvc3QoKSk6CitkZWYgY29udmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBmaWxlbmFtZSwg cmVmZXJlbmNlX3N1cHBvcnRfaW5mbywgaG9zdD1Ib3N0KCksIGNvbnZlcnRfdGVzdF9oYXJuZXNz X2xpbmtzPVRydWUpOgogICAgICIiIiBDb252ZXJ0cyBhIGZpbGUncyB8Y29udGVudHN8IHNvIGl0 IHdpbGwgZnVuY3Rpb24gY29ycmVjdGx5IGluIGl0cyB8bmV3X3BhdGh8IGluIFdlYmtpdC4KIAog ICAgIFJldHVybnMgdGhlIGxpc3Qgb2YgbW9kaWZpZWQgcHJvcGVydGllcyBhbmQgdGhlIG1vZGlm aWVkIHRleHQgaWYgdGhlIGZpbGUgd2FzIG1vZGlmZWQsIE5vbmUgb3RoZXJ3aXNlLiIiIgogICAg IGNvbnRlbnRzID0gaG9zdC5maWxlc3lzdGVtLnJlYWRfYmluYXJ5X2ZpbGUoZmlsZW5hbWUpCi0g ICAgY29udmVydGVyID0gX1czQ1Rlc3RDb252ZXJ0ZXIobmV3X3BhdGgsIGZpbGVuYW1lLCByZWZl cmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0KQorICAgIGNvbnZlcnRlciA9IF9XM0NUZXN0Q29udmVy dGVyKG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJlbmNlX3N1cHBvcnRfaW5mbywgaG9zdCwgY29u dmVydF90ZXN0X2hhcm5lc3NfbGlua3MpCiAgICAgaWYgZmlsZW5hbWUuZW5kc3dpdGgoJy5jc3Mn KToKICAgICAgICAgcmV0dXJuIGNvbnZlcnRlci5hZGRfd2Via2l0X3ByZWZpeF90b191bnByZWZp eGVkX3Byb3BlcnRpZXNfYW5kX3ZhbHVlcyhjb250ZW50cykKICAgICBlbHNlOgpAQCAtNTIsNyAr NTIsNyBAQCBkZWYgY29udmVydF9mb3Jfd2Via2l0KG5ld19wYXRoLCBmaWxlbmFtZSwgcmVmZXJl bmNlX3N1cHBvcnRfaW5mbywgaG9zdD1Ib3N0KCkpOgogCiAKIGNsYXNzIF9XM0NUZXN0Q29udmVy dGVyKEhUTUxQYXJzZXIpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuZXdfcGF0aCwgZmlsZW5h bWUsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIGhvc3Q9SG9zdCgpKToKKyAgICBkZWYgX19pbml0 X18oc2VsZiwgbmV3X3BhdGgsIGZpbGVuYW1lLCByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvLCBob3N0 PUhvc3QoKSwgY29udmVydF90ZXN0X2hhcm5lc3NfbGlua3M9VHJ1ZSk6CiAgICAgICAgIEhUTUxQ YXJzZXIuX19pbml0X18oc2VsZikKIAogICAgICAgICBzZWxmLl9ob3N0ID0gaG9zdApAQCAtNzAs NiArNzAsNyBAQCBjbGFzcyBfVzNDVGVzdENvbnZlcnRlcihIVE1MUGFyc2VyKToKICAgICAgICAg cmVzb3VyY2VzX3BhdGggPSBzZWxmLnBhdGhfZnJvbV93ZWJraXRfcm9vdCgnTGF5b3V0VGVzdHMn LCAncmVzb3VyY2VzJykKICAgICAgICAgcmVzb3VyY2VzX3JlbHBhdGggPSBzZWxmLl9maWxlc3lz dGVtLnJlbHBhdGgocmVzb3VyY2VzX3BhdGgsIG5ld19wYXRoKQogICAgICAgICBzZWxmLm5ld190 ZXN0X2hhcm5lc3NfcGF0aCA9IHJlc291cmNlc19yZWxwYXRoCisgICAgICAgIHNlbGYuY29udmVy dF90ZXN0X2hhcm5lc3NfbGlua3MgPSBjb252ZXJ0X3Rlc3RfaGFybmVzc19saW5rcwogCiAgICAg ICAgICMgVGhlc2Ugc2V0dGluZ3MgbWlnaHQgdmFyeSBiZXR3ZWVuIFdlYktpdCBhbmQgQmxpbmsK ICAgICAgICAgc2VsZi5fY3NzX3Byb3BlcnR5X2ZpbGUgPSBzZWxmLnBhdGhfZnJvbV93ZWJraXRf cm9vdCgnU291cmNlJywgJ1dlYkNvcmUnLCAnY3NzJywgJ0NTU1Byb3BlcnR5TmFtZXMuaW4nKQpA QCAtMTY1LDcgKzE2Niw3IEBAIGNsYXNzIF9XM0NUZXN0Q29udmVydGVyKEhUTUxQYXJzZXIpOgog CiAgICAgZGVmIGNvbnZlcnRfYXR0cmlidXRlc19pZl9uZWVkZWQoc2VsZiwgdGFnLCBhdHRycyk6 CiAgICAgICAgIGNvbnZlcnRlZCA9IHNlbGYuZ2V0X3N0YXJ0dGFnX3RleHQoKQotICAgICAgICBp ZiB0YWcgaW4gKCdzY3JpcHQnLCAnbGluaycpOgorICAgICAgICBpZiBzZWxmLmNvbnZlcnRfdGVz dF9oYXJuZXNzX2xpbmtzIGFuZCB0YWcgaW4gKCdzY3JpcHQnLCAnbGluaycpOgogICAgICAgICAg ICAgYXR0cl9uYW1lID0gJ3NyYycKICAgICAgICAgICAgIGlmIHRhZyAhPSAnc2NyaXB0JzoKICAg ICAgICAgICAgICAgICBhdHRyX25hbWUgPSAnaHJlZicKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3czYy90ZXN0X2ltcG9ydGVyLnB5CmluZGV4IDAwMTc3Nzk4MjExNjkzN2YwOWU4YmUxMzhlYTU1 ZGU2YmE2MWU0MmEuLjk1MzQ4ZTAzYWIzNTEyZjBlMGJjMWZiZDA3ODI3YjNlODJlYzRlMzUgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQpAQCAtMTIwLDgg KzEyMCwxMiBAQCBkZWYgY29uZmlndXJlX2xvZ2dpbmcoKToKIAogZGVmIHBhcnNlX2FyZ3MoKToK ICAgICBwYXJzZXIgPSBvcHRwYXJzZS5PcHRpb25QYXJzZXIodXNhZ2U9J3VzYWdlOiAlcHJvZyBb b3B0aW9uc10gdzNjX3Rlc3RfZGlyZWN0b3J5JykKKwogICAgIHBhcnNlci5hZGRfb3B0aW9uKCct bicsICctLW5vLW92ZXJ3cml0ZScsIGRlc3Q9J292ZXJ3cml0ZScsIGFjdGlvbj0nc3RvcmVfZmFs c2UnLCBkZWZhdWx0PVRydWUsCiAgICAgICAgIGhlbHA9J0ZsYWcgdG8gcHJldmVudCBkdXBsaWNh dGUgdGVzdCBmaWxlcyBmcm9tIG92ZXJ3cml0aW5nIGV4aXN0aW5nIHRlc3RzLiBCeSBkZWZhdWx0 LCB0aGV5IHdpbGwgYmUgb3ZlcndyaXR0ZW4nKQorICAgIHBhcnNlci5hZGRfb3B0aW9uKCctbCcs ICctLW5vLWxpbmtzLWNvbnZlcnNpb24nLCBkZXN0PSdjb252ZXJ0X3Rlc3RfaGFybmVzc19saW5r cycsIGFjdGlvbj0nc3RvcmVfZmFsc2UnLCBkZWZhdWx0PVRydWUsCisgICAgICAgIGhlbHA9J0Rv IG5vdCBjaGFuZ2UgbGlua3MgKHRlc3RoYXJuZXNzIGpzIG9yIGNzcyBlLmcuKS4gQnkgZGVmYXVs dCwgbGlua3MgYXJlIGNvbnZlcnRlZCB0byBwb2ludCB0byBXZWJLaXQgdGVzdGhhcm5lc3MgZmls ZXMuJykKKwogICAgIHBhcnNlci5hZGRfb3B0aW9uKCctYScsICctLWFsbCcsIGFjdGlvbj0nc3Rv cmVfdHJ1ZScsIGRlZmF1bHQ9RmFsc2UsCiAgICAgICAgIGhlbHA9J0ltcG9ydCBhbGwgdGVzdHMg aW5jbHVkaW5nIHJlZnRlc3RzLCBKUyB0ZXN0cywgYW5kIG1hbnVhbC9waXhlbCB0ZXN0cy4gQnkg ZGVmYXVsdCwgb25seSByZWZ0ZXN0cyBhbmQgSlMgdGVzdHMgYXJlIGltcG9ydGVkJykKICAgICBw YXJzZXIuYWRkX29wdGlvbignLWQnLCAnLS1kZXN0LWRpcicsIGRlc3Q9J2Rlc3RpbmF0aW9uJywg ZGVmYXVsdD0ndzNjJywKQEAgLTMwMCw3ICszMDQsNyBAQCBjbGFzcyBUZXN0SW1wb3J0ZXIob2Jq ZWN0KToKICAgICAgICAgICAgICAgICBtaW1ldHlwZSA9IG1pbWV0eXBlcy5ndWVzc190eXBlKG9y aWdfZmlsZXBhdGgpCiAgICAgICAgICAgICAgICAgaWYgJ2h0bWwnIGluIHN0cihtaW1ldHlwZVsw XSkgb3IgJ3htbCcgaW4gc3RyKG1pbWV0eXBlWzBdKSAgb3IgJ2NzcycgaW4gc3RyKG1pbWV0eXBl WzBdKToKICAgICAgICAgICAgICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgICAgICAgICAg Y29udmVydGVkX2ZpbGUgPSBjb252ZXJ0X2Zvcl93ZWJraXQobmV3X3BhdGgsIGZpbGVuYW1lPW9y aWdfZmlsZXBhdGgsIHJlZmVyZW5jZV9zdXBwb3J0X2luZm89cmVmZXJlbmNlX3N1cHBvcnRfaW5m bykKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnZlcnRlZF9maWxlID0gY29udmVydF9mb3Jf d2Via2l0KG5ld19wYXRoLCBmaWxlbmFtZT1vcmlnX2ZpbGVwYXRoLCByZWZlcmVuY2Vfc3VwcG9y dF9pbmZvPXJlZmVyZW5jZV9zdXBwb3J0X2luZm8sIGNvbnZlcnRfdGVzdF9oYXJuZXNzX2xpbmtz PXNlbGYub3B0aW9ucy5jb252ZXJ0X3Rlc3RfaGFybmVzc19saW5rcykKICAgICAgICAgICAgICAg ICAgICAgZXhjZXB0OgogICAgICAgICAgICAgICAgICAgICAgICAgX2xvZy53YXJuKCdGYWlsZWQg Y29udmVydGluZyAlcycsIG9yaWdfZmlsZXBhdGgpCiAgICAgICAgICAgICAgICAgICAgICAgICBm YWlsZWRfY29udmVyc2lvbl9maWxlcy5hcHBlbmQob3JpZ19maWxlcGF0aCkK