56730 2011-03-20 21:18:28 -0700 new-run-webkit-tests fails on Lion seed 2011-04-01 17:40:28 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 34984 1 mjs mrowe dpranke lforschler mrowe webkit.review.bot oldest_to_newest 370278 0 mjs 2011-03-20 21:18:28 -0700 new-run-webkit-tests fails on the Lion seed. Possibly a Python versioning issue? $ new-run-webkit-tests Traceback (most recent call last): File "/Volumes/SnowLeopard/Users/mjs/Work/src/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 439, in <module> sys.exit(main()) File "/Volumes/SnowLeopard/Users/mjs/Work/src/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 433, in main port_obj = port.get(options.platform, options) File "/Volumes/SnowLeopard/Users/mjs/Work/src/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/port/factory.py", line 66, in get return _get_kwargs(**kwargs) File "/Volumes/SnowLeopard/Users/mjs/Work/src/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/port/factory.py", line 128, in _get_kwargs return maker(**kwargs) File "/Volumes/SnowLeopard/Users/mjs/Work/src/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/port/mac.py", line 78, in __init__ self._version = os_version(os_version_string) File "/Volumes/SnowLeopard/Users/mjs/Work/src/Safari/OpenSource/Tools/Scripts/webkitpy/layout_tests/port/mac.py", line 55, in os_version version_string = version_strings[release_version] KeyError: 7 370290 1 dpranke 2011-03-20 23:23:19 -0700 NRWT hard codes the o/s versions it supports. I imagine it is bailing out here because it doesn't recognize 10.7 as a supported version, which is trivial to fix. Obviously, the error message sucks, but I have a bunch of patches I need to post to clean up all of the error handling, so it'll get better. I'll have to poke around and see if I can get a Lion seed installed, but failing that, hopefully someone from Apple will be able to help me get this working? 371134 2 lforschler 2011-03-21 18:53:01 -0700 I can help out with testing this for you. 375268 3 mrowe 2011-03-29 06:56:35 -0700 It would be preferable if it didn’t hard-code the supported OS versions. There obviously needs to be a mapping from major version to name for layout test results (e.g., 10.6 -> "mac-snowleopard"), but newer versions should simply be mapped to “mac”. 375298 4 87317 mrowe 2011-03-29 07:28:29 -0700 Created attachment 87317 Something like this… Here’s what that could look like. 375636 5 dpranke 2011-03-29 12:02:08 -0700 This patch looks more or less fine. While I agree that "future" is a nice generic solution, it would probably be nice if "lion" worked as well. Do you want to wait until it's actually released and we can actually be sure that it is called Lion, or would you feel safe changing that now. 375817 6 mrowe 2011-03-29 15:44:15 -0700 (In reply to comment #5) > This patch looks more or less fine. While I agree that "future" is a nice generic solution, it would probably be nice if "lion" worked as well. Do you want to wait until it's actually released and we can actually be sure that it is called Lion, or would you feel safe changing that now. The approach that we take to Mac OS X versions elsewhere in WebKit, including in run-webkit-tests, is for the current Mac OS X version to be unnamed and the default path, with special cases added for older Mac OS X versions. I think we should continue with that approach in new-run-webkit-tests. 375833 7 dpranke 2011-03-29 15:56:21 -0700 (In reply to comment #6) > (In reply to comment #5) > > This patch looks more or less fine. While I agree that "future" is a nice generic solution, it would probably be nice if "lion" worked as well. Do you want to wait until it's actually released and we can actually be sure that it is called Lion, or would you feel safe changing that now. > > The approach that we take to Mac OS X versions elsewhere in WebKit, including in run-webkit-tests, is for the current Mac OS X version to be unnamed and the default path, with special cases added for older Mac OS X versions. I think we should continue with that approach in new-run-webkit-tests. new-run-webkit-tests can distinguish between "I need the mac port" and "I need version X of the mac port". We need to distinguish between the two in order to do things like check the test expectations across all of the support combinations of values and to manage baselines properly in the rebaselining tool. For example, The way the code is currently written, 'chromium-mac' indicates that you know you want a chromium mac port but the code should attempt to figure out the "right" version (usually the version it is being run on). 'chromium-mac-snowleopard' means "explicitly use the snowleopard' version, which also happens to use the 'chromium-mac' platform dir. This is part of a more general convention that uses the platform name to specify a combination of values (port implementation, operating system, os version, accelerated vs unaccelerated graphics, 32-bit vs 64-bit so far), where if you don't specify a value explicitly we attempt to do something sane, but you can always be explicit. Accordingly, I think it also makes sense to have a 'chromium-mac-lion' that specifies the version to use explicitly. It may also make sense to support a 'chromium-mac-future' value. Does that make more sense? Although after having thought about the naming for a bit, I actually like 'latest' better than 'future'. 375855 8 mrowe 2011-03-29 16:13:29 -0700 (In reply to comment #7) > (In reply to comment #6) > > (In reply to comment #5) > > > This patch looks more or less fine. While I agree that "future" is a nice generic solution, it would probably be nice if "lion" worked as well. Do you want to wait until it's actually released and we can actually be sure that it is called Lion, or would you feel safe changing that now. > > > > The approach that we take to Mac OS X versions elsewhere in WebKit, including in run-webkit-tests, is for the current Mac OS X version to be unnamed and the default path, with special cases added for older Mac OS X versions. I think we should continue with that approach in new-run-webkit-tests. > > new-run-webkit-tests can distinguish between "I need the mac port" and "I need version X of the mac port". We need to distinguish between the two in order to do things like check the test expectations across all of the support combinations of values and to manage baselines properly in the rebaselining tool. > > For example, The way the code is currently written, 'chromium-mac' indicates that you know you want a chromium mac port but the code should attempt to figure out the "right" version (usually the version it is being run on). 'chromium-mac-snowleopard' means "explicitly use the snowleopard' version, which also happens to use the 'chromium-mac' platform dir. This is part of a more general convention that uses the platform name to specify a combination of values (port implementation, operating system, os version, accelerated vs unaccelerated graphics, 32-bit vs 64-bit so far), where if you don't specify a value explicitly we attempt to do something sane, but you can always be explicit. > > Accordingly, I think it also makes sense to have a 'chromium-mac-lion' that specifies the version to use explicitly. It may also make sense to support a 'chromium-mac-future' value. > > Does that make more sense? I understand the design. As best as I can tell nothing about the design necessitates using “lion” over a generic name like “latest” or “future”. A generic name is highly preferable. In general people at Apple will be working on newer versions of Mac OS X than are publicly available. It’s untenable to require that specific names for future versions of Mac OS X be baked in to an open source script in order for us to use said script. > Although after having thought about the naming for a bit, I actually like 'latest' better than 'future'. I picked “future” as to the average WebKit developer Mac OS X 10.6 is the latest available version of Mac OS X. When Mac OS X 10.7 becomes the latest publicly available version of Mac OS X then we can add “lion” to the explicit mapping of version numbers to names, at which point “future” will be used on post-10.7 versions of Mac OS X. 375860 9 dpranke 2011-03-29 16:21:11 -0700 (In reply to comment #8) > (In reply to comment #7) > > (In reply to comment #6) > > > (In reply to comment #5) > > > > This patch looks more or less fine. While I agree that "future" is a nice generic solution, it would probably be nice if "lion" worked as well. Do you want to wait until it's actually released and we can actually be sure that it is called Lion, or would you feel safe changing that now. > > > > > > The approach that we take to Mac OS X versions elsewhere in WebKit, including in run-webkit-tests, is for the current Mac OS X version to be unnamed and the default path, with special cases added for older Mac OS X versions. I think we should continue with that approach in new-run-webkit-tests. > > > > new-run-webkit-tests can distinguish between "I need the mac port" and "I need version X of the mac port". We need to distinguish between the two in order to do things like check the test expectations across all of the support combinations of values and to manage baselines properly in the rebaselining tool. > > > > For example, The way the code is currently written, 'chromium-mac' indicates that you know you want a chromium mac port but the code should attempt to figure out the "right" version (usually the version it is being run on). 'chromium-mac-snowleopard' means "explicitly use the snowleopard' version, which also happens to use the 'chromium-mac' platform dir. This is part of a more general convention that uses the platform name to specify a combination of values (port implementation, operating system, os version, accelerated vs unaccelerated graphics, 32-bit vs 64-bit so far), where if you don't specify a value explicitly we attempt to do something sane, but you can always be explicit. > > > > Accordingly, I think it also makes sense to have a 'chromium-mac-lion' that specifies the version to use explicitly. It may also make sense to support a 'chromium-mac-future' value. > > > > Does that make more sense? > > I understand the design. As best as I can tell nothing about the design necessitates using “lion” over a generic name like “latest” or “future”. Correct. > A generic name is highly preferable. In general people at Apple will be working on newer versions of Mac OS X than are publicly available. It’s untenable to require that specific names for future versions of Mac OS X be baked in to an open source script in order for us to use said script. > The counter argument is that you will often have bots configured to run a specific version of the operating system, even when the underlying directories change. For example, both Chromium and the base Mac ports have a "Snow Leopard" bot. Presumably when Lion ships, "mac" starts to refer to "lion" and you will now need a "snow leopard" indicator. Put differently, if you support "snowleopard", you don't need to know or change anything when "snowleopard" no longer indicates "latest". > > Although after having thought about the naming for a bit, I actually like 'latest' better than 'future'. > > I picked “future” as to the average WebKit developer Mac OS X 10.6 is the latest available version of Mac OS X. When Mac OS X 10.7 becomes the latest publicly available version of Mac OS X then we can add “lion” to the explicit mapping of version numbers to names, at which point “future” will be used on post-10.7 versions of Mac OS X. Right, and this is actually why I prefer "latest". Saying that "mac" (which is currently where the 10.6 bots find most of its baselines) refers to "future" doesn't make sense, but "latest" does. 375863 10 mrowe 2011-03-29 16:27:46 -0700 (In reply to comment #9) > The counter argument is that you will often have bots configured to run a specific version of the operating system, even when the underlying directories change. For example, both Chromium and the base Mac ports have a "Snow Leopard" bot. Presumably when Lion ships, "mac" starts to refer to "lion" and you will now need a "snow leopard” indicator. We already make this distinction. There is already a mac-snowleopard directory containing results for use on SnowLeopard-and-earlier. > Put differently, if you support "snowleopard", you don't need to know or change anything when "snowleopard" no longer indicates "latest”. The term “latest” here is ambiguous so I’m not clear on what you mean. > > > Although after having thought about the naming for a bit, I actually like 'latest' better than 'future'. > > > > I picked “future” as to the average WebKit developer Mac OS X 10.6 is the latest available version of Mac OS X. When Mac OS X 10.7 becomes the latest publicly available version of Mac OS X then we can add “lion” to the explicit mapping of version numbers to names, at which point “future” will be used on post-10.7 versions of Mac OS X. > > Right, and this is actually why I prefer "latest". Saying that "mac" (which is currently where the 10.6 bots find most of its baselines) refers to "future" doesn't make sense, but "latest" does. I don’t understand what you’re saying here. Bots working with 10.6 would presumably deal with results for 10.6, not results for 10.7. I don’t see how the name used for an OS version they aren’t working with is relevant to them. 375887 11 mrowe 2011-03-29 16:52:29 -0700 I talked with Dirk on IRC about this and we came to agreement that “future” is a reasonable name (due to the ambiguity as to what the “latest” version is) and that “mac-lion” being an acceptable version identifier will be done when Lion is released. 375890 12 87434 mrowe 2011-03-29 16:55:26 -0700 Created attachment 87434 Patch 375895 13 87434 dpranke 2011-03-29 17:01:49 -0700 Comment on attachment 87434 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87434&action=review > Tools/Scripts/webkitpy/layout_tests/port/mac.py:52 > 6: 'snowleopard', Do you need to add a 7: 'future', here? If it's not here, I would expect the assert on line 110 of mac_unittest.py to fail. Of course you could code this as if release_version > max(version_strings.keys()) or something as well. Patch looks good otherwise. I'd R+ it assuming the above thing is fixed, but I'm not a reviewer... 375902 14 webkit.review.bot 2011-03-29 17:02:54 -0700 Attachment 87434 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy..." exit_code: 1 Tools/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 375906 15 mrowe 2011-03-29 17:04:51 -0700 (In reply to comment #13) > (From update of attachment 87434 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=87434&action=review > > > Tools/Scripts/webkitpy/layout_tests/port/mac.py:52 > > 6: 'snowleopard', > > Do you need to add a 7: 'future', here? If it's not here, I would expect the assert on line 110 of mac_unittest.py to fail. > > Of course you could code this as if release_version > max(version_strings.keys()) or something as well. This is handled by: 55 version_string = version_strings.get(release_version, 'future’) If release_version is not found in version_strings then “future” is used. 375910 16 dpranke 2011-03-29 17:09:47 -0700 (In reply to comment #15) > (In reply to comment #13) > > (From update of attachment 87434 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=87434&action=review > > > > > Tools/Scripts/webkitpy/layout_tests/port/mac.py:52 > > > 6: 'snowleopard', > > > > Do you need to add a 7: 'future', here? If it's not here, I would expect the assert on line 110 of mac_unittest.py to fail. > > > > Of course you could code this as if release_version > max(version_strings.keys()) or something as well. > > This is handled by: > > 55 version_string = version_strings.get(release_version, 'future’) > > If release_version is not found in version_strings then “future” is used. Ah, right. I'm blind. Yeah, that looks good. 377643 17 87434 jhoneycutt 2011-03-31 21:22:41 -0700 Comment on attachment 87434 Patch Looks fine to me, and I trust Dirk's unofficial review. 378247 18 mrowe 2011-04-01 17:40:28 -0700 Landed in r82752. 87317 2011-03-29 07:28:29 -0700 2011-03-29 16:55:26 -0700 Something like this… future.patch text/plain 7528 mrowe ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fbWFjLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9tYWMucHkKaW5kZXggNjA0ODc4ZC4uZWE4YWZmYyAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkK QEAgLTQzLDEzICs0MywxNCBAQCBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoIndlYmtpdHB5Lmxh eW91dF90ZXN0cy5wb3J0LmNocm9taXVtX21hYyIpCiAKIGNsYXNzIENocm9taXVtTWFjUG9ydChj aHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICIiIkNocm9taXVtIE1hYyBpbXBsZW1lbnRhdGlv biBvZiB0aGUgUG9ydCBjbGFzcy4iIiIKLSAgICBTVVBQT1JURURfT1NfVkVSU0lPTlMgPSAoJ2xl b3BhcmQnLCAnc25vd2xlb3BhcmQnKQorICAgIFNVUFBPUlRFRF9PU19WRVJTSU9OUyA9ICgnbGVv cGFyZCcsICdzbm93bGVvcGFyZCcsICdmdXR1cmUnKQogCiAgICAgRkFMTEJBQ0tfUEFUSFMgPSB7 CiAgICAgICAgICdsZW9wYXJkJzogWydjaHJvbWl1bS1tYWMtbGVvcGFyZCcsICdjaHJvbWl1bS1t YWMtc25vd2xlb3BhcmQnLCAnY2hyb21pdW0tbWFjJywgJ2Nocm9taXVtJywKICAgICAgICAgICAg ICAgICAgICAgJ21hYy1sZW9wYXJkJywgJ21hYy1zbm93bGVvcGFyZCcsICdtYWMnXSwKICAgICAg ICAgJ3Nub3dsZW9wYXJkJzogWydjaHJvbWl1bS1tYWMtc25vd2xlb3BhcmQnLCAnY2hyb21pdW0t bWFjJywgJ2Nocm9taXVtJywKICAgICAgICAgICAgICAgICAgICAgICAgICdtYWMtc25vd2xlb3Bh cmQnLCAnbWFjJ10sCisgICAgICAgICdmdXR1cmUnOiBbJ2Nocm9taXVtLW1hYycsICdjaHJvbWl1 bScsICdtYWMnXSwKICAgICAgICAgJyc6IFsnY2hyb21pdW0tbWFjJywgJ2Nocm9taXVtJywgJ21h YyddLAogICAgIH0KIApAQCAtODAsNyArODEsNyBAQCBjbGFzcyBDaHJvbWl1bU1hY1BvcnQoY2hy b21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAgICAgY2hyb21pdW0uQ2hyb21pdW1Qb3J0Ll9faW5p dF9fKHNlbGYsIHBvcnRfbmFtZT1wb3J0X25hbWUsICoqa3dhcmdzKQogCiAgICAgZGVmIGJhc2Vs aW5lX3BhdGgoc2VsZik6Ci0gICAgICAgIGlmIHNlbGYudmVyc2lvbigpID09ICdzbm93bGVvcGFy ZCc6CisgICAgICAgIGlmIHNlbGYudmVyc2lvbigpIGluICgnc25vd2xlb3BhcmQnLCAnZnV0dXJl Jyk6CiAgICAgICAgICAgICAjIFdlIHRyZWF0IFNub3cgTGVvcGFyZCBhcyB0aGUgbmV3ZXN0IHZl cnNpb24gb2YgbWFjLAogICAgICAgICAgICAgIyBzbyBpdCBnZXRzIHRoZSBiYXNlIGRpci4KICAg ICAgICAgICAgIHJldHVybiBzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCgnY2hyb21pdW0tbWFj JykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Y2hyb21pdW1fbWFjX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKaW5kZXggMTIwMTFjNi4uOTVlOWMy NSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKQEAgLTUzLDcgKzUzLDcgQEAg Y2xhc3MgQ2hyb21pdW1NYWNQb3J0VGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAK ICAgICBkZWYgdGVzdF92ZXJzaW9ucyhzZWxmKToKICAgICAgICAgcG9ydCA9IGNocm9taXVtX21h Yy5DaHJvbWl1bU1hY1BvcnQoKQotICAgICAgICBzZWxmLmFzc2VydFRydWUocG9ydC5uYW1lKCkg aW4gKCdjaHJvbWl1bS1tYWMtbGVvcGFyZCcsICdjaHJvbWl1bS1tYWMtc25vd2xlb3BhcmQnKSkK KyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQubmFtZSgpIGluICgnY2hyb21pdW0tbWFjLWxl b3BhcmQnLCAnY2hyb21pdW0tbWFjLXNub3dsZW9wYXJkJywgJ2Nocm9taXVtLW1hYy1mdXR1cmUn KSkKIAogICAgICAgICBzZWxmLmFzc2VydF9uYW1lKE5vbmUsICcxMC41LjMnLCAnY2hyb21pdW0t bWFjLWxlb3BhcmQnKQogICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1tYWMnLCAn MTAuNS4zJywgJ2Nocm9taXVtLW1hYy1sZW9wYXJkJykKQEAgLTY1LDggKzY1LDE2IEBAIGNsYXNz IENocm9taXVtTWFjUG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAg ICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1tYWMtc25vd2xlb3BhcmQnLCAnMTAuNS4zJywg J2Nocm9taXVtLW1hYy1zbm93bGVvcGFyZCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2No cm9taXVtLW1hYy1zbm93bGVvcGFyZCcsICcxMC42LjMnLCAnY2hyb21pdW0tbWFjLXNub3dsZW9w YXJkJykKIAotICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhLZXlFcnJvciwgc2VsZi5hc3NlcnRf bmFtZSwgTm9uZSwgJzEwLjcuMScsICdjaHJvbWl1bS1tYWMtbGVvcGFyZCcpCi0gICAgICAgIHNl bGYuYXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBzZWxmLmFzc2VydF9uYW1lLCBOb25lLCAn MTAuNC4xJywgJ2Nocm9taXVtLW1hYy1sZW9wYXJkJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbmFt ZShOb25lLCAnMTAuNycsICdjaHJvbWl1bS1tYWMtZnV0dXJlJykKKyAgICAgICAgc2VsZi5hc3Nl cnRfbmFtZShOb25lLCAnMTAuNy4zJywgJ2Nocm9taXVtLW1hYy1mdXR1cmUnKQorICAgICAgICBz ZWxmLmFzc2VydF9uYW1lKE5vbmUsICcxMC44JywgJ2Nocm9taXVtLW1hYy1mdXR1cmUnKQorICAg ICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1tYWMnLCAnMTAuNy4zJywgJ2Nocm9taXVt LW1hYy1mdXR1cmUnKQorICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1tYWMtZnV0 dXJlJywgJzEwLjQuMycsICdjaHJvbWl1bS1tYWMtZnV0dXJlJykKKyAgICAgICAgc2VsZi5hc3Nl cnRfbmFtZSgnY2hyb21pdW0tbWFjLWZ1dHVyZScsICcxMC41LjMnLCAnY2hyb21pdW0tbWFjLWZ1 dHVyZScpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLW1hYy1mdXR1cmUnLCAn MTAuNi4zJywgJ2Nocm9taXVtLW1hYy1mdXR1cmUnKQorICAgICAgICBzZWxmLmFzc2VydF9uYW1l KCdjaHJvbWl1bS1tYWMtZnV0dXJlJywgJzEwLjcuMycsICdjaHJvbWl1bS1tYWMtZnV0dXJlJykK KworICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhBc3NlcnRpb25FcnJvciwgc2VsZi5hc3NlcnRf bmFtZSwgTm9uZSwgJzEwLjQuMScsICdzaG91bGQtcmFpc2UtYXNzZXJ0aW9uLXNvLXRoaXMtdmFs dWUtZG9lcy1ub3QtbWF0dGVyJykKIAogICAgIGRlZiB0ZXN0X2dlbmVyaWNfcmViYXNlbGluaW5n X3BvcnQoc2VsZik6CiAgICAgICAgIHBvcnQgPSBjaHJvbWl1bV9tYWMuQ2hyb21pdW1NYWNQb3J0 KHJlYmFzZWxpbmluZz1UcnVlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9tYWMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L21hYy5weQppbmRleCAwMTY4ZWM3Li5lYjllMTQzIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQpAQCAtMzksNyArMzksNiBA QCBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoIndlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0Lm1h YyIpCiAKIAogZGVmIG9zX3ZlcnNpb24ob3NfdmVyc2lvbl9zdHJpbmc9Tm9uZSwgc3VwcG9ydGVk X3ZlcnNpb25zPU5vbmUpOgotICAgICMgV2Ugb25seSBzdXBwb3J0IFRpZ2VyLCBMZW9wYXJkLCBh bmQgU25vdyBMZW9wYXJkLgogICAgIGlmIG5vdCBvc192ZXJzaW9uX3N0cmluZzoKICAgICAgICAg aWYgaGFzYXR0cihwbGF0Zm9ybSwgJ21hY192ZXInKSBhbmQgcGxhdGZvcm0ubWFjX3ZlcigpWzBd OgogICAgICAgICAgICAgb3NfdmVyc2lvbl9zdHJpbmcgPSBwbGF0Zm9ybS5tYWNfdmVyKClbMF0K QEAgLTUyLDcgKzUxLDggQEAgZGVmIG9zX3ZlcnNpb24ob3NfdmVyc2lvbl9zdHJpbmc9Tm9uZSwg c3VwcG9ydGVkX3ZlcnNpb25zPU5vbmUpOgogICAgICAgICA1OiAnbGVvcGFyZCcsCiAgICAgICAg IDY6ICdzbm93bGVvcGFyZCcsCiAgICAgfQotICAgIHZlcnNpb25fc3RyaW5nID0gdmVyc2lvbl9z dHJpbmdzW3JlbGVhc2VfdmVyc2lvbl0KKyAgICBhc3NlcnQgcmVsZWFzZV92ZXJzaW9uID49IG1p bih2ZXJzaW9uX3N0cmluZ3Mua2V5cygpKQorICAgIHZlcnNpb25fc3RyaW5nID0gdmVyc2lvbl9z dHJpbmdzLmdldChyZWxlYXNlX3ZlcnNpb24sICdmdXR1cmUnKQogICAgIGlmIHN1cHBvcnRlZF92 ZXJzaW9uczoKICAgICAgICAgYXNzZXJ0IHZlcnNpb25fc3RyaW5nIGluIHN1cHBvcnRlZF92ZXJz aW9ucwogICAgIHJldHVybiB2ZXJzaW9uX3N0cmluZwpAQCAtNjIsMTIgKzYyLDEzIEBAIGNsYXNz IE1hY1BvcnQoV2ViS2l0UG9ydCk6CiAgICAgIiIiV2ViS2l0IE1hYyBpbXBsZW1lbnRhdGlvbiBv ZiB0aGUgUG9ydCBjbGFzcy4iIiIKICAgICAjIEZJWE1FOiAnd2syJyBwcm9iYWJseSBzaG91bGRu J3QgYmUgYSB2ZXJzaW9uLCBpdCBzaG91bGQgcHJvYmFibHkgYmUKICAgICAjIGEgbW9kaWZpZXIs IGxpa2UgJ2Nocm9taXVtLWdwdScgaXMgdG8gJ2Nocm9taXVtJy4KLSAgICBTVVBQT1JURURfVkVS U0lPTlMgPSAoJ3RpZ2VyJywgJ2xlb3BhcmQnLCAnc25vd2xlb3BhcmQnLCAnd2syJykKKyAgICBT VVBQT1JURURfVkVSU0lPTlMgPSAoJ3RpZ2VyJywgJ2xlb3BhcmQnLCAnc25vd2xlb3BhcmQnLCAn ZnV0dXJlJywgJ3drMicpCiAKICAgICBGQUxMQkFDS19QQVRIUyA9IHsKICAgICAgICAgJ3RpZ2Vy JzogWydtYWMtdGlnZXInLCAnbWFjLWxlb3BhcmQnLCAnbWFjLXNub3dsZW9wYXJkJywgJ21hYydd LAogICAgICAgICAnbGVvcGFyZCc6IFsnbWFjLWxlb3BhcmQnLCAnbWFjLXNub3dsZW9wYXJkJywg J21hYyddLAogICAgICAgICAnc25vd2xlb3BhcmQnOiBbJ21hYy1zbm93bGVvcGFyZCcsICdtYWMn XSwKKyAgICAgICAgJ2Z1dHVyZSc6IFsnbWFjJ10sCiAgICAgICAgICd3azInOiBbJ21hYy13azIn LCAnbWFjJ10sCiAgICAgfQogCkBAIC05Nyw2ICs5OCwxMyBAQCBjbGFzcyBNYWNQb3J0KFdlYktp dFBvcnQpOgogICAgICAgICAgICAgcmV0dXJuICdwcm9jZXNzZXMnCiAgICAgICAgIHJldHVybiAn b2xkLXRocmVhZHMnCiAKKyAgICBkZWYgYmFzZWxpbmVfcGF0aChzZWxmKToKKyAgICAgICAgaWYg c2VsZi52ZXJzaW9uKCkgIT0gJ2Z1dHVyZSc6CisgICAgICAgICAgICByZXR1cm4gV2ViS2l0UG9y dC5iYXNlbGluZV9wYXRoKHNlbGYpCisKKyAgICAgICAgYXNzZXJ0KHNlbGYuX25hbWVbLTc6XSA9 PSAnLWZ1dHVyZScpCisgICAgICAgIHJldHVybiBzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aChz ZWxmLl9uYW1lWzotN10pCisKICAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CiAg ICAgICAgIHJldHVybiBtYXAoc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIHNlbGYuRkFMTEJB Q0tfUEFUSFNbc2VsZi5fdmVyc2lvbl0pCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5pdHRlc3QucHkKaW5kZXggNDU4NmEyMy4u MTg3MjdhYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9tYWNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9tYWNfdW5pdHRlc3QucHkKQEAgLTg3LDcgKzg3LDcgQEAgc3ZnL2JhdGlrL3Rl eHQvc21hbGxGb250cy5zdmcKICAgICBkZWYgdGVzdF92ZXJzaW9ucyhzZWxmKToKICAgICAgICAg cG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKICAgICAgICAgaWYgcG9ydDoKLSAgICAgICAgICAgIHNl bGYuYXNzZXJ0VHJ1ZShwb3J0Lm5hbWUoKSBpbiAoJ21hYy10aWdlcicsICdtYWMtbGVvcGFyZCcs ICdtYWMtc25vd2xlb3BhcmQnKSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Lm5h bWUoKSBpbiAoJ21hYy10aWdlcicsICdtYWMtbGVvcGFyZCcsICdtYWMtc25vd2xlb3BhcmQnLCAn bWFjLWZ1dHVyZScpKQogCiAgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEwLjQuOCcs ICdtYWMtdGlnZXInKQogICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdtYWMnLCAnMTAuNC44Jywg J21hYy10aWdlcicpCkBAIC0xMDcsOCArMTA3LDE2IEBAIHN2Zy9iYXRpay90ZXh0L3NtYWxsRm9u dHMuc3ZnCiAgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ21hYy1zbm93bGVvcGFyZCcsICcxMC41 LjMnLCAnbWFjLXNub3dsZW9wYXJkJykKICAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnbWFjLXNu b3dsZW9wYXJkJywgJzEwLjYuMycsICdtYWMtc25vd2xlb3BhcmQnKQogCi0gICAgICAgIHNlbGYu YXNzZXJ0UmFpc2VzKEtleUVycm9yLCBzZWxmLmFzc2VydF9uYW1lLCBOb25lLCAnMTAuNy4xJywg J21hYy1sZW9wYXJkJykKLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoS2V5RXJyb3IsIHNlbGYu YXNzZXJ0X25hbWUsIE5vbmUsICcxMC4zLjEnLCAnbWFjLWxlb3BhcmQnKQorICAgICAgICBzZWxm LmFzc2VydF9uYW1lKE5vbmUsICcxMC43JywgJ21hYy1mdXR1cmUnKQorICAgICAgICBzZWxmLmFz c2VydF9uYW1lKE5vbmUsICcxMC43LjMnLCAnbWFjLWZ1dHVyZScpCisgICAgICAgIHNlbGYuYXNz ZXJ0X25hbWUoTm9uZSwgJzEwLjgnLCAnbWFjLWZ1dHVyZScpCisgICAgICAgIHNlbGYuYXNzZXJ0 X25hbWUoJ21hYycsICcxMC43LjMnLCAnbWFjLWZ1dHVyZScpCisgICAgICAgIHNlbGYuYXNzZXJ0 X25hbWUoJ21hYy1mdXR1cmUnLCAnMTAuNC4zJywgJ21hYy1mdXR1cmUnKQorICAgICAgICBzZWxm LmFzc2VydF9uYW1lKCdtYWMtZnV0dXJlJywgJzEwLjUuMycsICdtYWMtZnV0dXJlJykKKyAgICAg ICAgc2VsZi5hc3NlcnRfbmFtZSgnbWFjLWZ1dHVyZScsICcxMC42LjMnLCAnbWFjLWZ1dHVyZScp CisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ21hYy1mdXR1cmUnLCAnMTAuNy4zJywgJ21hYy1m dXR1cmUnKQorCisgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBzZWxm LmFzc2VydF9uYW1lLCBOb25lLCAnMTAuMy4xJywgJ3Nob3VsZC1yYWlzZS1hc3NlcnRpb24tc28t dGhpcy12YWx1ZS1kb2VzLW5vdC1tYXR0ZXInKQogCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5f Xyc6Cg== 87434 2011-03-29 16:55:26 -0700 2011-03-31 21:22:41 -0700 Patch 0001-http-webkit.org-b-56730-new-run-webkit-tests-fails-o.patch text/plain 9259 mrowe RnJvbSBhMmI3ZjQyMGNjMDY4MTQ5NDc0ZTJjNzA4ZDZkN2FlZDY1NThiOWNkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrIFJvd2UgPG1yb3dlQGFwcGxlLmNvbT4KRGF0ZTogVHVl LCAyOSBNYXIgMjAxMSAxNjo1NDoyMSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIDxodHRwOi8vd2Vi a2l0Lm9yZy9iLzU2NzMwPiBuZXctcnVuLXdlYmtpdC10ZXN0cyBmYWlscyBvbiBMaW9uIHNlZWQK ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGVhY2ggbmV3LXJ1bi13ZWJraXQtdGVzdHMg YWJvdXQgdGhlIGNvbmNlcHQgb2YgYW4gdW5yZWxlYXNlZCB2ZXJzaW9uIG9mIE1hYyBPUyBYLgoK KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weToKKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hY191bml0dGVzdC5w eToKKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weToKKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weToKLS0tCiBUb29scy9D aGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTMgKysrKysr KysrKysrKwogLi4uL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weSAg ICAgfCAgICA1ICsrKy0tCiAuLi4vbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjX3VuaXR0 ZXN0LnB5ICAgICB8ICAgMTQgKysrKysrKysrKystLS0KIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5ICAgIHwgICAxNCArKysrKysrKysrKy0tLQogLi4uL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weSAgICAgfCAgIDE0ICsrKysr KysrKysrLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDQ5IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl eCA0Y2E5OTAxLi4wZjdjMmUxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9v bHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDMtMjkgIE1hcmsgUm93ZSAgPG1y b3dlQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi81NjczMD4gbmV3LXJ1bi13ZWJraXQtdGVzdHMg ZmFpbHMgb24gTGlvbiBzZWVkCisKKyAgICAgICAgVGVhY2ggbmV3LXJ1bi13ZWJraXQtdGVzdHMg YWJvdXQgdGhlIGNvbmNlcHQgb2YgYW4gdW5yZWxlYXNlZCB2ZXJzaW9uIG9mIE1hYyBPUyBYLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9t YWMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV9tYWNfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9tYWMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9tYWNfdW5pdHRlc3QucHk6CisKIDIwMTEtMDMtMjQgIERpcmsgUHJhbmtlICA8ZHBy YW5rZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21p dW1fbWFjLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV9tYWMucHkKaW5kZXggNjA0ODc4ZC4uZWE4YWZmYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKQEAg LTQzLDEzICs0MywxNCBAQCBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoIndlYmtpdHB5LmxheW91 dF90ZXN0cy5wb3J0LmNocm9taXVtX21hYyIpCiAKIGNsYXNzIENocm9taXVtTWFjUG9ydChjaHJv bWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICIiIkNocm9taXVtIE1hYyBpbXBsZW1lbnRhdGlvbiBv ZiB0aGUgUG9ydCBjbGFzcy4iIiIKLSAgICBTVVBQT1JURURfT1NfVkVSU0lPTlMgPSAoJ2xlb3Bh cmQnLCAnc25vd2xlb3BhcmQnKQorICAgIFNVUFBPUlRFRF9PU19WRVJTSU9OUyA9ICgnbGVvcGFy ZCcsICdzbm93bGVvcGFyZCcsICdmdXR1cmUnKQogCiAgICAgRkFMTEJBQ0tfUEFUSFMgPSB7CiAg ICAgICAgICdsZW9wYXJkJzogWydjaHJvbWl1bS1tYWMtbGVvcGFyZCcsICdjaHJvbWl1bS1tYWMt c25vd2xlb3BhcmQnLCAnY2hyb21pdW0tbWFjJywgJ2Nocm9taXVtJywKICAgICAgICAgICAgICAg ICAgICAgJ21hYy1sZW9wYXJkJywgJ21hYy1zbm93bGVvcGFyZCcsICdtYWMnXSwKICAgICAgICAg J3Nub3dsZW9wYXJkJzogWydjaHJvbWl1bS1tYWMtc25vd2xlb3BhcmQnLCAnY2hyb21pdW0tbWFj JywgJ2Nocm9taXVtJywKICAgICAgICAgICAgICAgICAgICAgICAgICdtYWMtc25vd2xlb3BhcmQn LCAnbWFjJ10sCisgICAgICAgICdmdXR1cmUnOiBbJ2Nocm9taXVtLW1hYycsICdjaHJvbWl1bScs ICdtYWMnXSwKICAgICAgICAgJyc6IFsnY2hyb21pdW0tbWFjJywgJ2Nocm9taXVtJywgJ21hYydd LAogICAgIH0KIApAQCAtODAsNyArODEsNyBAQCBjbGFzcyBDaHJvbWl1bU1hY1BvcnQoY2hyb21p dW0uQ2hyb21pdW1Qb3J0KToKICAgICAgICAgY2hyb21pdW0uQ2hyb21pdW1Qb3J0Ll9faW5pdF9f KHNlbGYsIHBvcnRfbmFtZT1wb3J0X25hbWUsICoqa3dhcmdzKQogCiAgICAgZGVmIGJhc2VsaW5l X3BhdGgoc2VsZik6Ci0gICAgICAgIGlmIHNlbGYudmVyc2lvbigpID09ICdzbm93bGVvcGFyZCc6 CisgICAgICAgIGlmIHNlbGYudmVyc2lvbigpIGluICgnc25vd2xlb3BhcmQnLCAnZnV0dXJlJyk6 CiAgICAgICAgICAgICAjIFdlIHRyZWF0IFNub3cgTGVvcGFyZCBhcyB0aGUgbmV3ZXN0IHZlcnNp b24gb2YgbWFjLAogICAgICAgICAgICAgIyBzbyBpdCBnZXRzIHRoZSBiYXNlIGRpci4KICAgICAg ICAgICAgIHJldHVybiBzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCgnY2hyb21pdW0tbWFjJykK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fbWFjX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKaW5kZXggMTIwMTFjNi4uOTVlOWMyNSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV9tYWNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKQEAgLTUzLDcgKzUzLDcgQEAgY2xh c3MgQ2hyb21pdW1NYWNQb3J0VGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAKICAg ICBkZWYgdGVzdF92ZXJzaW9ucyhzZWxmKToKICAgICAgICAgcG9ydCA9IGNocm9taXVtX21hYy5D aHJvbWl1bU1hY1BvcnQoKQotICAgICAgICBzZWxmLmFzc2VydFRydWUocG9ydC5uYW1lKCkgaW4g KCdjaHJvbWl1bS1tYWMtbGVvcGFyZCcsICdjaHJvbWl1bS1tYWMtc25vd2xlb3BhcmQnKSkKKyAg ICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQubmFtZSgpIGluICgnY2hyb21pdW0tbWFjLWxlb3Bh cmQnLCAnY2hyb21pdW0tbWFjLXNub3dsZW9wYXJkJywgJ2Nocm9taXVtLW1hYy1mdXR1cmUnKSkK IAogICAgICAgICBzZWxmLmFzc2VydF9uYW1lKE5vbmUsICcxMC41LjMnLCAnY2hyb21pdW0tbWFj LWxlb3BhcmQnKQogICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1tYWMnLCAnMTAu NS4zJywgJ2Nocm9taXVtLW1hYy1sZW9wYXJkJykKQEAgLTY1LDggKzY1LDE2IEBAIGNsYXNzIENo cm9taXVtTWFjUG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICBz ZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1tYWMtc25vd2xlb3BhcmQnLCAnMTAuNS4zJywgJ2No cm9taXVtLW1hYy1zbm93bGVvcGFyZCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9t aXVtLW1hYy1zbm93bGVvcGFyZCcsICcxMC42LjMnLCAnY2hyb21pdW0tbWFjLXNub3dsZW9wYXJk JykKIAotICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhLZXlFcnJvciwgc2VsZi5hc3NlcnRfbmFt ZSwgTm9uZSwgJzEwLjcuMScsICdjaHJvbWl1bS1tYWMtbGVvcGFyZCcpCi0gICAgICAgIHNlbGYu YXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBzZWxmLmFzc2VydF9uYW1lLCBOb25lLCAnMTAu NC4xJywgJ2Nocm9taXVtLW1hYy1sZW9wYXJkJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbmFtZShO b25lLCAnMTAuNycsICdjaHJvbWl1bS1tYWMtZnV0dXJlJykKKyAgICAgICAgc2VsZi5hc3NlcnRf bmFtZShOb25lLCAnMTAuNy4zJywgJ2Nocm9taXVtLW1hYy1mdXR1cmUnKQorICAgICAgICBzZWxm LmFzc2VydF9uYW1lKE5vbmUsICcxMC44JywgJ2Nocm9taXVtLW1hYy1mdXR1cmUnKQorICAgICAg ICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1tYWMnLCAnMTAuNy4zJywgJ2Nocm9taXVtLW1h Yy1mdXR1cmUnKQorICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdjaHJvbWl1bS1tYWMtZnV0dXJl JywgJzEwLjQuMycsICdjaHJvbWl1bS1tYWMtZnV0dXJlJykKKyAgICAgICAgc2VsZi5hc3NlcnRf bmFtZSgnY2hyb21pdW0tbWFjLWZ1dHVyZScsICcxMC41LjMnLCAnY2hyb21pdW0tbWFjLWZ1dHVy ZScpCisgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ2Nocm9taXVtLW1hYy1mdXR1cmUnLCAnMTAu Ni4zJywgJ2Nocm9taXVtLW1hYy1mdXR1cmUnKQorICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdj aHJvbWl1bS1tYWMtZnV0dXJlJywgJzEwLjcuMycsICdjaHJvbWl1bS1tYWMtZnV0dXJlJykKKwor ICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhBc3NlcnRpb25FcnJvciwgc2VsZi5hc3NlcnRfbmFt ZSwgTm9uZSwgJzEwLjQuMScsICdzaG91bGQtcmFpc2UtYXNzZXJ0aW9uLXNvLXRoaXMtdmFsdWUt ZG9lcy1ub3QtbWF0dGVyJykKIAogICAgIGRlZiB0ZXN0X2dlbmVyaWNfcmViYXNlbGluaW5nX3Bv cnQoc2VsZik6CiAgICAgICAgIHBvcnQgPSBjaHJvbWl1bV9tYWMuQ2hyb21pdW1NYWNQb3J0KHJl YmFzZWxpbmluZz1UcnVlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9tYWMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L21hYy5weQppbmRleCAwMTY4ZWM3Li5lYjllMTQzIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQpAQCAtMzksNyArMzksNiBAQCBf bG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoIndlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0Lm1hYyIp CiAKIAogZGVmIG9zX3ZlcnNpb24ob3NfdmVyc2lvbl9zdHJpbmc9Tm9uZSwgc3VwcG9ydGVkX3Zl cnNpb25zPU5vbmUpOgotICAgICMgV2Ugb25seSBzdXBwb3J0IFRpZ2VyLCBMZW9wYXJkLCBhbmQg U25vdyBMZW9wYXJkLgogICAgIGlmIG5vdCBvc192ZXJzaW9uX3N0cmluZzoKICAgICAgICAgaWYg aGFzYXR0cihwbGF0Zm9ybSwgJ21hY192ZXInKSBhbmQgcGxhdGZvcm0ubWFjX3ZlcigpWzBdOgog ICAgICAgICAgICAgb3NfdmVyc2lvbl9zdHJpbmcgPSBwbGF0Zm9ybS5tYWNfdmVyKClbMF0KQEAg LTUyLDcgKzUxLDggQEAgZGVmIG9zX3ZlcnNpb24ob3NfdmVyc2lvbl9zdHJpbmc9Tm9uZSwgc3Vw cG9ydGVkX3ZlcnNpb25zPU5vbmUpOgogICAgICAgICA1OiAnbGVvcGFyZCcsCiAgICAgICAgIDY6 ICdzbm93bGVvcGFyZCcsCiAgICAgfQotICAgIHZlcnNpb25fc3RyaW5nID0gdmVyc2lvbl9zdHJp bmdzW3JlbGVhc2VfdmVyc2lvbl0KKyAgICBhc3NlcnQgcmVsZWFzZV92ZXJzaW9uID49IG1pbih2 ZXJzaW9uX3N0cmluZ3Mua2V5cygpKQorICAgIHZlcnNpb25fc3RyaW5nID0gdmVyc2lvbl9zdHJp bmdzLmdldChyZWxlYXNlX3ZlcnNpb24sICdmdXR1cmUnKQogICAgIGlmIHN1cHBvcnRlZF92ZXJz aW9uczoKICAgICAgICAgYXNzZXJ0IHZlcnNpb25fc3RyaW5nIGluIHN1cHBvcnRlZF92ZXJzaW9u cwogICAgIHJldHVybiB2ZXJzaW9uX3N0cmluZwpAQCAtNjIsMTIgKzYyLDEzIEBAIGNsYXNzIE1h Y1BvcnQoV2ViS2l0UG9ydCk6CiAgICAgIiIiV2ViS2l0IE1hYyBpbXBsZW1lbnRhdGlvbiBvZiB0 aGUgUG9ydCBjbGFzcy4iIiIKICAgICAjIEZJWE1FOiAnd2syJyBwcm9iYWJseSBzaG91bGRuJ3Qg YmUgYSB2ZXJzaW9uLCBpdCBzaG91bGQgcHJvYmFibHkgYmUKICAgICAjIGEgbW9kaWZpZXIsIGxp a2UgJ2Nocm9taXVtLWdwdScgaXMgdG8gJ2Nocm9taXVtJy4KLSAgICBTVVBQT1JURURfVkVSU0lP TlMgPSAoJ3RpZ2VyJywgJ2xlb3BhcmQnLCAnc25vd2xlb3BhcmQnLCAnd2syJykKKyAgICBTVVBQ T1JURURfVkVSU0lPTlMgPSAoJ3RpZ2VyJywgJ2xlb3BhcmQnLCAnc25vd2xlb3BhcmQnLCAnZnV0 dXJlJywgJ3drMicpCiAKICAgICBGQUxMQkFDS19QQVRIUyA9IHsKICAgICAgICAgJ3RpZ2VyJzog WydtYWMtdGlnZXInLCAnbWFjLWxlb3BhcmQnLCAnbWFjLXNub3dsZW9wYXJkJywgJ21hYyddLAog ICAgICAgICAnbGVvcGFyZCc6IFsnbWFjLWxlb3BhcmQnLCAnbWFjLXNub3dsZW9wYXJkJywgJ21h YyddLAogICAgICAgICAnc25vd2xlb3BhcmQnOiBbJ21hYy1zbm93bGVvcGFyZCcsICdtYWMnXSwK KyAgICAgICAgJ2Z1dHVyZSc6IFsnbWFjJ10sCiAgICAgICAgICd3azInOiBbJ21hYy13azInLCAn bWFjJ10sCiAgICAgfQogCkBAIC05Nyw2ICs5OCwxMyBAQCBjbGFzcyBNYWNQb3J0KFdlYktpdFBv cnQpOgogICAgICAgICAgICAgcmV0dXJuICdwcm9jZXNzZXMnCiAgICAgICAgIHJldHVybiAnb2xk LXRocmVhZHMnCiAKKyAgICBkZWYgYmFzZWxpbmVfcGF0aChzZWxmKToKKyAgICAgICAgaWYgc2Vs Zi52ZXJzaW9uKCkgIT0gJ2Z1dHVyZSc6CisgICAgICAgICAgICByZXR1cm4gV2ViS2l0UG9ydC5i YXNlbGluZV9wYXRoKHNlbGYpCisKKyAgICAgICAgYXNzZXJ0KHNlbGYuX25hbWVbLTc6XSA9PSAn LWZ1dHVyZScpCisgICAgICAgIHJldHVybiBzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aChzZWxm Ll9uYW1lWzotN10pCisKICAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CiAgICAg ICAgIHJldHVybiBtYXAoc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIHNlbGYuRkFMTEJBQ0tf UEFUSFNbc2VsZi5fdmVyc2lvbl0pCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5pdHRlc3QucHkKaW5kZXggNDU4NmEyMy4uMTg3 MjdhYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9tYWNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9tYWNfdW5pdHRlc3QucHkKQEAgLTg3LDcgKzg3LDcgQEAgc3ZnL2JhdGlrL3RleHQv c21hbGxGb250cy5zdmcKICAgICBkZWYgdGVzdF92ZXJzaW9ucyhzZWxmKToKICAgICAgICAgcG9y dCA9IHNlbGYubWFrZV9wb3J0KCkKICAgICAgICAgaWYgcG9ydDoKLSAgICAgICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShwb3J0Lm5hbWUoKSBpbiAoJ21hYy10aWdlcicsICdtYWMtbGVvcGFyZCcsICdt YWMtc25vd2xlb3BhcmQnKSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Lm5hbWUo KSBpbiAoJ21hYy10aWdlcicsICdtYWMtbGVvcGFyZCcsICdtYWMtc25vd2xlb3BhcmQnLCAnbWFj LWZ1dHVyZScpKQogCiAgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJzEwLjQuOCcsICdt YWMtdGlnZXInKQogICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdtYWMnLCAnMTAuNC44JywgJ21h Yy10aWdlcicpCkBAIC0xMDcsOCArMTA3LDE2IEBAIHN2Zy9iYXRpay90ZXh0L3NtYWxsRm9udHMu c3ZnCiAgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ21hYy1zbm93bGVvcGFyZCcsICcxMC41LjMn LCAnbWFjLXNub3dsZW9wYXJkJykKICAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnbWFjLXNub3ds ZW9wYXJkJywgJzEwLjYuMycsICdtYWMtc25vd2xlb3BhcmQnKQogCi0gICAgICAgIHNlbGYuYXNz ZXJ0UmFpc2VzKEtleUVycm9yLCBzZWxmLmFzc2VydF9uYW1lLCBOb25lLCAnMTAuNy4xJywgJ21h Yy1sZW9wYXJkJykKLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoS2V5RXJyb3IsIHNlbGYuYXNz ZXJ0X25hbWUsIE5vbmUsICcxMC4zLjEnLCAnbWFjLWxlb3BhcmQnKQorICAgICAgICBzZWxmLmFz c2VydF9uYW1lKE5vbmUsICcxMC43JywgJ21hYy1mdXR1cmUnKQorICAgICAgICBzZWxmLmFzc2Vy dF9uYW1lKE5vbmUsICcxMC43LjMnLCAnbWFjLWZ1dHVyZScpCisgICAgICAgIHNlbGYuYXNzZXJ0 X25hbWUoTm9uZSwgJzEwLjgnLCAnbWFjLWZ1dHVyZScpCisgICAgICAgIHNlbGYuYXNzZXJ0X25h bWUoJ21hYycsICcxMC43LjMnLCAnbWFjLWZ1dHVyZScpCisgICAgICAgIHNlbGYuYXNzZXJ0X25h bWUoJ21hYy1mdXR1cmUnLCAnMTAuNC4zJywgJ21hYy1mdXR1cmUnKQorICAgICAgICBzZWxmLmFz c2VydF9uYW1lKCdtYWMtZnV0dXJlJywgJzEwLjUuMycsICdtYWMtZnV0dXJlJykKKyAgICAgICAg c2VsZi5hc3NlcnRfbmFtZSgnbWFjLWZ1dHVyZScsICcxMC42LjMnLCAnbWFjLWZ1dHVyZScpCisg ICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ21hYy1mdXR1cmUnLCAnMTAuNy4zJywgJ21hYy1mdXR1 cmUnKQorCisgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBzZWxmLmFz c2VydF9uYW1lLCBOb25lLCAnMTAuMy4xJywgJ3Nob3VsZC1yYWlzZS1hc3NlcnRpb24tc28tdGhp cy12YWx1ZS1kb2VzLW5vdC1tYXR0ZXInKQogCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6 Ci0tIAoxLjcuNC4xLjIwOC5nZjdjNmMKCg==