64071 2011-07-07 01:02:07 -0700 new-run-webkit-tests does not support qt-4.8 results 2011-10-14 07:11:22 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 69944 34984 1 eric kkristof abarth abecsi kbalazs kkristof kling ossy rgabor oldest_to_newest 433336 0 eric 2011-07-07 01:02:07 -0700 new-run-webkit-tests does not support qt-arm or qt-4.8 results We've not added support yet. It's not clear if these results are even in use. I don't see any bots on build.webkit.org It's unclear if "arm" is both the architecture and the OS here? Should that really be qt-linux-arm? And what about qt-4.8? Is that qt-4.8-linux? Or do those results match on all platforms with 4.8? 433343 1 eric 2011-07-07 01:23:29 -0700 I believe the fallback orders in ORWT are: qt-arm, qt qt-4.8, qt But I suspect those aren't really right. From my investigation it appears that the qt-mac results aren't really used either. They're certainly very out of date. 434541 2 ossy 2011-07-10 00:12:57 -0700 (In reply to comment #1) > I believe the fallback orders in ORWT are: > > qt-arm, qt > qt-4.8, qt > > But I suspect those aren't really right. > > From my investigation it appears that the qt-mac results aren't really used either. They're certainly very out of date. Now qt, qt-arm, qt-4.8 and qt-mac platforms are used by buildbots run on http://build.webkit.sed.hu/waterfall . qt-linux and qt-win platforms aren't really used. The reference OS for Qt port is Linux, so all qt-* platforms should fallback to qt platform. qt-4.8 is for development, result must be same as on qt (4.7) platform when Qt-4.8 is released. AFAIK theses bugs are fixed in Qt trunk, but I'm going to check it in 1-2 days. On qt-mac platform we only use Skipped list now, because we haven't human resource to maintain expected files day by day. We always add failing tests to this skipped list with changeset number. I think making NRWT work with these platforms isn't priority for us now, because there are major problems with NRWT for Qt port now. But Szeged team will fix this bug later. 434554 3 kbalazs 2011-07-10 07:48:44 -0700 > I think making NRWT work with these platforms isn't priority for us now, > because there are major problems with NRWT for Qt port now. But Szeged team > will fix this bug later. What are those major problems exactly? I think it is a priority for us to use the test infrastructure that has become the official one for the WebKit project. 434896 4 ossy 2011-07-11 08:38:09 -0700 I disabled NRWT for qt-arm and qt-4.8 platforms until fix: http://trac.webkit.org/changeset/90746 Gábor started working on this bug. 435847 5 eric 2011-07-12 12:16:38 -0700 It's easy to support these two platforms. But it would make the logic for generating these names cleaner if the platform directories were renamed to include the OS, so: qt-4.8-linux qt-linux-arm Which fit a more easy generated pattern of: PORT-VERSION-OS and PORT-OS-ARCH Where both OS and ARCH are optional. In either case it doesn't matter much, but we'll need to special case the fallback. chromium-linux-x86 definitely follows the PORT-OS-ARCH pattern, I don't really see any other ports which have a VERSION for their port, but not their OS. (mac-leopard, win-xp are 2 of many examples of using OSVERSION in the names). This is all part of our continuing effort to simplify our fallback rules. qt-4.8 and qt-arm didn't easily fit any existing fallback rules, so I didn't add support for them in the first-pass implementation of the QtPort for NRWT. 435849 6 eric 2011-07-12 12:17:09 -0700 (In reply to comment #2) > Now qt, qt-arm, qt-4.8 and qt-mac platforms are used by buildbots run > on http://build.webkit.sed.hu/waterfall . qt-linux and qt-win platforms > aren't really used. Can we delete qt-linux and qt-win then? 435852 7 eric 2011-07-12 12:19:27 -0700 (In reply to comment #2) > The reference OS for Qt port is Linux, so all qt-* platforms should > fallback to qt platform. qt-4.8 is for development, result must be > same as on qt (4.7) platform when Qt-4.8 is released. AFAIK theses > bugs are fixed in Qt trunk, but I'm going to check it in 1-2 days. The Apple folks have historically used "mac" to mean the "Development version" and specific numbered versions for older versions. I think Qt should consider doing similar (which means that some of the 4.8 results should move into qt/ and some of the 4.7-specific results in qt/ should move up into a qt-4.7. 463386 8 ossy 2011-09-07 09:41:33 -0700 Now the baseline search path on qt-wk platform: qt-wk2 -> qt-linux -> qt -> generic It should be: qt-wk2 -> ((qt-linux ->)) qt-4.8 -> qt -> generic If it is fixed, we can enable ~400 tests on qt-wk2 platform. 463387 9 ossy 2011-09-07 09:42:23 -0700 (In reply to comment #6) > Can we delete qt-linux and qt-win then? Not yet, they might be used in the future. 463390 10 ossy 2011-09-07 09:45:12 -0700 (In reply to comment #7) > (In reply to comment #2) > > The reference OS for Qt port is Linux, so all qt-* platforms should > > fallback to qt platform. qt-4.8 is for development, result must be > > same as on qt (4.7) platform when Qt-4.8 is released. AFAIK theses > > bugs are fixed in Qt trunk, but I'm going to check it in 1-2 days. > > The Apple folks have historically used "mac" to mean the "Development version" and specific numbered versions for older versions. > > I think Qt should consider doing similar (which means that some of the 4.8 results should move into qt/ and some of the 4.7-specific results in qt/ should move up into a qt-4.7. Now the Qt 4.7 is the default, and 4.8 exceptions are stored in qt-4.8. But after 4.8 is released we will merge qt-4.8 to qt and after then we can remove qt-4.8 platform. (Because qt will means Qt 4.8 and 4.7 won't be supported anymore.) 463394 11 ossy 2011-09-07 09:48:25 -0700 (In reply to comment #8) > Now the baseline search path on qt-wk platform: qt-wk2 -> qt-linux -> qt -> generic > > It should be: qt-wk2 -> ((qt-linux ->)) qt-4.8 -> qt -> generic > > If it is fixed, we can enable ~400 tests on qt-wk2 platform. I forgot to mention why we need this search path: Because to build WebKit2, the minimum Qt version is 5.0 (which based on 4.8). 463489 12 eric 2011-09-07 11:30:05 -0700 It sounds like your troubles could very easily be fixed by moving qt-4.8 to qt and qt to qt-4.7, right? 463492 13 eric 2011-09-07 11:31:21 -0700 The reason why I propose moving instead of hacking the tool is that there are long-term benefits to every project using similar fallback systems. We would still need to add 4.7 as an explicit version number (I think), but otherwise NRWT should just work "out of the box" including getting the wk2 fallback path correctly then, right? 464005 14 ossy 2011-09-08 06:02:50 -0700 (In reply to comment #13) > We would still need to add 4.7 as an explicit version number (I think), but otherwise NRWT should just work "out of the box" including getting the wk2 fallback path correctly then, right? Do you mean we should add a qt-4.7 platform too? And then the search paths would be in general: qt-wk2|none -> qt-(linux|win|mac) -> qt-(4.7|4.8) -> generic examples: qt-wk2 -> qt-linux -> qt-4.8 -> qt -> generic qt-linux -> qt-4.8 -> qt -> generic qt-linux -> qt-4.7 -> qt -> generic It sounds good to me. Now wk2 won't depends on Qt version. (You can't build it with Qt 4.7, only Qt 5.0, so version will be qt-48 always, because qt-4.7 == Qt-4.7.x and qt-4.8 == Qt-4.8.x or newer) We only need to add a Qt version checker function similar to in webkitdirs.pm: sub getQtVersion() { my $qtVersion = `$qmakebin --version`; $qtVersion =~ s/^(.*)Qt version (\d\.\d)(.*)/$2/s ; return $qtVersion; } 464009 15 ossy 2011-09-08 06:05:08 -0700 Removing qt-arm, and filed a new bug report about it: https://bugs.webkit.org/show_bug.cgi?id=67777 464051 16 eric 2011-09-08 08:04:06 -0700 (In reply to comment #14) > (In reply to comment #13) > > We would still need to add 4.7 as an explicit version number (I think), but otherwise NRWT should just work "out of the box" including getting the wk2 fallback path correctly then, right? > > Do you mean we should add a qt-4.7 platform too? > And then the search paths would be in general: > qt-wk2|none -> qt-(linux|win|mac) -> qt-(4.7|4.8) -> generic > > examples: > qt-wk2 -> qt-linux -> qt-4.8 -> qt -> generic > qt-linux -> qt-4.8 -> qt -> generic > qt-linux -> qt-4.7 -> qt -> generic No, in order to match the other WebKit ports, the search paths would need to be: qt-wk2 -> qt -> qt-4.8 -> qt-4.7 -> generic That matches mac/win: mac-wk2 -> mac -> mac-lion -> mac-snow-leopard -> mac-leopard -> generic win-wk2 -> win -> win-win7sp0 -> win-xp -> generic I'm not sure where qt-linux vs. qt-mac, etc. falls in. We should look at how Chromium does their fallback. 464053 17 eric 2011-09-08 08:08:10 -0700 (In reply to comment #16) > (In reply to comment #14) > > (In reply to comment #13) > > > We would still need to add 4.7 as an explicit version number (I think), but otherwise NRWT should just work "out of the box" including getting the wk2 fallback path correctly then, right? > > > > Do you mean we should add a qt-4.7 platform too? > > And then the search paths would be in general: > > qt-wk2|none -> qt-(linux|win|mac) -> qt-(4.7|4.8) -> generic > > > > examples: > > qt-wk2 -> qt-linux -> qt-4.8 -> qt -> generic > > qt-linux -> qt-4.8 -> qt -> generic > > qt-linux -> qt-4.7 -> qt -> generic > > No, in order to match the other WebKit ports, the search paths would need to be: > > qt-wk2 -> qt -> qt-4.8 -> qt-4.7 -> generic > > That matches mac/win: > mac-wk2 -> mac -> mac-lion -> mac-snow-leopard -> mac-leopard -> generic > win-wk2 -> win -> win-win7sp0 -> win-xp -> generic > > I'm not sure where qt-linux vs. qt-mac, etc. falls in. We should look at how Chromium does their fallback. Sorry, my comment was just wrong. I guess I should wake up more before commenting on bugs. Mac/Win work like this: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py#L128 http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py#L78 aka: mac-wk2 -> mac-lion -> mac-snow-leopard ... -> mac which is closer to what you said than what I said, with the exception of where you placed qt-4.7 473736 18 108797 kkristof 2011-09-27 00:26:05 -0700 Created attachment 108797 proposed fix 473741 19 108797 eric 2011-09-27 00:30:50 -0700 Comment on attachment 108797 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=108797&action=review It's not immediately clear what the fallback path looks like here. But it seems that 4.8 results should fallback on 4.7 results, or vice versa, similar to how Mac/Win work. > Tools/Scripts/webkitpy/layout_tests/port/qt.py:93 > + def get_qt_version(self): I might instead make this qt_version(self) and have it be @memoized. We don't usually use "get" in function names in WebKit. 473745 20 108797 ossy 2011-09-27 00:34:58 -0700 Comment on attachment 108797 proposed fix r- now, because you missed to add the unit test change. 473748 21 ossy 2011-09-27 00:37:51 -0700 (In reply to comment #19) > (From update of attachment 108797 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=108797&action=review > > It's not immediately clear what the fallback path looks like here. But it seems that 4.8 results should fallback on 4.7 results, or vice versa, similar to how Mac/Win work. Absolutely no. qt-4.8 shouldn't fallback to qt-4.7 or vice versa. qt-4.7 and qt-4.8 should fallback to qt and then generic. qt-4.7 and qt-4.8 doesn't depends on each other. There are failing tests on qt-4.7 which pass on qt-4.8 and vice-versa. > > Tools/Scripts/webkitpy/layout_tests/port/qt.py:93 > > + def get_qt_version(self): > > I might instead make this qt_version(self) and have it be @memoized. We don't usually use "get" in function names in WebKit. Good point. 473971 22 abarth 2011-09-27 09:14:10 -0700 You're welcome to have whatever fallback path you like, but the common way we do fallbacks in WebKit is to have older versions fall back to newer versions. For example, Leopard falls back to Snow Leopard, which falls back to Lion. Here's a diagram I drew a while back: https://docs.google.com/drawings/d/1z65SKkWrD4Slm6jobIphHwwRADyUtjOAxwGBVKBY8Kc/edit?hl=en_US I agree that it sounds goofy, but it seems to work pretty well. 474680 23 109006 kkristof 2011-09-28 05:08:10 -0700 Created attachment 109006 proposed fix 478406 24 109006 ossy 2011-10-05 09:06:09 -0700 Comment on attachment 109006 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=109006&action=review The development of Qt was faster than this patch's. :) So please update the patch. Now qt-wk2 should fallback to a new qt-5.0 platform. ( After Qt 4.8 will be releases, we are going to stop supporting qt-4.7 test results and then we're going to merge qt-4.8 results to general qt platform. But it is a mid-term plan.) Otherwise the patch LGTM. Is there any objection against landing the fixed patch? > Tools/Scripts/webkitpy/layout_tests/port/qt.py:33 > import logging > import sys > +import re style: alphabetic order > Tools/Scripts/webkitpy/layout_tests/port/qt.py:111 > + if '4.7' in version: > + search_paths.append('qt-4.7') > + elif version: > + search_paths.append('qt-4.8') if '4.7' in version: search_paths.append('qt-4.7') elif '4.8' in version: search_paths.append('qt-4.8') elif version: search_paths.append('qt-5.0') > Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py:36 > from webkitpy.layout_tests.port.qt import QtPort > from webkitpy.layout_tests.port import port_testcase > from webkitpy.tool.mocktool import MockOptions, MockUser, MockExecutive > +from webkitpy.common.system.executive_mock import MockExecutive2 style: alphabetic order > Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py:59 > + return 'QMake version 2.01a\nUsing Qt version 4.8.2 in /usr/local/Trolltech/Qt-4.8.2/lib' nit: s/4.8.2/4.8.0/g > Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py:78 > + self._assert_search_path(['qt-wk2', 'qt-mac', 'qt-4.8', 'qt'], 'darwin', use_webkit2=True, qt_version='5.0') > + self._assert_search_path(['qt-wk2', 'qt-win', 'qt-4.8', 'qt'], 'cygwin', use_webkit2=True, qt_version='5.0') > + self._assert_search_path(['qt-wk2', 'qt-linux', 'qt-4.8', 'qt'], 'linux2', use_webkit2=True, qt_version='5.0') s/qt-4.8/qt-5.0/g 479091 25 109951 kkristof 2011-10-06 05:47:28 -0700 Created attachment 109951 updated fallback path 479119 26 109951 ossy 2011-10-06 06:25:58 -0700 Comment on attachment 109951 updated fallback path View in context: https://bugs.webkit.org/attachment.cgi?id=109951&action=review In general LGTM, but please fix these little things. > Tools/ChangeLog:9 > + * Scripts/webkitpy/layout_tests/port/qt_unittest.py: Removed. Removed ???? > Tools/Scripts/webkitpy/layout_tests/port/qt.py:93 > + def qt_version(self): @memoized is still missing > Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py:59 > + return 'QMake version 2.01a\nUsing Qt version 4.8.0 in /usr/local/Trolltech/Qt-4.8.2/lib' one more s/4.8.2/4.8.0 :) 479144 27 kkristof 2011-10-06 07:16:06 -0700 (In reply to comment #26) > (From update of attachment 109951 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=109951&action=review > > In general LGTM, but please fix these little things. > > > Tools/ChangeLog:9 > > + * Scripts/webkitpy/layout_tests/port/qt_unittest.py: Removed. > > Removed ???? > Uups, I had a little problem with the git. One moment, and I will fix it. 479146 28 109960 kkristof 2011-10-06 07:25:51 -0700 Created attachment 109960 proposed fix 479225 29 109960 ossy 2011-10-06 09:49:53 -0700 Comment on attachment 109960 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=109960&action=review I tested your patch, but I found one more thing. Skipped file in qt-<version> directory is ignored, but we need it. Could you override _skipped_file_search_paths too? > Tools/Scripts/webkitpy/layout_tests/port/qt.py:93 > + def qt_version(self): @memoized is still missing :-/ 479966 30 110135 kkristof 2011-10-07 06:39:36 -0700 Created attachment 110135 proposed fix I created also the Skipped files for qt-4.7 and qt-5.0 482345 31 110135 ossy 2011-10-12 04:25:11 -0700 Comment on attachment 110135 proposed fix r=me 482348 32 110135 ossy 2011-10-12 04:27:33 -0700 Comment on attachment 110135 proposed fix Landed in http://trac.webkit.org/changeset/97252 482536 33 abarth 2011-10-12 11:07:50 -0700 http://build.webkit.org/builders/SnowLeopard%20Intel%20Debug%20%28Tests%29/builds/2541/steps/webkitpy-test/logs/stdio You can't call out to qmake when determining the baseline paths: for line in self._executive.run_command(['qmake', '-v']).split('\n'): We need to be able to determine the baseline paths on all systems, even those without qmake. Mac and Win also need to solve this problem. It's probably a good idea to follow their approach. 482682 34 ossy 2011-10-12 14:05:05 -0700 We can't determine baseline path without calling qmake ... :(( 482692 35 abarth 2011-10-12 14:14:42 -0700 > We can't determine baseline path without calling qmake ... :(( Can you explain why in more detail? I understand that you might not be able to determine which baseline path you'd like to use without calling qmake (or otherwise inspecting the environment), but you should be able to determine the universe of possible baseline paths without reading any information from the environment. Put another way, we have a requirement that you can enumerate the universe of baseline paths for all ports when running on any platform. For example, on a Mac without qmake installed, you should be able to know where the Qt port stores its baselines and what the fallback behavior is between them. 483966 36 ossy 2011-10-14 07:11:22 -0700 Fixed patch landed in http://trac.webkit.org/changeset/97461. It wasn't the best solution, but this patch was very important for us. I filed a new bug to fix Qt port for baselineoptimizer: https://bugs.webkit.org/show_bug.cgi?id=70108 108797 2011-09-27 00:26:05 -0700 2011-09-28 05:08:10 -0700 proposed fix 27.patch text/plain 1883 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxMzU3 ZmQwLi44ZjNjZmE2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDktMjcgIEtyaXN0w7NmIEtvc3p0ecOzICA8 a2tyaXN0b2ZAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3Rz IGRvZXMgbm90IHN1cHBvcnQgcXQtNC44IHJlc3VsdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MDcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3F0LnB5OgorCiAyMDExLTA5LTI2ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtp dC5vcmc+CiAKICAgICAgICAgW1F0XVtXSzJdIE9uZSBtb3JlIHVucmV2aWV3ZWQgYnVpbGRmaXgg YWZ0ZXIgcjk2MDA1LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvcXQucHkKaW5kZXggZTVmNWY4NC4uZjcyMTQ1NyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CkBAIC0zMCw2ICszMCw3IEBACiAKIGltcG9y dCBsb2dnaW5nCiBpbXBvcnQgc3lzCitpbXBvcnQgcmUKIAogaW1wb3J0IHdlYmtpdAogCkBAIC04 OSw2ICs5MCwyOCBAQCBjbGFzcyBRdFBvcnQoV2ViS2l0UG9ydCk6CiAgICAgZGVmIF9wYXRoX3Rv X3dlYmNvcmVfbGlicmFyeShzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgo J2xpYi9saWJRdFdlYktpdC5zbycpCiAKKyAgICBkZWYgZ2V0X3F0X3ZlcnNpb24oc2VsZik6Cisg ICAgICAgIHZlcnNpb24gPSAnJworICAgICAgICBmb3IgbGluZSBpbiBzZWxmLl9leGVjdXRpdmUu cnVuX2NvbW1hbmQoWydxbWFrZScsICctdiddKS5zcGxpdCgnXG4nKToKKyAgICAgICAgICAgIG1h dGNoID0gcmUuc2VhcmNoKCdRdFxzdmVyc2lvblxzKD9QPHZlcnNpb24+XGRcLlxkKScsIGxpbmUp CisgICAgICAgICAgICBpZiBtYXRjaDoKKyAgICAgICAgICAgICAgICB2ZXJzaW9uID0gbWF0Y2gu Z3JvdXAoJ3ZlcnNpb24nKQorICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgIHJldHVybiB2 ZXJzaW9uCisKKyAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CisgICAgICAgIHNl YXJjaF9wYXRocyA9IFtdCisgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbignd2Via2l0X3Rlc3Rf cnVubmVyJyk6CisgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYuX3drMl9wb3J0 X25hbWUoKSkKKyAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLm5hbWUoKSkKKyAgICAg ICAgdmVyc2lvbiA9IHNlbGYuZ2V0X3F0X3ZlcnNpb24oKQorICAgICAgICBpZiAnNC43JyBpbiB2 ZXJzaW9uOgorICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNC43JykKKyAgICAg ICAgZWxpZiB2ZXJzaW9uOgorICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNC44 JykKKyAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLnBvcnRfbmFtZSkKKyAgICAgICAg cmV0dXJuIG1hcChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCwgc2VhcmNoX3BhdGhzKQorCiAg ICAgZGVmIF9ydW50aW1lX2ZlYXR1cmVfbGlzdChzZWxmKToKICAgICAgICAgcmV0dXJuIE5vbmUK IAo= 109006 2011-09-28 05:08:10 -0700 2011-10-06 05:47:28 -0700 proposed fix 28.patch text/plain 5852 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4NDVh YzRlLi5mMmU4ZjUzIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDktMjggIEtyaXN0w7NmIEtvc3p0ecOzICA8 a2tyaXN0b2ZAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3Rz IGRvZXMgbm90IHN1cHBvcnQgcXQtNC44IHJlc3VsdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MDcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3F0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cXRfdW5pdHRlc3QucHk6CisKIDIwMTEtMDktMjggIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFu ZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIG1pc3NpbmcgV2ViS2l0MiBzdXBwb3J0IGlu IHJ1bi1ndGstdGVzdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvcXQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3F0LnB5CmluZGV4IGU1ZjVmODQuLjI5MzI0MmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQpAQCAtMzAsNiArMzAsNyBAQAogCiBpbXBv cnQgbG9nZ2luZwogaW1wb3J0IHN5cworaW1wb3J0IHJlCiAKIGltcG9ydCB3ZWJraXQKIApAQCAt ODksNiArOTAsMjggQEAgY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogICAgIGRlZiBfcGF0aF90 b193ZWJjb3JlX2xpYnJhcnkoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRo KCdsaWIvbGliUXRXZWJLaXQuc28nKQogCisgICAgZGVmIHF0X3ZlcnNpb24oc2VsZik6CisgICAg ICAgIHZlcnNpb24gPSAnJworICAgICAgICBmb3IgbGluZSBpbiBzZWxmLl9leGVjdXRpdmUucnVu X2NvbW1hbmQoWydxbWFrZScsICctdiddKS5zcGxpdCgnXG4nKToKKyAgICAgICAgICAgIG1hdGNo ID0gcmUuc2VhcmNoKCdRdFxzdmVyc2lvblxzKD9QPHZlcnNpb24+XGRcLlxkKScsIGxpbmUpCisg ICAgICAgICAgICBpZiBtYXRjaDoKKyAgICAgICAgICAgICAgICB2ZXJzaW9uID0gbWF0Y2guZ3Jv dXAoJ3ZlcnNpb24nKQorICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgIHJldHVybiB2ZXJz aW9uCisKKyAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CisgICAgICAgIHNlYXJj aF9wYXRocyA9IFtdCisgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVu bmVyJyk6CisgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYuX3drMl9wb3J0X25h bWUoKSkKKyAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLm5hbWUoKSkKKyAgICAgICAg dmVyc2lvbiA9IHNlbGYucXRfdmVyc2lvbigpCisgICAgICAgIGlmICc0LjcnIGluIHZlcnNpb246 CisgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCdxdC00LjcnKQorICAgICAgICBlbGlm IHZlcnNpb246CisgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCdxdC00LjgnKQorICAg ICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYucG9ydF9uYW1lKQorICAgICAgICByZXR1cm4g bWFwKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWFyY2hfcGF0aHMpCisKICAgICBkZWYg X3J1bnRpbWVfZmVhdHVyZV9saXN0KHNlbGYpOgogICAgICAgICByZXR1cm4gTm9uZQogCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0 ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0 dGVzdC5weQppbmRleCAxNzhjYTZkLi42ZmRmZjZlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkKQEAgLTMzLDEz ICszMywxNCBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBv cnQgT3V0cHV0Q2FwdHVyZQogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5xdCBpbXBv cnQgUXRQb3J0CiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBwb3J0X3Rl c3RjYXNlCiBmcm9tIHdlYmtpdHB5LnRvb2wubW9ja3Rvb2wgaW1wb3J0IE1vY2tPcHRpb25zLCBN b2NrVXNlciwgTW9ja0V4ZWN1dGl2ZQorZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1 dGl2ZV9tb2NrIGltcG9ydCBNb2NrRXhlY3V0aXZlMgogCiAKIGNsYXNzIFF0UG9ydFRlc3QocG9y dF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgIGRlZiBwb3J0X21ha2VyKHNlbGYsIHBsYXRm b3JtKToKICAgICAgICAgcmV0dXJuIFF0UG9ydAogCi0gICAgZGVmIF9hc3NlcnRfc2VhcmNoX3Bh dGgoc2VsZiwgc2VhcmNoX3BhdGhzLCBzeXNfcGxhdGZvcm0sIHVzZV93ZWJraXQyPUZhbHNlKToK KyAgICBkZWYgX2Fzc2VydF9zZWFyY2hfcGF0aChzZWxmLCBzZWFyY2hfcGF0aHMsIHN5c19wbGF0 Zm9ybSwgdXNlX3dlYmtpdDI9RmFsc2UsIHF0X3ZlcnNpb249JzQuNycpOgogICAgICAgICAjIEZJ WE1FOiBQb3J0IGNvbnN0cnVjdG9ycyBzaG91bGQgbm90ICJwYXJzZSIgdGhlIHBvcnQgbmFtZSwg YnV0CiAgICAgICAgICMgcmF0aGVyIGJlIHBhc3NlZCBjb21wb25lbnRzIChkaXJlY3RseSBvciB2 aWEgc2V0dGVycykuICBPbmNlCiAgICAgICAgICMgd2UgZml4IHRoYXQsIHRoaXMgbWV0aG9kIHdp bGwgbmVlZCBhIHJlLXdyaXRlLgpAQCAtNDcsMjAgKzQ4LDM0IEBAIGNsYXNzIFF0UG9ydFRlc3Qo cG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICAgICAgb3B0aW9ucz1Nb2NrT3B0 aW9ucyh3ZWJraXRfdGVzdF9ydW5uZXI9dXNlX3dlYmtpdDIpLAogICAgICAgICAgICAgZmlsZXN5 c3RlbT1Nb2NrRmlsZVN5c3RlbSgpLAogICAgICAgICAgICAgdXNlcj1Nb2NrVXNlcigpLAotICAg ICAgICAgICAgZXhlY3V0aXZlPU1vY2tFeGVjdXRpdmUoKSkKKyAgICAgICAgICAgIGV4ZWN1dGl2 ZT1Nb2NrRXhlY3V0aXZlMihzZWxmLl9xdF92ZXJzaW9uKHF0X3ZlcnNpb24pKSkKICAgICAgICAg YWJzb2x1dGVfc2VhcmNoX3BhdGhzID0gbWFwKHBvcnQuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBz ZWFyY2hfcGF0aHMpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuYmFzZWxpbmVfc2Vh cmNoX3BhdGgoKSwgYWJzb2x1dGVfc2VhcmNoX3BhdGhzKQogCisgICAgZGVmIF9xdF92ZXJzaW9u KHNlbGYsIHF0X3ZlcnNpb249JzQuNycpOgorICAgICAgICBpZiBxdF92ZXJzaW9uIGluICc0Ljcn OgorICAgICAgICAgICAgcmV0dXJuICdRTWFrZSB2ZXJzaW9uIDIuMDFhXG5Vc2luZyBRdCB2ZXJz aW9uIDQuNy4zIGluIC91c3IvbG9jYWwvVHJvbGx0ZWNoL1F0LTQuNy4zL2xpYicKKyAgICAgICAg aWYgcXRfdmVyc2lvbiBpbiAnNC44JzoKKyAgICAgICAgICAgIHJldHVybiAnUU1ha2UgdmVyc2lv biAyLjAxYVxuVXNpbmcgUXQgdmVyc2lvbiA0LjguMiBpbiAvdXNyL2xvY2FsL1Ryb2xsdGVjaC9R dC00LjguMi9saWInCisgICAgICAgIGlmIHF0X3ZlcnNpb24gaW4gJzUuMCc6CisgICAgICAgICAg ICByZXR1cm4gJ1FNYWtlIHZlcnNpb24gMi4wMWFcblVzaW5nIFF0IHZlcnNpb24gNS4wLjAgaW4g L3Vzci9sb2NhbC9Ucm9sbHRlY2gvUXQtNS4wLjAvbGliJworCiAgICAgZGVmIHRlc3RfYmFzZWxp bmVfc2VhcmNoX3BhdGgoc2VsZik6Ci0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChb J3F0LW1hYycsICdxdCddLCAnZGFyd2luJykKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9w YXRoKFsncXQtd2luJywgJ3F0J10sICd3aW4zMicpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFy Y2hfcGF0aChbJ3F0LXdpbicsICdxdCddLCAnY3lnd2luJykKLSAgICAgICAgc2VsZi5fYXNzZXJ0 X3NlYXJjaF9wYXRoKFsncXQtbGludXgnLCAncXQnXSwgJ2xpbnV4MicpCi0gICAgICAgIHNlbGYu X2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LWxpbnV4JywgJ3F0J10sICdsaW51eDMnKQorICAgICAg ICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC1tYWMnLCAncXQtNC43JywgJ3F0J10sICdk YXJ3aW4nKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13aW4nLCAncXQt NC43JywgJ3F0J10sICd3aW4zMicpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChb J3F0LXdpbicsICdxdC00LjcnLCAncXQnXSwgJ2N5Z3dpbicpCisgICAgICAgIHNlbGYuX2Fzc2Vy dF9zZWFyY2hfcGF0aChbJ3F0LWxpbnV4JywgJ3F0LTQuNycsICdxdCddLCAnbGludXgyJykKKyAg ICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtbGludXgnLCAncXQtNC43JywgJ3F0 J10sICdsaW51eDMnKQorCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LW1h YycsICdxdC00LjgnLCAncXQnXSwgJ2RhcndpbicsIHF0X3ZlcnNpb249JzQuOCcpCisgICAgICAg IHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdpbicsICdxdC00LjgnLCAncXQnXSwgJ3dp bjMyJywgcXRfdmVyc2lvbj0nNC44JykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRo KFsncXQtd2luJywgJ3F0LTQuOCcsICdxdCddLCAnY3lnd2luJywgcXRfdmVyc2lvbj0nNC44JykK KyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtbGludXgnLCAncXQtNC44Jywg J3F0J10sICdsaW51eDInLCBxdF92ZXJzaW9uPSc0LjgnKQorICAgICAgICBzZWxmLl9hc3NlcnRf c2VhcmNoX3BhdGgoWydxdC1saW51eCcsICdxdC00LjgnLCAncXQnXSwgJ2xpbnV4MycsIHF0X3Zl cnNpb249JzQuOCcpCiAKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2sy JywgJ3F0LW1hYycsICdxdCddLCAnZGFyd2luJywgdXNlX3dlYmtpdDI9VHJ1ZSkKLSAgICAgICAg c2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2syJywgJ3F0LXdpbicsICdxdCddLCAnY3ln d2luJywgdXNlX3dlYmtpdDI9VHJ1ZSkKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRo KFsncXQtd2syJywgJ3F0LWxpbnV4JywgJ3F0J10sICdsaW51eDInLCB1c2Vfd2Via2l0Mj1UcnVl KQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13azInLCAncXQtbWFjJywg J3F0LTQuOCcsICdxdCddLCAnZGFyd2luJywgdXNlX3dlYmtpdDI9VHJ1ZSwgcXRfdmVyc2lvbj0n NS4wJykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2syJywgJ3F0LXdp bicsICdxdC00LjgnLCAncXQnXSwgJ2N5Z3dpbicsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNp b249JzUuMCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdrMicsICdx dC1saW51eCcsICdxdC00LjgnLCAncXQnXSwgJ2xpbnV4MicsIHVzZV93ZWJraXQyPVRydWUsIHF0 X3ZlcnNpb249JzUuMCcpCiAKICAgICBkZWYgdGVzdF9zaG93X3Jlc3VsdHNfaHRtbF9maWxlKHNl bGYpOgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQo= 109951 2011-10-06 05:47:28 -0700 2011-10-06 07:25:51 -0700 updated fallback path 06.patch text/plain 5951 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNzk4 ZGY5Li41MzhlOGU3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTAtMDYgIEtyaXN0w7NmIEtvc3p0ecOzICA8 a2tyaXN0b2ZAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3Rz IGRvZXMgbm90IHN1cHBvcnQgcXQtNC44IHJlc3VsdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MDcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3F0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cXRfdW5pdHRlc3QucHk6IFJlbW92ZWQuCisKIDIwMTEtMTAtMDMgIEhhbnMgV2VubmJvcmcgIDxo YW5zQGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbmRleGVkREI6IFJlbW92ZSBTUUxpdGUtTGV2 ZWxEQiBtaWdyYXRpb24gY29kZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvcXQucHkKaW5kZXggZTVmNWY4NC4uNzAwZTI0OCAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CkBAIC0yOSw2ICsyOSw3IEBACiAi IiJRdFdlYktpdCBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgUG9ydCBpbnRlcmZhY2UuIiIiCiAKIGlt cG9ydCBsb2dnaW5nCitpbXBvcnQgcmUKIGltcG9ydCBzeXMKIAogaW1wb3J0IHdlYmtpdApAQCAt ODksNiArOTAsMzAgQEAgY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogICAgIGRlZiBfcGF0aF90 b193ZWJjb3JlX2xpYnJhcnkoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRo KCdsaWIvbGliUXRXZWJLaXQuc28nKQogCisgICAgZGVmIHF0X3ZlcnNpb24oc2VsZik6CisgICAg ICAgIHZlcnNpb24gPSAnJworICAgICAgICBmb3IgbGluZSBpbiBzZWxmLl9leGVjdXRpdmUucnVu X2NvbW1hbmQoWydxbWFrZScsICctdiddKS5zcGxpdCgnXG4nKToKKyAgICAgICAgICAgIG1hdGNo ID0gcmUuc2VhcmNoKCdRdFxzdmVyc2lvblxzKD9QPHZlcnNpb24+XGRcLlxkKScsIGxpbmUpCisg ICAgICAgICAgICBpZiBtYXRjaDoKKyAgICAgICAgICAgICAgICB2ZXJzaW9uID0gbWF0Y2guZ3Jv dXAoJ3ZlcnNpb24nKQorICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgIHJldHVybiB2ZXJz aW9uCisKKyAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CisgICAgICAgIHNlYXJj aF9wYXRocyA9IFtdCisgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVu bmVyJyk6CisgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYuX3drMl9wb3J0X25h bWUoKSkKKyAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLm5hbWUoKSkKKyAgICAgICAg dmVyc2lvbiA9IHNlbGYucXRfdmVyc2lvbigpCisgICAgICAgIGlmICc0LjcnIGluIHZlcnNpb246 CisgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCdxdC00LjcnKQorICAgICAgICBlbGlm ICc0LjgnIGluIHZlcnNpb246CisgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCdxdC00 LjgnKQorICAgICAgICBlbGlmIHZlcnNpb246CisgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBw ZW5kKCdxdC01LjAnKQorICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYucG9ydF9uYW1l KQorICAgICAgICByZXR1cm4gbWFwKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWFyY2hf cGF0aHMpCisKICAgICBkZWYgX3J1bnRpbWVfZmVhdHVyZV9saXN0KHNlbGYpOgogICAgICAgICBy ZXR1cm4gTm9uZQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9xdF91bml0dGVzdC5weQppbmRleCAxNzhjYTZkLi42ZjE3NWQ3IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0 LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5p dHRlc3QucHkKQEAgLTI4LDYgKzI4LDcgQEAKIAogaW1wb3J0IHVuaXR0ZXN0CiAKK2Zyb20gd2Vi a2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmVfbW9jayBpbXBvcnQgTW9ja0V4ZWN1dGl2ZTIK IGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVtX21vY2sgaW1wb3J0IE1vY2tG aWxlU3lzdGVtCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBv cnQgT3V0cHV0Q2FwdHVyZQogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5xdCBpbXBv cnQgUXRQb3J0CkBAIC0zOSw3ICs0MCw3IEBAIGNsYXNzIFF0UG9ydFRlc3QocG9ydF90ZXN0Y2Fz ZS5Qb3J0VGVzdENhc2UpOgogICAgIGRlZiBwb3J0X21ha2VyKHNlbGYsIHBsYXRmb3JtKToKICAg ICAgICAgcmV0dXJuIFF0UG9ydAogCi0gICAgZGVmIF9hc3NlcnRfc2VhcmNoX3BhdGgoc2VsZiwg c2VhcmNoX3BhdGhzLCBzeXNfcGxhdGZvcm0sIHVzZV93ZWJraXQyPUZhbHNlKToKKyAgICBkZWYg X2Fzc2VydF9zZWFyY2hfcGF0aChzZWxmLCBzZWFyY2hfcGF0aHMsIHN5c19wbGF0Zm9ybSwgdXNl X3dlYmtpdDI9RmFsc2UsIHF0X3ZlcnNpb249JzQuNycpOgogICAgICAgICAjIEZJWE1FOiBQb3J0 IGNvbnN0cnVjdG9ycyBzaG91bGQgbm90ICJwYXJzZSIgdGhlIHBvcnQgbmFtZSwgYnV0CiAgICAg ICAgICMgcmF0aGVyIGJlIHBhc3NlZCBjb21wb25lbnRzIChkaXJlY3RseSBvciB2aWEgc2V0dGVy cykuICBPbmNlCiAgICAgICAgICMgd2UgZml4IHRoYXQsIHRoaXMgbWV0aG9kIHdpbGwgbmVlZCBh IHJlLXdyaXRlLgpAQCAtNDcsMjAgKzQ4LDM0IEBAIGNsYXNzIFF0UG9ydFRlc3QocG9ydF90ZXN0 Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICAgICAgb3B0aW9ucz1Nb2NrT3B0aW9ucyh3ZWJr aXRfdGVzdF9ydW5uZXI9dXNlX3dlYmtpdDIpLAogICAgICAgICAgICAgZmlsZXN5c3RlbT1Nb2Nr RmlsZVN5c3RlbSgpLAogICAgICAgICAgICAgdXNlcj1Nb2NrVXNlcigpLAotICAgICAgICAgICAg ZXhlY3V0aXZlPU1vY2tFeGVjdXRpdmUoKSkKKyAgICAgICAgICAgIGV4ZWN1dGl2ZT1Nb2NrRXhl Y3V0aXZlMihzZWxmLl9xdF92ZXJzaW9uKHF0X3ZlcnNpb24pKSkKICAgICAgICAgYWJzb2x1dGVf c2VhcmNoX3BhdGhzID0gbWFwKHBvcnQuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWFyY2hfcGF0 aHMpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgo KSwgYWJzb2x1dGVfc2VhcmNoX3BhdGhzKQogCisgICAgZGVmIF9xdF92ZXJzaW9uKHNlbGYsIHF0 X3ZlcnNpb24pOgorICAgICAgICBpZiBxdF92ZXJzaW9uIGluICc0LjcnOgorICAgICAgICAgICAg cmV0dXJuICdRTWFrZSB2ZXJzaW9uIDIuMDFhXG5Vc2luZyBRdCB2ZXJzaW9uIDQuNy4zIGluIC91 c3IvbG9jYWwvVHJvbGx0ZWNoL1F0LTQuNy4zL2xpYicKKyAgICAgICAgaWYgcXRfdmVyc2lvbiBp biAnNC44JzoKKyAgICAgICAgICAgIHJldHVybiAnUU1ha2UgdmVyc2lvbiAyLjAxYVxuVXNpbmcg UXQgdmVyc2lvbiA0LjguMCBpbiAvdXNyL2xvY2FsL1Ryb2xsdGVjaC9RdC00LjguMi9saWInCisg ICAgICAgIGlmIHF0X3ZlcnNpb24gaW4gJzUuMCc6CisgICAgICAgICAgICByZXR1cm4gJ1FNYWtl IHZlcnNpb24gMi4wMWFcblVzaW5nIFF0IHZlcnNpb24gNS4wLjAgaW4gL3Vzci9sb2NhbC9Ucm9s bHRlY2gvUXQtNS4wLjAvbGliJworCiAgICAgZGVmIHRlc3RfYmFzZWxpbmVfc2VhcmNoX3BhdGgo c2VsZik6Ci0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LW1hYycsICdxdCdd LCAnZGFyd2luJykKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2luJywg J3F0J10sICd3aW4zMicpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdp bicsICdxdCddLCAnY3lnd2luJykKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsn cXQtbGludXgnLCAncXQnXSwgJ2xpbnV4MicpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hf cGF0aChbJ3F0LWxpbnV4JywgJ3F0J10sICdsaW51eDMnKQorICAgICAgICBzZWxmLl9hc3NlcnRf c2VhcmNoX3BhdGgoWydxdC1tYWMnLCAncXQtNC43JywgJ3F0J10sICdkYXJ3aW4nKQorICAgICAg ICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13aW4nLCAncXQtNC43JywgJ3F0J10sICd3 aW4zMicpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdpbicsICdxdC00 LjcnLCAncXQnXSwgJ2N5Z3dpbicpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChb J3F0LWxpbnV4JywgJ3F0LTQuNycsICdxdCddLCAnbGludXgyJykKKyAgICAgICAgc2VsZi5fYXNz ZXJ0X3NlYXJjaF9wYXRoKFsncXQtbGludXgnLCAncXQtNC43JywgJ3F0J10sICdsaW51eDMnKQor CisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LW1hYycsICdxdC00LjgnLCAn cXQnXSwgJ2RhcndpbicsIHF0X3ZlcnNpb249JzQuOCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9z ZWFyY2hfcGF0aChbJ3F0LXdpbicsICdxdC00LjgnLCAncXQnXSwgJ3dpbjMyJywgcXRfdmVyc2lv bj0nNC44JykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2luJywgJ3F0 LTQuOCcsICdxdCddLCAnY3lnd2luJywgcXRfdmVyc2lvbj0nNC44JykKKyAgICAgICAgc2VsZi5f YXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtbGludXgnLCAncXQtNC44JywgJ3F0J10sICdsaW51eDIn LCBxdF92ZXJzaW9uPSc0LjgnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydx dC1saW51eCcsICdxdC00LjgnLCAncXQnXSwgJ2xpbnV4MycsIHF0X3ZlcnNpb249JzQuOCcpCiAK LSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2syJywgJ3F0LW1hYycsICdx dCddLCAnZGFyd2luJywgdXNlX3dlYmtpdDI9VHJ1ZSkKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3Nl YXJjaF9wYXRoKFsncXQtd2syJywgJ3F0LXdpbicsICdxdCddLCAnY3lnd2luJywgdXNlX3dlYmtp dDI9VHJ1ZSkKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2syJywgJ3F0 LWxpbnV4JywgJ3F0J10sICdsaW51eDInLCB1c2Vfd2Via2l0Mj1UcnVlKQorICAgICAgICBzZWxm Ll9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13azInLCAncXQtbWFjJywgJ3F0LTUuMCcsICdxdCdd LCAnZGFyd2luJywgdXNlX3dlYmtpdDI9VHJ1ZSwgcXRfdmVyc2lvbj0nNS4wJykKKyAgICAgICAg c2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2syJywgJ3F0LXdpbicsICdxdC01LjAnLCAn cXQnXSwgJ2N5Z3dpbicsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCisgICAg ICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdrMicsICdxdC1saW51eCcsICdxdC01 LjAnLCAncXQnXSwgJ2xpbnV4MicsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcp CiAKICAgICBkZWYgdGVzdF9zaG93X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYpOgogICAgICAgICBw b3J0ID0gc2VsZi5tYWtlX3BvcnQoKQo= 109960 2011-10-06 07:25:51 -0700 2011-10-07 06:39:36 -0700 proposed fix b.patch text/plain 5942 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNzk4 ZGY5Li44YmY3NWY3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTAtMDYgIEtyaXN0w7NmIEtvc3p0ecOzICA8 a2tyaXN0b2ZAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3Rz IGRvZXMgbm90IHN1cHBvcnQgcXQtNC44IHJlc3VsdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MDcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3F0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cXRfdW5pdHRlc3QucHk6CisKIDIwMTEtMTAtMDMgIEhhbnMgV2VubmJvcmcgIDxoYW5zQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBJbmRleGVkREI6IFJlbW92ZSBTUUxpdGUtTGV2ZWxEQiBtaWdy YXRpb24gY29kZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9xdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cXQucHkKaW5kZXggZTVmNWY4NC4uNzAwZTI0OCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CkBAIC0yOSw2ICsyOSw3IEBACiAiIiJRdFdlYktp dCBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgUG9ydCBpbnRlcmZhY2UuIiIiCiAKIGltcG9ydCBsb2dn aW5nCitpbXBvcnQgcmUKIGltcG9ydCBzeXMKIAogaW1wb3J0IHdlYmtpdApAQCAtODksNiArOTAs MzAgQEAgY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogICAgIGRlZiBfcGF0aF90b193ZWJjb3Jl X2xpYnJhcnkoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKCdsaWIvbGli UXRXZWJLaXQuc28nKQogCisgICAgZGVmIHF0X3ZlcnNpb24oc2VsZik6CisgICAgICAgIHZlcnNp b24gPSAnJworICAgICAgICBmb3IgbGluZSBpbiBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQo WydxbWFrZScsICctdiddKS5zcGxpdCgnXG4nKToKKyAgICAgICAgICAgIG1hdGNoID0gcmUuc2Vh cmNoKCdRdFxzdmVyc2lvblxzKD9QPHZlcnNpb24+XGRcLlxkKScsIGxpbmUpCisgICAgICAgICAg ICBpZiBtYXRjaDoKKyAgICAgICAgICAgICAgICB2ZXJzaW9uID0gbWF0Y2guZ3JvdXAoJ3ZlcnNp b24nKQorICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgIHJldHVybiB2ZXJzaW9uCisKKyAg ICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CisgICAgICAgIHNlYXJjaF9wYXRocyA9 IFtdCisgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVubmVyJyk6Cisg ICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYuX3drMl9wb3J0X25hbWUoKSkKKyAg ICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLm5hbWUoKSkKKyAgICAgICAgdmVyc2lvbiA9 IHNlbGYucXRfdmVyc2lvbigpCisgICAgICAgIGlmICc0LjcnIGluIHZlcnNpb246CisgICAgICAg ICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCdxdC00LjcnKQorICAgICAgICBlbGlmICc0LjgnIGlu IHZlcnNpb246CisgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCdxdC00LjgnKQorICAg ICAgICBlbGlmIHZlcnNpb246CisgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCdxdC01 LjAnKQorICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYucG9ydF9uYW1lKQorICAgICAg ICByZXR1cm4gbWFwKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWFyY2hfcGF0aHMpCisK ICAgICBkZWYgX3J1bnRpbWVfZmVhdHVyZV9saXN0KHNlbGYpOgogICAgICAgICByZXR1cm4gTm9u ZQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L3F0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9xdF91bml0dGVzdC5weQppbmRleCAxNzhjYTZkLi4yMDVkMTBkIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkK QEAgLTI4LDYgKzI4LDcgQEAKIAogaW1wb3J0IHVuaXR0ZXN0CiAKK2Zyb20gd2Via2l0cHkuY29t bW9uLnN5c3RlbS5leGVjdXRpdmVfbW9jayBpbXBvcnQgTW9ja0V4ZWN1dGl2ZTIKIGZyb20gd2Vi a2l0cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVtX21vY2sgaW1wb3J0IE1vY2tGaWxlU3lzdGVt CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0 Q2FwdHVyZQogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5xdCBpbXBvcnQgUXRQb3J0 CkBAIC0zOSw3ICs0MCw3IEBAIGNsYXNzIFF0UG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVz dENhc2UpOgogICAgIGRlZiBwb3J0X21ha2VyKHNlbGYsIHBsYXRmb3JtKToKICAgICAgICAgcmV0 dXJuIFF0UG9ydAogCi0gICAgZGVmIF9hc3NlcnRfc2VhcmNoX3BhdGgoc2VsZiwgc2VhcmNoX3Bh dGhzLCBzeXNfcGxhdGZvcm0sIHVzZV93ZWJraXQyPUZhbHNlKToKKyAgICBkZWYgX2Fzc2VydF9z ZWFyY2hfcGF0aChzZWxmLCBzZWFyY2hfcGF0aHMsIHN5c19wbGF0Zm9ybSwgdXNlX3dlYmtpdDI9 RmFsc2UsIHF0X3ZlcnNpb249JzQuNycpOgogICAgICAgICAjIEZJWE1FOiBQb3J0IGNvbnN0cnVj dG9ycyBzaG91bGQgbm90ICJwYXJzZSIgdGhlIHBvcnQgbmFtZSwgYnV0CiAgICAgICAgICMgcmF0 aGVyIGJlIHBhc3NlZCBjb21wb25lbnRzIChkaXJlY3RseSBvciB2aWEgc2V0dGVycykuICBPbmNl CiAgICAgICAgICMgd2UgZml4IHRoYXQsIHRoaXMgbWV0aG9kIHdpbGwgbmVlZCBhIHJlLXdyaXRl LgpAQCAtNDcsMjAgKzQ4LDM0IEBAIGNsYXNzIFF0UG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0 VGVzdENhc2UpOgogICAgICAgICAgICAgb3B0aW9ucz1Nb2NrT3B0aW9ucyh3ZWJraXRfdGVzdF9y dW5uZXI9dXNlX3dlYmtpdDIpLAogICAgICAgICAgICAgZmlsZXN5c3RlbT1Nb2NrRmlsZVN5c3Rl bSgpLAogICAgICAgICAgICAgdXNlcj1Nb2NrVXNlcigpLAotICAgICAgICAgICAgZXhlY3V0aXZl PU1vY2tFeGVjdXRpdmUoKSkKKyAgICAgICAgICAgIGV4ZWN1dGl2ZT1Nb2NrRXhlY3V0aXZlMihz ZWxmLl9xdF92ZXJzaW9uKHF0X3ZlcnNpb24pKSkKICAgICAgICAgYWJzb2x1dGVfc2VhcmNoX3Bh dGhzID0gbWFwKHBvcnQuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWFyY2hfcGF0aHMpCiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKSwgYWJzb2x1 dGVfc2VhcmNoX3BhdGhzKQogCisgICAgZGVmIF9xdF92ZXJzaW9uKHNlbGYsIHF0X3ZlcnNpb24p OgorICAgICAgICBpZiBxdF92ZXJzaW9uIGluICc0LjcnOgorICAgICAgICAgICAgcmV0dXJuICdR TWFrZSB2ZXJzaW9uIDIuMDFhXG5Vc2luZyBRdCB2ZXJzaW9uIDQuNy4zIGluIC91c3IvbG9jYWwv VHJvbGx0ZWNoL1F0LTQuNy4zL2xpYicKKyAgICAgICAgaWYgcXRfdmVyc2lvbiBpbiAnNC44JzoK KyAgICAgICAgICAgIHJldHVybiAnUU1ha2UgdmVyc2lvbiAyLjAxYVxuVXNpbmcgUXQgdmVyc2lv biA0LjguMCBpbiAvdXNyL2xvY2FsL1Ryb2xsdGVjaC9RdC00LjguMC9saWInCisgICAgICAgIGlm IHF0X3ZlcnNpb24gaW4gJzUuMCc6CisgICAgICAgICAgICByZXR1cm4gJ1FNYWtlIHZlcnNpb24g Mi4wMWFcblVzaW5nIFF0IHZlcnNpb24gNS4wLjAgaW4gL3Vzci9sb2NhbC9Ucm9sbHRlY2gvUXQt NS4wLjAvbGliJworCiAgICAgZGVmIHRlc3RfYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6Ci0g ICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LW1hYycsICdxdCddLCAnZGFyd2lu JykKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2luJywgJ3F0J10sICd3 aW4zMicpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdpbicsICdxdCdd LCAnY3lnd2luJykKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtbGludXgn LCAncXQnXSwgJ2xpbnV4MicpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0 LWxpbnV4JywgJ3F0J10sICdsaW51eDMnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3Bh dGgoWydxdC1tYWMnLCAncXQtNC43JywgJ3F0J10sICdkYXJ3aW4nKQorICAgICAgICBzZWxmLl9h c3NlcnRfc2VhcmNoX3BhdGgoWydxdC13aW4nLCAncXQtNC43JywgJ3F0J10sICd3aW4zMicpCisg ICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdpbicsICdxdC00LjcnLCAncXQn XSwgJ2N5Z3dpbicpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LWxpbnV4 JywgJ3F0LTQuNycsICdxdCddLCAnbGludXgyJykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJj aF9wYXRoKFsncXQtbGludXgnLCAncXQtNC43JywgJ3F0J10sICdsaW51eDMnKQorCisgICAgICAg IHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LW1hYycsICdxdC00LjgnLCAncXQnXSwgJ2Rh cndpbicsIHF0X3ZlcnNpb249JzQuOCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0 aChbJ3F0LXdpbicsICdxdC00LjgnLCAncXQnXSwgJ3dpbjMyJywgcXRfdmVyc2lvbj0nNC44JykK KyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2luJywgJ3F0LTQuOCcsICdx dCddLCAnY3lnd2luJywgcXRfdmVyc2lvbj0nNC44JykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3Nl YXJjaF9wYXRoKFsncXQtbGludXgnLCAncXQtNC44JywgJ3F0J10sICdsaW51eDInLCBxdF92ZXJz aW9uPSc0LjgnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC1saW51eCcs ICdxdC00LjgnLCAncXQnXSwgJ2xpbnV4MycsIHF0X3ZlcnNpb249JzQuOCcpCiAKLSAgICAgICAg c2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2syJywgJ3F0LW1hYycsICdxdCddLCAnZGFy d2luJywgdXNlX3dlYmtpdDI9VHJ1ZSkKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRo KFsncXQtd2syJywgJ3F0LXdpbicsICdxdCddLCAnY3lnd2luJywgdXNlX3dlYmtpdDI9VHJ1ZSkK LSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2syJywgJ3F0LWxpbnV4Jywg J3F0J10sICdsaW51eDInLCB1c2Vfd2Via2l0Mj1UcnVlKQorICAgICAgICBzZWxmLl9hc3NlcnRf c2VhcmNoX3BhdGgoWydxdC13azInLCAncXQtbWFjJywgJ3F0LTUuMCcsICdxdCddLCAnZGFyd2lu JywgdXNlX3dlYmtpdDI9VHJ1ZSwgcXRfdmVyc2lvbj0nNS4wJykKKyAgICAgICAgc2VsZi5fYXNz ZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2syJywgJ3F0LXdpbicsICdxdC01LjAnLCAncXQnXSwgJ2N5 Z3dpbicsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCisgICAgICAgIHNlbGYu X2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdrMicsICdxdC1saW51eCcsICdxdC01LjAnLCAncXQn XSwgJ2xpbnV4MicsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCiAKICAgICBk ZWYgdGVzdF9zaG93X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYpOgogICAgICAgICBwb3J0ID0gc2Vs Zi5tYWtlX3BvcnQoKQo= 110135 2011-10-07 06:39:36 -0700 2011-10-12 04:27:33 -0700 proposed fix 0001-new-run-webkit-tests-does-not-support-qt-4.8-results.patch text/plain 8196 kkristof RnJvbSA5ZjQxMzk0OTBjZTRiZDE4ZDBhZTUwYmExMGZkYzEzYjcwYTRjNzZmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/S3Jpc3Q9QzM9QjNmPTIwS29zenR5PUMzPUIz Pz0gPGtrcmlzdG9mQGluZi51LXN6ZWdlZC5odT4KRGF0ZTogRnJpLCA3IE9jdCAyMDExIDE1OjM2 OjA2ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gbmV3LXJ1bi13ZWJraXQtdGVzdHMgZG9lcyBub3Qg c3VwcG9ydCBxdC00LjggcmVzdWx0cwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY0MDcxCgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHwgICAxMCArKysrKwogVG9vbHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfCAgIDEwICsrKysrCiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5ICAgICB8ICAgNDAgKysrKysrKysrKysrKysrKysrKysK IC4uLi93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weSAgICAgIHwgICAz NSArKysrKysrKysrKystLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA4NSBpbnNlcnRpb25zKCspLCAx MCBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9x dC00LjcvU2tpcHBlZAogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL3BsYXRmb3JtL3F0 LTUuMC9Ta2lwcGVkCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDEwNGQ2NTYuLjhlYTkwNzkgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MyBAQAorMjAxMS0xMC0wNyAgS3Jpc3TDs2YgS29zenR5w7MgIDxra3Jpc3RvZkBpbmYudS1zemVn ZWQuaHU+CisKKyAgICAgICAgbmV3LXJ1bi13ZWJraXQtdGVzdHMgZG9lcyBub3Qgc3VwcG9ydCBx dC00LjggcmVzdWx0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQwNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHBsYXRmb3JtL3F0LTQuNy9Ta2lwcGVkOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9y bS9xdC01LjAvU2tpcHBlZDogQWRkZWQuCisKIDIwMTEtMTAtMDcgIEtlbnQgVGFtdXJhICA8dGtl bnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFRlc3QgdXBkYXRlIGZvciByOTY4OTMuCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC00LjcvU2tpcHBlZCBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL3F0LTQuNy9Ta2lwcGVkCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLmU2OWRlMjkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0LTUuMC9Ta2lw cGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQtNS4wL1NraXBwZWQKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMC4uZTY5ZGUyOQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9n IGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGM4NjkxODguLjZlMDJlZjEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAx MS0xMC0wNyAgS3Jpc3TDs2YgS29zenR5w7MgIDxra3Jpc3RvZkBpbmYudS1zemVnZWQuaHU+CisK KyAgICAgICAgbmV3LXJ1bi13ZWJraXQtdGVzdHMgZG9lcyBub3Qgc3VwcG9ydCBxdC00LjggcmVz dWx0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQw NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weToKKwogMjAxMS0xMC0w NiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFBvcnQgUGl4ZWxa b29tZXIgdG8gd29yayBpbiBnYXJkZW4tby1tYXRpYwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKaW5kZXggZTVmNWY4NC4uZGNmODViNSAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CkBAIC0yOSwx MCArMjksMTIgQEAKICIiIlF0V2ViS2l0IGltcGxlbWVudGF0aW9uIG9mIHRoZSBQb3J0IGludGVy ZmFjZS4iIiIKIAogaW1wb3J0IGxvZ2dpbmcKK2ltcG9ydCByZQogaW1wb3J0IHN5cwogCiBpbXBv cnQgd2Via2l0CiAKK2Zyb20gd2Via2l0cHkuY29tbW9uLm1lbW9pemVkIGltcG9ydCBtZW1vaXpl ZAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRlc3RfY29uZmlndXJhdGlvbiBp bXBvcnQgVGVzdENvbmZpZ3VyYXRpb24KIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQu d2Via2l0IGltcG9ydCBXZWJLaXRQb3J0CiAKQEAgLTg5LDYgKzkxLDQ0IEBAIGNsYXNzIFF0UG9y dChXZWJLaXRQb3J0KToKICAgICBkZWYgX3BhdGhfdG9fd2ViY29yZV9saWJyYXJ5KHNlbGYpOgog ICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aCgnbGliL2xpYlF0V2ViS2l0LnNvJykKIAor ICAgIEBtZW1vaXplZAorICAgIGRlZiBxdF92ZXJzaW9uKHNlbGYpOgorICAgICAgICB2ZXJzaW9u ID0gJycKKyAgICAgICAgZm9yIGxpbmUgaW4gc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsn cW1ha2UnLCAnLXYnXSkuc3BsaXQoJ1xuJyk6CisgICAgICAgICAgICBtYXRjaCA9IHJlLnNlYXJj aCgnUXRcc3ZlcnNpb25ccyg/UDx2ZXJzaW9uPlxkXC5cZCknLCBsaW5lKQorICAgICAgICAgICAg aWYgbWF0Y2g6CisgICAgICAgICAgICAgICAgdmVyc2lvbiA9IG1hdGNoLmdyb3VwKCd2ZXJzaW9u JykKKyAgICAgICAgICAgICAgICBicmVhaworICAgICAgICByZXR1cm4gdmVyc2lvbgorCisgICAg ZGVmIGJhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgorICAgICAgICBzZWFyY2hfcGF0aHMgPSBb XQorICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgorICAg ICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLl93azJfcG9ydF9uYW1lKCkpCisgICAg ICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5uYW1lKCkpCisgICAgICAgIHZlcnNpb24gPSBz ZWxmLnF0X3ZlcnNpb24oKQorICAgICAgICBpZiAnNC43JyBpbiB2ZXJzaW9uOgorICAgICAgICAg ICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNC43JykKKyAgICAgICAgZWxpZiAnNC44JyBpbiB2 ZXJzaW9uOgorICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNC44JykKKyAgICAg ICAgZWxpZiB2ZXJzaW9uOgorICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNS4w JykKKyAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLnBvcnRfbmFtZSkKKyAgICAgICAg cmV0dXJuIG1hcChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCwgc2VhcmNoX3BhdGhzKQorCisg ICAgZGVmIF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhzKHNlbGYpOgorICAgICAgICBzZWFyY2hf cGF0aHMgPSBzZXQoW3NlbGYucG9ydF9uYW1lLCBzZWxmLm5hbWUoKV0pCisgICAgICAgIHZlcnNp b24gPSBzZWxmLnF0X3ZlcnNpb24oKQorICAgICAgICBpZiAnNC43JyBpbiB2ZXJzaW9uOgorICAg ICAgICAgICAgc2VhcmNoX3BhdGhzLmFkZCgncXQtNC43JykKKyAgICAgICAgZWxpZiAnNC44JyBp biB2ZXJzaW9uOgorICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFkZCgncXQtNC44JykKKyAgICAg ICAgZWxpZiB2ZXJzaW9uOgorICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFkZCgncXQtNS4wJykK KyAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKKyAgICAg ICAgICAgIHNlYXJjaF9wYXRocy51cGRhdGUoWydxdC13azInLCAnd2syJ10pCisgICAgICAgIHJl dHVybiBzZWFyY2hfcGF0aHMKKwogICAgIGRlZiBfcnVudGltZV9mZWF0dXJlX2xpc3Qoc2VsZik6 CiAgICAgICAgIHJldHVybiBOb25lCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CmluZGV4IDE3OGNhNmQuLjIwNWQx MGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cXRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9xdF91bml0dGVzdC5weQpAQCAtMjgsNiArMjgsNyBAQAogCiBpbXBvcnQgdW5pdHRlc3QK IAorZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZV9tb2NrIGltcG9ydCBNb2Nr RXhlY3V0aXZlMgogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmZpbGVzeXN0ZW1fbW9jayBp bXBvcnQgTW9ja0ZpbGVTeXN0ZW0KIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5vdXRwdXRj YXB0dXJlIGltcG9ydCBPdXRwdXRDYXB0dXJlCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5w b3J0LnF0IGltcG9ydCBRdFBvcnQKQEAgLTM5LDcgKzQwLDcgQEAgY2xhc3MgUXRQb3J0VGVzdChw b3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAgICAgZGVmIHBvcnRfbWFrZXIoc2VsZiwgcGxh dGZvcm0pOgogICAgICAgICByZXR1cm4gUXRQb3J0CiAKLSAgICBkZWYgX2Fzc2VydF9zZWFyY2hf cGF0aChzZWxmLCBzZWFyY2hfcGF0aHMsIHN5c19wbGF0Zm9ybSwgdXNlX3dlYmtpdDI9RmFsc2Up OgorICAgIGRlZiBfYXNzZXJ0X3NlYXJjaF9wYXRoKHNlbGYsIHNlYXJjaF9wYXRocywgc3lzX3Bs YXRmb3JtLCB1c2Vfd2Via2l0Mj1GYWxzZSwgcXRfdmVyc2lvbj0nNC43Jyk6CiAgICAgICAgICMg RklYTUU6IFBvcnQgY29uc3RydWN0b3JzIHNob3VsZCBub3QgInBhcnNlIiB0aGUgcG9ydCBuYW1l LCBidXQKICAgICAgICAgIyByYXRoZXIgYmUgcGFzc2VkIGNvbXBvbmVudHMgKGRpcmVjdGx5IG9y IHZpYSBzZXR0ZXJzKS4gIE9uY2UKICAgICAgICAgIyB3ZSBmaXggdGhhdCwgdGhpcyBtZXRob2Qg d2lsbCBuZWVkIGEgcmUtd3JpdGUuCkBAIC00NywyMCArNDgsMzQgQEAgY2xhc3MgUXRQb3J0VGVz dChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAgICAgICAgICAgICBvcHRpb25zPU1vY2tP cHRpb25zKHdlYmtpdF90ZXN0X3J1bm5lcj11c2Vfd2Via2l0MiksCiAgICAgICAgICAgICBmaWxl c3lzdGVtPU1vY2tGaWxlU3lzdGVtKCksCiAgICAgICAgICAgICB1c2VyPU1vY2tVc2VyKCksCi0g ICAgICAgICAgICBleGVjdXRpdmU9TW9ja0V4ZWN1dGl2ZSgpKQorICAgICAgICAgICAgZXhlY3V0 aXZlPU1vY2tFeGVjdXRpdmUyKHNlbGYuX3F0X3ZlcnNpb24ocXRfdmVyc2lvbikpKQogICAgICAg ICBhYnNvbHV0ZV9zZWFyY2hfcGF0aHMgPSBtYXAocG9ydC5fd2Via2l0X2Jhc2VsaW5lX3BhdGgs IHNlYXJjaF9wYXRocykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5iYXNlbGluZV9z ZWFyY2hfcGF0aCgpLCBhYnNvbHV0ZV9zZWFyY2hfcGF0aHMpCiAKKyAgICBkZWYgX3F0X3ZlcnNp b24oc2VsZiwgcXRfdmVyc2lvbik6CisgICAgICAgIGlmIHF0X3ZlcnNpb24gaW4gJzQuNyc6Cisg ICAgICAgICAgICByZXR1cm4gJ1FNYWtlIHZlcnNpb24gMi4wMWFcblVzaW5nIFF0IHZlcnNpb24g NC43LjMgaW4gL3Vzci9sb2NhbC9Ucm9sbHRlY2gvUXQtNC43LjMvbGliJworICAgICAgICBpZiBx dF92ZXJzaW9uIGluICc0LjgnOgorICAgICAgICAgICAgcmV0dXJuICdRTWFrZSB2ZXJzaW9uIDIu MDFhXG5Vc2luZyBRdCB2ZXJzaW9uIDQuOC4wIGluIC91c3IvbG9jYWwvVHJvbGx0ZWNoL1F0LTQu OC4wL2xpYicKKyAgICAgICAgaWYgcXRfdmVyc2lvbiBpbiAnNS4wJzoKKyAgICAgICAgICAgIHJl dHVybiAnUU1ha2UgdmVyc2lvbiAyLjAxYVxuVXNpbmcgUXQgdmVyc2lvbiA1LjAuMCBpbiAvdXNy L2xvY2FsL1Ryb2xsdGVjaC9RdC01LjAuMC9saWInCisKICAgICBkZWYgdGVzdF9iYXNlbGluZV9z ZWFyY2hfcGF0aChzZWxmKToKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQt bWFjJywgJ3F0J10sICdkYXJ3aW4nKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgo WydxdC13aW4nLCAncXQnXSwgJ3dpbjMyJykKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9w YXRoKFsncXQtd2luJywgJ3F0J10sICdjeWd3aW4nKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2Vh cmNoX3BhdGgoWydxdC1saW51eCcsICdxdCddLCAnbGludXgyJykKLSAgICAgICAgc2VsZi5fYXNz ZXJ0X3NlYXJjaF9wYXRoKFsncXQtbGludXgnLCAncXQnXSwgJ2xpbnV4MycpCisgICAgICAgIHNl bGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LW1hYycsICdxdC00LjcnLCAncXQnXSwgJ2Rhcndp bicpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdpbicsICdxdC00Ljcn LCAncXQnXSwgJ3dpbjMyJykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQt d2luJywgJ3F0LTQuNycsICdxdCddLCAnY3lnd2luJykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3Nl YXJjaF9wYXRoKFsncXQtbGludXgnLCAncXQtNC43JywgJ3F0J10sICdsaW51eDInKQorICAgICAg ICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC1saW51eCcsICdxdC00LjcnLCAncXQnXSwg J2xpbnV4MycpCisKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtbWFjJywg J3F0LTQuOCcsICdxdCddLCAnZGFyd2luJywgcXRfdmVyc2lvbj0nNC44JykKKyAgICAgICAgc2Vs Zi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2luJywgJ3F0LTQuOCcsICdxdCddLCAnd2luMzIn LCBxdF92ZXJzaW9uPSc0LjgnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydx dC13aW4nLCAncXQtNC44JywgJ3F0J10sICdjeWd3aW4nLCBxdF92ZXJzaW9uPSc0LjgnKQorICAg ICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC1saW51eCcsICdxdC00LjgnLCAncXQn XSwgJ2xpbnV4MicsIHF0X3ZlcnNpb249JzQuOCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFy Y2hfcGF0aChbJ3F0LWxpbnV4JywgJ3F0LTQuOCcsICdxdCddLCAnbGludXgzJywgcXRfdmVyc2lv bj0nNC44JykKIAotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13azInLCAn cXQtbWFjJywgJ3F0J10sICdkYXJ3aW4nLCB1c2Vfd2Via2l0Mj1UcnVlKQotICAgICAgICBzZWxm Ll9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13azInLCAncXQtd2luJywgJ3F0J10sICdjeWd3aW4n LCB1c2Vfd2Via2l0Mj1UcnVlKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydx dC13azInLCAncXQtbGludXgnLCAncXQnXSwgJ2xpbnV4MicsIHVzZV93ZWJraXQyPVRydWUpCisg ICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdrMicsICdxdC1tYWMnLCAncXQt NS4wJywgJ3F0J10sICdkYXJ3aW4nLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJzaW9uPSc1LjAn KQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13azInLCAncXQtd2luJywg J3F0LTUuMCcsICdxdCddLCAnY3lnd2luJywgdXNlX3dlYmtpdDI9VHJ1ZSwgcXRfdmVyc2lvbj0n NS4wJykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2syJywgJ3F0LWxp bnV4JywgJ3F0LTUuMCcsICdxdCddLCAnbGludXgyJywgdXNlX3dlYmtpdDI9VHJ1ZSwgcXRfdmVy c2lvbj0nNS4wJykKIAogICAgIGRlZiB0ZXN0X3Nob3dfcmVzdWx0c19odG1sX2ZpbGUoc2VsZik6 CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCi0tIAoxLjcuMQoK