37377 2010-04-09 18:06:35 -0700 Don't reinvent Executive.cpu_count for every port 2010-04-10 07:56:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned cjerdonek dpranke eric ojan oldest_to_newest 211063 0 abarth 2010-04-09 18:06:35 -0700 Don't reinvent Executive.cpu_count for every port 211065 1 53026 abarth 2010-04-09 18:08:33 -0700 Created attachment 53026 Patch 211067 2 53026 eric 2010-04-09 18:20:05 -0700 Comment on attachment 53026 Patch OK. 211089 3 53026 abarth 2010-04-09 19:17:53 -0700 Comment on attachment 53026 Patch Clearing flags on attachment: 53026 Committed r57399: <http://trac.webkit.org/changeset/57399> 211090 4 abarth 2010-04-09 19:17:59 -0700 All reviewed patches have been landed. Closing bug. 211104 5 53026 dpranke 2010-04-09 20:27:31 -0700 Comment on attachment 53026 Patch diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py > index e5a0108..5185947 100755 > --- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py > +++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py > @@ -50,6 +50,7 @@ import logging > import math > import optparse > import os > +import platform > import Queue > import random > import re > @@ -71,6 +72,8 @@ from test_types import image_diff > from test_types import test_type_base > from test_types import text_diff > > +from webkitpy.common.system.executive import Executive > + > import port > > _log = logging.getLogger("webkitpy.layout_tests.run_webkit_tests") > @@ -1389,6 +1392,7 @@ def main(options, args): > stream=meter) > > port_obj = port.get(options.platform, options) > + executive = Executive() > > if not options.configuration: > options.configuration = port_obj.default_configuration() > @@ -1422,8 +1426,13 @@ def main(options, args): > ignore_errors=True) > > if not options.num_dump_render_trees: > - # TODO(ojan): Investigate perf/flakiness impact of using numcores + 1. > - options.num_dump_render_trees = port_obj.num_cores() > + # FIXME: Investigate perf/flakiness impact of using cpu_count + 1. > + options.num_dump_render_trees = executive.cpu_count() > + # FIXME: new-run-webkit-tests is unstable on Mac running more than > + # four threads in parallel. > + # See https://bugs.webkit.org/show_bug.cgi?id=36622 > + if platform.system() == "Dawin" and options.num_dump_render_trees > 4: > + options.num_dump_render_trees = 4 The instability isn't generic, it's port-specific, and there should be a port-specific way to limit parallelism. For example, the fact that the base mac port is unstable due to DumpRenderTree doesn't mean that we should limit the parallelism that Chromoium gets. I think a better way to implement this patch would've been to have base.num_cores() call the Executive module, and leave the hook in for any ports that didn't want the default logic. I went pretty far ensuring that anything platform-specific needed by run-webkit-tests would be wrapped up in the Port interface, so that a Port only needs to change things in one place. The rest of the Python code does not seem to have a similar since of layering (as evidenced by the switch statement in system/executive.py). Please don't undo this layering without replacing it with something equivalent or at least having more of a discussion about this. > > write = create_logging_writer(options, 'config') > write("Running %s DumpRenderTrees in parallel" % options.num_dump_render_trees) > @@ -1461,9 +1470,9 @@ def main(options, args): > # Creating the expecations for each platform/configuration pair does > # all the test list parsing and ensures it's correct syntax (e.g. no > # dupes). > - for platform in port_obj.test_platform_names(): > - test_runner.parse_expectations(platform, is_debug_mode=True) > - test_runner.parse_expectations(platform, is_debug_mode=False) > + for platform_name in port_obj.test_platform_names(): > + test_runner.parse_expectations(platform_name, is_debug_mode=True) > + test_runner.parse_expectations(platform_name, is_debug_mode=False) > meter.update("") > print ("If there are no fail messages, errors or exceptions, then the " > "lint succeeded.") I have no objection to this change, but it doesn't seem to have anything to do with the rest of this patch. Did it sneak in accidentally? 211139 6 cjerdonek 2010-04-10 06:07:55 -0700 Typo in this patch: + if system_name == "Dawin": + return int(self.run_command(["sysctl", "-n", "hw.ncpu"])) 211147 7 abarth 2010-04-10 07:56:46 -0700 > > + if platform.system() == "Dawin" and options.num_dump_render_trees > 4: > > + options.num_dump_render_trees = 4 > > The instability isn't generic, it's port-specific, and there should be a > port-specific way to limit parallelism. For example, the fact that the base mac > port is unstable due to DumpRenderTree doesn't mean that we should limit the > parallelism that Chromoium gets. Ok. It seems better to just fix the bug than to create something complicated to work around the issue. > I think a better way to implement this patch would've been to have > base.num_cores() call the Executive module, and leave the hook in for any ports > that didn't want the default logic. How about a base.default_dump_render_tree_count method? The number of cores your machine has doesn't vary by port, but the number of DRT instances you want could. > I went pretty far ensuring that anything platform-specific needed by > run-webkit-tests would be wrapped up in the Port interface, so that a Port only > needs to change things in one place. The rest of the Python code does not seem > to have a similar since of layering (as evidenced by the switch statement in > system/executive.py). Please don't undo this layering without replacing it with > something equivalent or at least having more of a discussion about this. There's really two things going on. We have a notion of a port (Gtk, Chromium, Qt, etc) and a notion of a platform (Mac, Windows, Linux). At the moment, the two are smashed together, which leads to the copy/paste code. In this particular case, the OS-specific code is just making up for a deficiency in the Python 2.5 library. In Python 2.6, the multiprocessing package abstracts away the platform specific logic for counting CPUs. In any case, I'll write a patch that I think will make you happy. :) > > @@ -1461,9 +1470,9 @@ def main(options, args): > > # Creating the expecations for each platform/configuration pair does > > # all the test list parsing and ensures it's correct syntax (e.g. no > > # dupes). > > - for platform in port_obj.test_platform_names(): > > - test_runner.parse_expectations(platform, is_debug_mode=True) > > - test_runner.parse_expectations(platform, is_debug_mode=False) > > + for platform_name in port_obj.test_platform_names(): > > + test_runner.parse_expectations(platform_name, is_debug_mode=True) > > + test_runner.parse_expectations(platform_name, is_debug_mode=False) > > meter.update("") > > print ("If there are no fail messages, errors or exceptions, then the " > > I have no objection to this change, but it doesn't seem to have anything to do > with the rest of this patch. Did it sneak in accidentally? The name "platform" conflicts with the import platform statements I added at the top of the file. 53026 2010-04-09 18:08:33 -0700 2010-04-09 20:27:31 -0700 Patch bug-37377-20100409180831.patch text/plain 10517 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzNmRlNzNiLi45YjE1Y2I2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMzAgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBEb24ndCByZWludmVudCBF eGVjdXRpdmUuY3B1X2NvdW50IGZvciBldmVyeSBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzM3NworCisgICAgICAgIG1hYy5weSBhbmQgY2hy b21pdW1fbWFjLnB5IGhhZCBzb21lIGNvcHkvcGFzdGUgY29kZS4gIFRoaXMgY29kZSBkb2Vzbid0 CisgICAgICAgIGFjdHVhbGx5IGhhdmUgYW55dGhpbmcgdG8gZG8gd2l0aCBXZWJLaXQgcG9ydHMu ICBJdCdzIHJlYWxseSBqdXN0CisgICAgICAgIHNvbWV0aGluZyBpbiB0aGUgbXVsdGlwcm9jZXNz aW5nIHBhY2thZ2UuICBUaGUgbGFtZSBiaXQgaXMgdGhhdCBwYWNrYWdlCisgICAgICAgIGlzbid0 IGF2YWlsYWJsZSBpbiBvbGRlciB2ZXJzaW9ucyBvZiBQeXRob24sIHNvIHdlIG5lZWQgdG8gaW1w bGVtZW50IGEKKyAgICAgICAgZmFsbGJhY2suICBIb3dldmVyLCB3ZSBhbHJlYWR5IGhhdmUgdGhl IGZhbGxiYWNrIGluIGNvbW1vbi4gIFdlIGRvbid0CisgICAgICAgIG5lZWQgdG8gcmVpbnZlbnQg aXQgc3BlY2lmaWNseSBmb3IgbGF5b3V0X3Rlc3RzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5OgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5OgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5OgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5OgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorCisy MDEwLTA0LTA5ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgbmV3LXJ1bi13ZWJraXQtdGVzdHMg LS1yZWxlYXNlIGZhaWxzIHRvIGJ1aWxkIHJlbGVhc2UgRFJUIHdoZW4gZ2xvYmFsIGNvbmZpZ3Vy YXRpb24gaXMgRGVidWcKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM3Mzc2CiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5CmluZGV4IDAwYmUxY2MuLjg3ZDcyN2QgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRp dmUucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4 ZWN1dGl2ZS5weQpAQCAtMzQsNiArMzQsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgbXVs dGlwcm9jZXNzaW5nID0gTm9uZQogCiBpbXBvcnQgb3MKK2ltcG9ydCBwbGF0Zm9ybQogaW1wb3J0 IFN0cmluZ0lPCiBpbXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHN5cwpAQCAtMTIyLDYgKzEyMywx NiBAQCBjbGFzcyBFeGVjdXRpdmUob2JqZWN0KToKICAgICBkZWYgY3B1X2NvdW50KCk6CiAgICAg ICAgIGlmIG11bHRpcHJvY2Vzc2luZzoKICAgICAgICAgICAgIHJldHVybiBtdWx0aXByb2Nlc3Np bmcuY3B1X2NvdW50KCkKKyAgICAgICAgIyBEYXJuLiAgV2UgZG9uJ3QgaGF2ZSB0aGUgbXVsdGlw cm9jZXNzaW5nIHBhY2thZ2UuCisgICAgICAgIHN5c3RlbV9uYW1lID0gcGxhdGZvcm0uc3lzdGVt KCkKKyAgICAgICAgaWYgc3lzdGVtX25hbWUgPT0gIkRhd2luIjoKKyAgICAgICAgICAgIHJldHVy biBpbnQoc2VsZi5ydW5fY29tbWFuZChbInN5c2N0bCIsICItbiIsICJody5uY3B1Il0pKQorICAg ICAgICBlbGlmIHN5c3RlbV9uYW1lID09ICJXaW5kb3dzIjoKKyAgICAgICAgICAgIHJldHVybiBp bnQob3MuZW52aXJvbi5nZXQoJ05VTUJFUl9PRl9QUk9DRVNTT1JTJywgMSkpCisgICAgICAgIGVs aWYgc3lzdGVtX25hbWUgPT0gIkxpbnV4IjoKKyAgICAgICAgICAgIG51bV9jb3JlcyA9IG9zLnN5 c2NvbmYoIlNDX05QUk9DRVNTT1JTX09OTE4iKQorICAgICAgICAgICAgaWYgaXNpbnN0YW5jZShu dW1fY29yZXMsIGludCkgYW5kIG51bV9jb3JlcyA+IDA6CisgICAgICAgICAgICAgICAgcmV0dXJu IG51bV9jb3JlcwogICAgICAgICAjIFRoaXMgcXVhbnRpdHkgaXMgYSBsaWUgYnV0IHByb2JhYmx5 IGEgcmVhc29uYWJsZSBndWVzcyBmb3IgbW9kZXJuCiAgICAgICAgICMgbWFjaGluZXMuCiAgICAg ICAgIHJldHVybiAyCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Jhc2UucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5kZXggZjViZTU2MC4uZTVmMDFkZSAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFz ZS5weQpAQCAtMjg2LDEzICsyODYsNiBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIG1h eSBiZSBkaWZmZXJlbnQgKGUuZy4sICd3aW4teHAnIGluc3RlYWQgb2YgJ2Nocm9taXVtLXdpbi14 cCcuIiIiCiAgICAgICAgIHJldHVybiBzZWxmLl9uYW1lCiAKLSAgICBkZWYgbnVtX2NvcmVzKHNl bGYpOgotICAgICAgICAiIiJSZXR1cm4gdGhlIG51bWJlciBvZiBjb3Jlcy9jcHVzIGF2YWlsYWJs ZSBvbiB0aGlzIG1hY2hpbmUuCi0KLSAgICAgICAgVGhpcyByb3V0aW5lIGlzIHVzZWQgdG8gZGV0 ZXJtaW5lIHRoZSBkZWZhdWx0IGFtb3VudCBvZiBwYXJhbGxlbGlzbQotICAgICAgICB1c2VkIGJ5 IHJ1bi1jaHJvbWl1bS13ZWJraXQtdGVzdHMuIiIiCi0gICAgICAgIHJhaXNlIE5vdEltcGxlbWVu dGVkRXJyb3IoJ1BvcnQubnVtX2NvcmVzJykKLQogICAgICMgRklYTUU6IFRoaXMgY291bGQgYmUg cmVwbGFjZWQgYnkgZnVuY3Rpb25zIGluIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5zY20uCiAg ICAgZGVmIHBhdGhfZnJvbV93ZWJraXRfYmFzZShzZWxmLCAqY29tcHMpOgogICAgICAgICAiIiJS ZXR1cm5zIHRoZSBmdWxsIHBhdGggdG8gcGF0aCBtYWRlIGJ5IGpvaW5pbmcgdGhlIHRvcCBvZiB0 aGUKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW0ucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtLnB5CmluZGV4IDQ0MzU3NjAuLjViOTBiODUgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0u cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bS5weQpAQCAtNDQsNiArNDQsNyBAQCBpbXBvcnQgd2Vic29ja2V0X3NlcnZlcgogX2xv ZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCJ3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5jaHJvbWl1 bSIpCiAKIAorIyBGSVhNRTogVGhpcyBmdW5jdGlvbiBkb2Vzbid0IGJlbG9uZyBpbiB0aGlzIHBh Y2thZ2UuCiBkZWYgY2hlY2tfZmlsZV9leGlzdHMocGF0aF90b19maWxlLCBmaWxlX2Rlc2NyaXB0 aW9uLCBvdmVycmlkZV9zdGVwPU5vbmUsCiAgICAgICAgICAgICAgICAgICAgICAgbG9nZ2luZz1U cnVlKToKICAgICAiIiJWZXJpZnkgdGhlIGZpbGUgaXMgcHJlc2VudCB3aGVyZSBleHBlY3RlZCBv ciBsb2cgYW4gZXJyb3IuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weQppbmRleCBkNjgx NDcyLi4xZGRiYzIyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5CisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkKQEAgLTczLDEy ICs3Myw2IEBAIGNsYXNzIENocm9taXVtTGludXhQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6 CiAgICAgICAgICAgICAgICAgICAgICAgICdMaW51eEJ1aWxkSW5zdHJ1Y3Rpb25zJykKICAgICAg ICAgcmV0dXJuIHJlc3VsdAogCi0gICAgZGVmIG51bV9jb3JlcyhzZWxmKToKLSAgICAgICAgbnVt X2NvcmVzID0gb3Muc3lzY29uZigiU0NfTlBST0NFU1NPUlNfT05MTiIpCi0gICAgICAgIGlmIGlz aW5zdGFuY2UobnVtX2NvcmVzLCBpbnQpIGFuZCBudW1fY29yZXMgPiAwOgotICAgICAgICAgICAg cmV0dXJuIG51bV9jb3JlcwotICAgICAgICByZXR1cm4gMQotCiAgICAgZGVmIHRlc3RfcGxhdGZv cm1fbmFtZShzZWxmKToKICAgICAgICAgIyBXZSB1c2UgJ2xpbnV4JyBpbnN0ZWFkIG9mICdjaHJv bWl1bS1saW51eCcgaW4gdGVzdF9leHBlY3RhdGlvbnMudHh0LgogICAgICAgICByZXR1cm4gJ2xp bnV4JwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bV9tYWMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQppbmRleCBkNDc3ZjQwLi44ZjVjOGQ5IDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX21hYy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQpAQCAtNjYsMTAgKzY2LDYgQEAgY2xhc3MgQ2hy b21pdW1NYWNQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAgICAgICAgICAgICAgICAg ICAgICdNYWNCdWlsZEluc3RydWN0aW9ucycpCiAgICAgICAgIHJldHVybiByZXN1bHQKIAotICAg IGRlZiBudW1fY29yZXMoc2VsZik6Ci0gICAgICAgIHJldHVybiBpbnQoc3VicHJvY2Vzcy5Qb3Bl bihbJ3N5c2N0bCcsJy1uJywnaHcubmNwdSddLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSkuc3Rkb3V0LnJlYWQoKSkKLQogICAgIGRl ZiB0ZXN0X3BsYXRmb3JtX25hbWUoc2VsZik6CiAgICAgICAgICMgV2UgdXNlICdtYWMnIGluc3Rl YWQgb2YgJ2Nocm9taXVtLW1hYycKICAgICAgICAgcmV0dXJuICdtYWMnCmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dp bi5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fd2luLnB5CmluZGV4IGNhZjRjZDEuLmZhZmM3Y2YgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21p dW1fd2luLnB5CkBAIC03OCw5ICs3OCw2IEBAIGNsYXNzIENocm9taXVtV2luUG9ydChjaHJvbWl1 bS5DaHJvbWl1bVBvcnQpOgogICAgICAgICBhYnNwYXRoID0gb3MucGF0aC5hYnNwYXRoKGZpbGVu YW1lKQogICAgICAgICByZXR1cm4gYWJzcGF0aC5yZXBsYWNlKCdcXCcsICcvJykKIAotICAgIGRl ZiBudW1fY29yZXMoc2VsZik6Ci0gICAgICAgIHJldHVybiBpbnQob3MuZW52aXJvbi5nZXQoJ05V TUJFUl9PRl9QUk9DRVNTT1JTJywgMSkpCi0KICAgICBkZWYgcmVsYXRpdmVfdGVzdF9maWxlbmFt ZShzZWxmLCBmaWxlbmFtZSk6CiAgICAgICAgIHBhdGggPSBmaWxlbmFtZVtsZW4oc2VsZi5sYXlv dXRfdGVzdHNfZGlyKCkpICsgMTpdCiAgICAgICAgIHJldHVybiBwYXRoLnJlcGxhY2UoJ1xcJywg Jy8nKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9tYWMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L21hYy5weQppbmRleCA1MzllMWNmLi5hMTVmMzlhIDEwMDY0NAotLS0gYS9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQpAQCAtMTcy LDE1ICsxNzIsNiBAQCBjbGFzcyBNYWNQb3J0KGJhc2UuUG9ydCk6CiAgICAgICAgIHNwLnN0b3Ao KQogICAgICAgICByZXR1cm4gcmVzdWx0CiAKLSAgICBkZWYgbnVtX2NvcmVzKHNlbGYpOgotICAg ICAgICBuY29yZXMgPSBpbnQoZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsic3lzY3RsIiwgIi1uIiwg Imh3Lm5jcHUiXSkpCi0gICAgICAgICMgRklYTUU6IG5ldy1ydW4td2Via2l0LXRlc3RzIGlzIHVu c3RhYmxlIHJ1bm5pbmcgbW9yZSB0aGFuIGZvdXIKLSAgICAgICAgIyB0aHJlYWRzIGluIHBhcmFs bGVsLgotICAgICAgICAjIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzY2MjIKLSAgICAgICAgaWYgbmNvcmVzID4gNDoKLSAgICAgICAgICAgIG5jb3JlcyA9IDQK LSAgICAgICAgcmV0dXJuIG5jb3JlcwotCiAgICAgZGVmIHBhdGhfdG9fdGVzdF9leHBlY3RhdGlv bnNfZmlsZShzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNl KCdMYXlvdXRUZXN0cycsICdwbGF0Zm9ybScsCiAgICAgICAgICAgICdtYWMnLCAndGVzdF9leHBl Y3RhdGlvbnMudHh0JykKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weQppbmRleCA2ZjUxZTFkLi5lZGVmNDg1IDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3Qu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90 ZXN0LnB5CkBAIC02OSw5ICs2OSw2IEBAIGNsYXNzIFRlc3RQb3J0KGJhc2UuUG9ydCk6CiAgICAg ZGVmIG5hbWUoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9uYW1lCiAKLSAgICBkZWYgbnVt X2NvcmVzKHNlbGYpOgotICAgICAgICByZXR1cm4gaW50KG9zLnBvcGVuMigic3lzY3RsIC1uIGh3 Lm5jcHUiKVsxXS5yZWFkKCkpCi0KICAgICBkZWYgb3B0aW9ucyhzZWxmKToKICAgICAgICAgcmV0 dXJuIHNlbGYuX29wdGlvbnMKIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggZTVhMDEw OC4uNTE4NTk0NyAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CkBAIC01MCw2ICs1MCw3IEBA IGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgbWF0aAogaW1wb3J0IG9wdHBhcnNlCiBpbXBvcnQgb3MK K2ltcG9ydCBwbGF0Zm9ybQogaW1wb3J0IFF1ZXVlCiBpbXBvcnQgcmFuZG9tCiBpbXBvcnQgcmUK QEAgLTcxLDYgKzcyLDggQEAgZnJvbSB0ZXN0X3R5cGVzIGltcG9ydCBpbWFnZV9kaWZmCiBmcm9t IHRlc3RfdHlwZXMgaW1wb3J0IHRlc3RfdHlwZV9iYXNlCiBmcm9tIHRlc3RfdHlwZXMgaW1wb3J0 IHRleHRfZGlmZgogCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9y dCBFeGVjdXRpdmUKKwogaW1wb3J0IHBvcnQKIAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCJ3 ZWJraXRweS5sYXlvdXRfdGVzdHMucnVuX3dlYmtpdF90ZXN0cyIpCkBAIC0xMzg5LDYgKzEzOTIs NyBAQCBkZWYgbWFpbihvcHRpb25zLCBhcmdzKToKICAgICAgICAgICAgICAgICAgICAgICAgIHN0 cmVhbT1tZXRlcikKIAogICAgIHBvcnRfb2JqID0gcG9ydC5nZXQob3B0aW9ucy5wbGF0Zm9ybSwg b3B0aW9ucykKKyAgICBleGVjdXRpdmUgPSBFeGVjdXRpdmUoKQogCiAgICAgaWYgbm90IG9wdGlv bnMuY29uZmlndXJhdGlvbjoKICAgICAgICAgb3B0aW9ucy5jb25maWd1cmF0aW9uID0gcG9ydF9v YmouZGVmYXVsdF9jb25maWd1cmF0aW9uKCkKQEAgLTE0MjIsOCArMTQyNiwxMyBAQCBkZWYgbWFp bihvcHRpb25zLCBhcmdzKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlnbm9yZV9l cnJvcnM9VHJ1ZSkKIAogICAgIGlmIG5vdCBvcHRpb25zLm51bV9kdW1wX3JlbmRlcl90cmVlczoK LSAgICAgICAgIyBUT0RPKG9qYW4pOiBJbnZlc3RpZ2F0ZSBwZXJmL2ZsYWtpbmVzcyBpbXBhY3Qg b2YgdXNpbmcgbnVtY29yZXMgKyAxLgotICAgICAgICBvcHRpb25zLm51bV9kdW1wX3JlbmRlcl90 cmVlcyA9IHBvcnRfb2JqLm51bV9jb3JlcygpCisgICAgICAgICMgRklYTUU6IEludmVzdGlnYXRl IHBlcmYvZmxha2luZXNzIGltcGFjdCBvZiB1c2luZyBjcHVfY291bnQgKyAxLgorICAgICAgICBv cHRpb25zLm51bV9kdW1wX3JlbmRlcl90cmVlcyA9IGV4ZWN1dGl2ZS5jcHVfY291bnQoKQorICAg ICAgICAjIEZJWE1FOiBuZXctcnVuLXdlYmtpdC10ZXN0cyBpcyB1bnN0YWJsZSBvbiBNYWMgcnVu bmluZyBtb3JlIHRoYW4KKyAgICAgICAgIyBmb3VyIHRocmVhZHMgaW4gcGFyYWxsZWwuCisgICAg ICAgICMgU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjYyMgor ICAgICAgICBpZiBwbGF0Zm9ybS5zeXN0ZW0oKSA9PSAiRGF3aW4iIGFuZCBvcHRpb25zLm51bV9k dW1wX3JlbmRlcl90cmVlcyA+IDQ6CisgICAgICAgICAgICBvcHRpb25zLm51bV9kdW1wX3JlbmRl cl90cmVlcyA9IDQKIAogICAgIHdyaXRlID0gY3JlYXRlX2xvZ2dpbmdfd3JpdGVyKG9wdGlvbnMs ICdjb25maWcnKQogICAgIHdyaXRlKCJSdW5uaW5nICVzIER1bXBSZW5kZXJUcmVlcyBpbiBwYXJh bGxlbCIgJSBvcHRpb25zLm51bV9kdW1wX3JlbmRlcl90cmVlcykKQEAgLTE0NjEsOSArMTQ3MCw5 IEBAIGRlZiBtYWluKG9wdGlvbnMsIGFyZ3MpOgogICAgICAgICAjIENyZWF0aW5nIHRoZSBleHBl Y2F0aW9ucyBmb3IgZWFjaCBwbGF0Zm9ybS9jb25maWd1cmF0aW9uIHBhaXIgZG9lcwogICAgICAg ICAjIGFsbCB0aGUgdGVzdCBsaXN0IHBhcnNpbmcgYW5kIGVuc3VyZXMgaXQncyBjb3JyZWN0IHN5 bnRheCAoZS5nLiBubwogICAgICAgICAjIGR1cGVzKS4KLSAgICAgICAgZm9yIHBsYXRmb3JtIGlu IHBvcnRfb2JqLnRlc3RfcGxhdGZvcm1fbmFtZXMoKToKLSAgICAgICAgICAgIHRlc3RfcnVubmVy LnBhcnNlX2V4cGVjdGF0aW9ucyhwbGF0Zm9ybSwgaXNfZGVidWdfbW9kZT1UcnVlKQotICAgICAg ICAgICAgdGVzdF9ydW5uZXIucGFyc2VfZXhwZWN0YXRpb25zKHBsYXRmb3JtLCBpc19kZWJ1Z19t b2RlPUZhbHNlKQorICAgICAgICBmb3IgcGxhdGZvcm1fbmFtZSBpbiBwb3J0X29iai50ZXN0X3Bs YXRmb3JtX25hbWVzKCk6CisgICAgICAgICAgICB0ZXN0X3J1bm5lci5wYXJzZV9leHBlY3RhdGlv bnMocGxhdGZvcm1fbmFtZSwgaXNfZGVidWdfbW9kZT1UcnVlKQorICAgICAgICAgICAgdGVzdF9y dW5uZXIucGFyc2VfZXhwZWN0YXRpb25zKHBsYXRmb3JtX25hbWUsIGlzX2RlYnVnX21vZGU9RmFs c2UpCiAgICAgICAgIG1ldGVyLnVwZGF0ZSgiIikKICAgICAgICAgcHJpbnQgKCJJZiB0aGVyZSBh cmUgbm8gZmFpbCBtZXNzYWdlcywgZXJyb3JzIG9yIGV4Y2VwdGlvbnMsIHRoZW4gdGhlICIKICAg ICAgICAgICAgICJsaW50IHN1Y2NlZWRlZC4iKQo=