76278 2012-01-13 08:27:14 -0800 [NRWT] Support --ignore-metrics 2012-10-16 15:39:27 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kbalazs kbalazs abarth dpranke eric hugo.lima ojan ossy vestbo webkit.review.bot oldest_to_newest 535691 0 kbalazs 2012-01-13 08:27:14 -0800 The --ignore-metrics option of ORWT can be useful for getting basic coverage on platforms without maintaining baselines for the specific rendering backend. Maintaining metric baselines needs a lot of manpower and the metric mismatches are usually do not indicate real bugs. For the Qt port, it could be useful to have better coverage on non-Linux platforms (Mac, Windows, etc.). 535699 1 122432 kbalazs 2012-01-13 08:31:02 -0800 Created attachment 122432 patch 535702 2 webkit.review.bot 2012-01-13 08:32:53 -0800 Attachment 122432 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/Scripts/webkitpy/layout_tests/port/driver_unittest.py:37: expected 2 blank lines, found 1 [pep8/E302] [5] Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py:69: whitespace before ']' [pep8/E202] [5] Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:313: whitespace before ']' [pep8/E202] [5] Total errors found: 3 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 535713 3 122434 kbalazs 2012-01-13 08:54:29 -0800 Created attachment 122434 fixed style 535776 4 122434 tony 2012-01-13 10:38:02 -0800 Comment on attachment 122434 fixed style View in context: https://bugs.webkit.org/attachment.cgi?id=122434&action=review Some minor python style nits. Overall, the patch seems OK. > Tools/Scripts/webkitpy/layout_tests/port/driver.py:67 > + strip_patterns = self.__class__.strip_patterns > + if strip_patterns == []: You can just define the patterns above and avoid the if check. Also, self.strip_patterns will automatically fall back to self.__class__.strip_patterns. > Tools/Scripts/webkitpy/layout_tests/port/driver.py:80 > + strip_patterns.append((re.compile('\n( *)"\s+'), r'\n\1"')) r'\n\1' becomes \n\1 (no newline, actually backslash-n-backslash-1). I think you meant to do '\n\\1' instead. I'm not sure if a test case covers this regex. > Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py:57 > + ('text run at (0,0) width 109: ".one {color: green;}"\n\ > + text run at (109,0) width 0: " "\n\ > + text run at (0,17) width 81: ".1 {color: red;}"\n\ > + text run at (81,17) width 0: " "\n\ You can use triple quotes and avoid the need to manually add \n\. 536632 5 122655 kbalazs 2012-01-16 09:48:57 -0800 Created attachment 122655 Patch 536636 6 kbalazs 2012-01-16 09:55:00 -0800 (In reply to comment #4) > (From update of attachment 122434 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=122434&action=review > > Some minor python style nits. Overall, the patch seems OK. > > > Tools/Scripts/webkitpy/layout_tests/port/driver.py:67 > > + strip_patterns = self.__class__.strip_patterns > > + if strip_patterns == []: > > You can just define the patterns above and avoid the if check. Also, self.strip_patterns will automatically fall back to self.__class__.strip_patterns. Done. > > > Tools/Scripts/webkitpy/layout_tests/port/driver.py:80 > > + strip_patterns.append((re.compile('\n( *)"\s+'), r'\n\1"')) > > r'\n\1' becomes \n\1 (no newline, actually backslash-n-backslash-1). I think you meant to do '\n\\1' instead. I'm not sure if a test case covers this regex. I believe this rule should remove trailing spaces after text between quotes but keep the identation of the line. It seems like redundant since the '" +$' -> '"' rule should do the same so I removed this one. > > > Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py:57 > > + ('text run at (0,0) width 109: ".one {color: green;}"\n\ > > + text run at (109,0) width 0: " "\n\ > > + text run at (0,17) width 81: ".1 {color: red;}"\n\ > > + text run at (81,17) width 0: " "\n\ > > You can use triple quotes and avoid the need to manually add \n\. The identations should not change and I guess it would be against the style with triple quotes and it's easier to read it this way. 536972 7 122737 kbalazs 2012-01-17 02:11:49 -0800 Created attachment 122737 Patch Fixed the case of missing expected txt that caused an unhandled exception with the previous patch. 542982 8 kbalazs 2012-01-26 02:10:53 -0800 Committed r105981: <http://trac.webkit.org/changeset/105981> 542983 9 kbalazs 2012-01-26 02:11:27 -0800 (In reply to comment #8) > Committed r105981: <http://trac.webkit.org/changeset/105981> Landed with the triple quote fix. 543429 10 hugo.lima 2012-01-26 13:28:43 -0800 I think it's not fully working yet, running the tests with: new-run-webkit-tests --ignore-metrics -2 --no-launch-safari --no-new-test-results --no-sample-on-timeout --results-directory /tmp/bug --release --exit-after-n-crashes-or-timeouts 20 --exit-after-n-failures 500 --qt I got a lot of failures with diffs like: RenderText {#text} - " was set." + "was set." Tested with svn rev 106030, (496b672dab88013d53891821c856aa73aa553130 on git) 543539 11 kbalazs 2012-01-26 15:15:55 -0800 (In reply to comment #10) > I think it's not fully working yet, running the tests with: > > new-run-webkit-tests --ignore-metrics -2 --no-launch-safari --no-new-test-results --no-sample-on-timeout --results-directory /tmp/bug --release --exit-after-n-crashes-or-timeouts 20 --exit-after-n-failures 500 --qt > > I got a lot of failures with diffs like: > > RenderText {#text} > - " was set." > + "was set." > > Tested with svn rev 106030, (496b672dab88013d53891821c856aa73aa553130 on git) I will look into that tomorrow. Thanks for pointing it out. 545007 12 kbalazs 2012-01-30 04:16:43 -0800 (In reply to comment #11) > (In reply to comment #10) > > I think it's not fully working yet, running the tests with: > > > > new-run-webkit-tests --ignore-metrics -2 --no-launch-safari --no-new-test-results --no-sample-on-timeout --results-directory /tmp/bug --release --exit-after-n-crashes-or-timeouts 20 --exit-after-n-failures 500 --qt > > > > I got a lot of failures with diffs like: > > > > RenderText {#text} > > - " was set." > > + "was set." > > > > Tested with svn rev 106030, (496b672dab88013d53891821c856aa73aa553130 on git) > > I will look into that tomorrow. Thanks for pointing it out. I could not reproduce this bug. Not all tests pass for me locally but I have no failures like yours (and I think my failures are not connected with --ignore-metrics). 743643 13 eric 2012-10-16 15:39:27 -0700 This feature seems questionable at best. But I think it was a mistake to add this into driver.py, instead of creating a separate object for this post-processing hack. :( 122432 2012-01-13 08:31:02 -0800 2012-01-13 08:54:17 -0800 patch ignore_metrics.diff text/plain 8175 kbalazs ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzODcz YmJiLi5hN2I1Y2ZkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMDEtMTMgIEJhbGF6cyBLZWxlbWVuICA8a2Jh bGF6c0B3ZWJraXQub3JnPgorCisgICAgICAgIFtOUldUXSBTdXBwb3J0IC0taWdub3JlLW1ldHJp Y3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2Mjc4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUG9ydCB0 aGUgZmVhdHVyZSBmcm9tIE9SV1QuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHk6CisgICAgICAgIChTaW5n bGVUZXN0UnVubmVyLl9ydW5fY29tcGFyZV90ZXN0KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlci5weToKKyAgICAgICAgKERyaXZlck91dHB1dCk6 CisgICAgICAgIChEcml2ZXJPdXRwdXQuc3RyaXBfbWV0cmljcyk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcml2ZXJfdW5pdHRlc3QucHk6CisgICAgICAg IChEcml2ZXJPdXRwdXRUZXN0KToKKyAgICAgICAgKERyaXZlck91dHB1dFRlc3QudGVzdF9zdHJp cF9tZXRyaWNzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5f d2Via2l0X3Rlc3RzLnB5OgorICAgICAgICAoX3NldF91cF9kZXJpdmVkX29wdGlvbnMpOgorICAg ICAgICAocGFyc2VfYXJncyk6CisKIDIwMTItMDEtMTIgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6 c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1bV0syXSBTZXQgdXAgcGx1Z2luIHByb2Nlc3Mg b24gVW5peApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv Y29udHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CmluZGV4IGFm NGIyZDkuLjc5MWZiNjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIu cHkKQEAgLTEwNCw2ICsxMDQsMTEgQEAgY2xhc3MgU2luZ2xlVGVzdFJ1bm5lcjoKICAgICBkZWYg X3J1bl9jb21wYXJlX3Rlc3Qoc2VsZik6CiAgICAgICAgIGRyaXZlcl9vdXRwdXQgPSBzZWxmLl9k cml2ZXIucnVuX3Rlc3Qoc2VsZi5fZHJpdmVyX2lucHV0KCkpCiAgICAgICAgIGV4cGVjdGVkX2Ry aXZlcl9vdXRwdXQgPSBzZWxmLl9leHBlY3RlZF9kcml2ZXJfb3V0cHV0KCkKKworICAgICAgICBp ZiBzZWxmLl9vcHRpb25zLmlnbm9yZV9tZXRyaWNzOgorICAgICAgICAgICAgZXhwZWN0ZWRfZHJp dmVyX291dHB1dC5zdHJpcF9tZXRyaWNzKCkKKyAgICAgICAgICAgIGRyaXZlcl9vdXRwdXQuc3Ry aXBfbWV0cmljcygpCisKICAgICAgICAgdGVzdF9yZXN1bHQgPSBzZWxmLl9jb21wYXJlX291dHB1 dChkcml2ZXJfb3V0cHV0LCBleHBlY3RlZF9kcml2ZXJfb3V0cHV0KQogICAgICAgICBpZiBzZWxm Ll9vcHRpb25zLm5ld190ZXN0X3Jlc3VsdHM6CiAgICAgICAgICAgICBzZWxmLl9hZGRfbWlzc2lu Z19iYXNlbGluZXModGVzdF9yZXN1bHQsIGRyaXZlcl9vdXRwdXQpCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlci5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJpdmVyLnB5CmluZGV4IDkzMTI1YmUu LjE4NDAzZTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvZHJpdmVyLnB5CkBAIC0yNiw2ICsyNiw3IEBACiAjIChJTkNMVURJTkcgTkVHTElHRU5D RSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgogCitpbXBvcnQgcmUKIGltcG9ydCBzaGxleAogCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi5zeXN0ZW0gaW1wb3J0IHBhdGgKQEAgLTQyLDYgKzQzLDggQEAgY2xhc3MgRHJpdmVySW5wdXQo b2JqZWN0KToKIGNsYXNzIERyaXZlck91dHB1dChvYmplY3QpOgogICAgICIiIkdyb3VwcyBpbmZv cm1hdGlvbiBhYm91dCBhIG91dHB1dCBmcm9tIGRyaXZlciBmb3IgZWFzeSBwYXNzaW5nIG9mIGRh dGEuIiIiCiAKKyAgICBzdHJpcF9wYXR0ZXJucyA9IFtdCisKICAgICBkZWYgX19pbml0X18oc2Vs ZiwgdGV4dCwgaW1hZ2UsIGltYWdlX2hhc2gsIGF1ZGlvLCBjcmFzaD1GYWxzZSwKICAgICAgICAg ICAgIHRlc3RfdGltZT0wLCB0aW1lb3V0PUZhbHNlLCBlcnJvcj0nJywgY3Jhc2hlZF9wcm9jZXNz X25hbWU9Tm9uZSk6CiAgICAgICAgICMgRklYTUU6IEFyZ3MgY291bGQgYmUgcmVuYW1lZCB0byBi ZXR0ZXIgY2xhcmlmeSB3aGF0IHRoZXkgZG8uCkBAIC01OSw2ICs2MiwyOSBAQCBjbGFzcyBEcml2 ZXJPdXRwdXQob2JqZWN0KToKICAgICBkZWYgaGFzX3N0ZGVycihzZWxmKToKICAgICAgICAgcmV0 dXJuIGJvb2woc2VsZi5lcnJvcikKIAorICAgIGRlZiBzdHJpcF9tZXRyaWNzKHNlbGYpOgorICAg ICAgICBzdHJpcF9wYXR0ZXJucyA9IHNlbGYuX19jbGFzc19fLnN0cmlwX3BhdHRlcm5zCisgICAg ICAgIGlmIHN0cmlwX3BhdHRlcm5zID09IFtdOgorICAgICAgICAgICAgc3RyaXBfcGF0dGVybnMu YXBwZW5kKChyZS5jb21waWxlKCdhdCBcKC0/WzAtOV0rLC0/WzAtOV0rXCkgKicpLCAnJykpCisg ICAgICAgICAgICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ3NpemUgLT9bMC05 XSt4LT9bMC05XSsgKicpLCAnJykpCisgICAgICAgICAgICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQo KHJlLmNvbXBpbGUoJ3RleHQgcnVuIHdpZHRoIC0/WzAtOV0rOiAnKSwgJycpKQorICAgICAgICAg ICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCd0ZXh0IHJ1biB3aWR0aCAtP1sw LTldKyBbYS16QS1aIF0rOiAnKSwgJycpKQorICAgICAgICAgICAgc3RyaXBfcGF0dGVybnMuYXBw ZW5kKChyZS5jb21waWxlKCdSZW5kZXJCdXR0b24ge0JVVFRPTn0gLionKSwgJ1JlbmRlckJ1dHRv biB7QlVUVE9OfScpKQorICAgICAgICAgICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21w aWxlKCdSZW5kZXJJbWFnZSB7SU5QVVR9IC4qJyksICdSZW5kZXJJbWFnZSB7SU5QVVR9JykpCisg ICAgICAgICAgICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ1JlbmRlckJsb2Nr IHtJTlBVVH0gLionKSwgJ1JlbmRlckJsb2NrIHtJTlBVVH0nKSkKKyAgICAgICAgICAgIHN0cmlw X3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnUmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfSAu KicpLCAnUmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfScpKQorICAgICAgICAgICAgc3RyaXBfcGF0 dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdcKFswLTldK3B4JyksICdweCcpKQorICAgICAgICAg ICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCcgKiIgKlxuICsiIConKSwgJyAn KSkKKyAgICAgICAgICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnIiArJCcp LCAnIicpKQorICAgICAgICAgICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCct ICcpLCAnLScpKQorICAgICAgICAgICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxl KCdcbiggKikiXHMrJyksIHInXG5cMSInKSkKKyAgICAgICAgICAgIHN0cmlwX3BhdHRlcm5zLmFw cGVuZCgocmUuY29tcGlsZSgnXHMrIlxuJyksICciXG4nKSkKKyAgICAgICAgICAgIHN0cmlwX3Bh dHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnc2Nyb2xsV2lkdGggWzAtOV0rJyksICdzY3JvbGxX aWR0aCcpKQorICAgICAgICAgICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdz Y3JvbGxIZWlnaHQgWzAtOV0rJyksICdzY3JvbGxIZWlnaHQnKSkKKworICAgICAgICBmb3IgcGF0 dGVybiBpbiBzdHJpcF9wYXR0ZXJuczoKKyAgICAgICAgICAgIHNlbGYudGV4dCA9IHJlLnN1Yihw YXR0ZXJuWzBdLCBwYXR0ZXJuWzFdLCBzZWxmLnRleHQpCisKIAogY2xhc3MgRHJpdmVyKG9iamVj dCk6CiAgICAgIiIiQWJzdHJhY3QgaW50ZXJmYWNlIGZvciB0aGUgRHVtcFJlbmRlclRyZWUgaW50 ZXJmYWNlLiIiIgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9kcml2ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2RyaXZlcl91bml0dGVzdC5weQppbmRleCBmMmVjMWFhLi5kNWJlZGQ2IDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZl cl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2RyaXZlcl91bml0dGVzdC5weQpAQCAtMzQsNiArMzQsNDYgQEAgZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLnN5c3RlbWhvc3RfbW9jayBpbXBvcnQgTW9ja1N5c3RlbUhvc3QKIAogZnJv bSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgUG9ydCwgRHJpdmVyLCBEcml2ZXJP dXRwdXQKIAorY2xhc3MgRHJpdmVyT3V0cHV0VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CisgICAg ZGVmIHRlc3Rfc3RyaXBfbWV0cmljcyhzZWxmKToKKyAgICAgICAgcGF0dGVybnMgPSBbCisgICAg ICAgICAgICAoJ1JlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwJywgJ1JlbmRlclZpZXcg JyksCisgICAgICAgICAgICAoJ3RleHQgcnVuIGF0ICgwLDApIHdpZHRoIDEwMDogInNvbWUgdGV4 dCInLCAnInNvbWUgdGV4dCInKSwKKyAgICAgICAgICAgICgnUmVuZGVyQmxvY2sge0hUTUx9IGF0 ICgwLDApIHNpemUgODAweDYwMCcsICdSZW5kZXJCbG9jayB7SFRNTH0gJyksCisgICAgICAgICAg ICAoJ1JlbmRlckJsb2NrIHtJTlBVVH0gYXQgKDI5LDMpIHNpemUgMTJ4MTIgW2NvbG9yPSMwMDAw MDBdJywgJ1JlbmRlckJsb2NrIHtJTlBVVH0nKSwKKworICAgICAgICAgICAgKCdSZW5kZXJCbG9j ayAoZmxvYXRpbmcpIHtEVH0gYXQgKDUsNSkgc2l6ZSA3OXgzMTAgW2JvcmRlcjogKDVweCBzb2xp ZCAjMDAwMDAwKV0nLAorICAgICAgICAgICAgJ1JlbmRlckJsb2NrIChmbG9hdGluZykge0RUfSBb Ym9yZGVyOiBweCBzb2xpZCAjMDAwMDAwKV0nKSwKKworICAgICAgICAgICAgKCdcbiAgICAidHJ1 bmNhdGUgdGV4dCAgICAiXG4nLCAnXG4gICAgInRydW5jYXRlIHRleHQiXG4nKSwKKworICAgICAg ICAgICAgKCdSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMykgc2l6ZSA0MXgxMlxuICAgIHRleHQg cnVuIGF0ICgwLDMpIHdpZHRoIDQxOiAid2hpbXBlciAiXG4nLAorICAgICAgICAgICAgJ1JlbmRl clRleHQgeyN0ZXh0fSBcbiAgICAid2hpbXBlciJcbicpLAorCisgICAgICAgICAgICAoJ3RleHQg cnVuIGF0ICgwLDApIHdpZHRoIDEwOTogIi5vbmUge2NvbG9yOiBncmVlbjt9IlxuXAorICAgICAg ICAgIHRleHQgcnVuIGF0ICgxMDksMCkgd2lkdGggMDogIiAiXG5cCisgICAgICAgICAgdGV4dCBy dW4gYXQgKDAsMTcpIHdpZHRoIDgxOiAiLjEge2NvbG9yOiByZWQ7fSJcblwKKyAgICAgICAgICB0 ZXh0IHJ1biBhdCAoODEsMTcpIHdpZHRoIDA6ICIgIlxuXAorICAgICAgICAgIHRleHQgcnVuIGF0 ICgwLDM0KSB3aWR0aCAxMDI6ICIuYTEge2NvbG9yOiBncmVlbjt9IlxuXAorICAgICAgICAgIHRl eHQgcnVuIGF0ICgxMDIsMzQpIHdpZHRoIDA6ICIgIlxuXAorICAgICAgICAgIHRleHQgcnVuIGF0 ICgwLDUxKSB3aWR0aCAxMjA6ICJQLnR3byB7Y29sb3I6IHB1cnBsZTt9IlxuXAorICAgICAgICAg IHRleHQgcnVuIGF0ICgxMjAsNTEpIHdpZHRoIDA6ICIgIlxuJywKKyAgICAgICAgICAgICciLm9u ZSB7Y29sb3I6IGdyZWVuO30gIC4xIHtjb2xvcjogcmVkO30gIC5hMSB7Y29sb3I6IGdyZWVuO30g IFAudHdvIHtjb2xvcjogcHVycGxlO30iXG4nKSwKKworICAgICAgICAgICAgKCd0ZXh0LS0gb3Ro ZXIgdGV4dCcsICd0ZXh0LS1vdGhlciB0ZXh0JyksCisKKyAgICAgICAgICAgICgnInRydW5jYXRl IHRyYWlsaW5nIHNwYWNlcyBhdCBlbmQgb2YgbGluZSBhZnRlciB0ZXh0IiAgIFxuJywKKyAgICAg ICAgICAgICcidHJ1bmNhdGUgdHJhaWxpbmcgc3BhY2VzIGF0IGVuZCBvZiBsaW5lIGFmdGVyIHRl eHQiXG4nKSwKKworICAgICAgICAgICAgKHInc2Nyb2xsV2lkdGggMTIwJywgcidzY3JvbGxXaWR0 aCcpLAorICAgICAgICAgICAgKHInc2Nyb2xsSGVpZ2h0IDEyMCcsIHInc2Nyb2xsSGVpZ2h0JykK KyAgICAgICAgXQorCisgICAgICAgIGZvciBwYXR0ZXJuIGluIHBhdHRlcm5zOgorICAgICAgICAg ICAgZHJpdmVyX291dHB1dCA9IERyaXZlck91dHB1dChwYXR0ZXJuWzBdLCBOb25lLCBOb25lLCBO b25lKQorICAgICAgICAgICAgZHJpdmVyX291dHB1dC5zdHJpcF9tZXRyaWNzKCkKKyAgICAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoZHJpdmVyX291dHB1dC50ZXh0LCBwYXR0ZXJuWzFdKQorCiAK IGNsYXNzIERyaXZlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBtYWtlX3BvcnQo c2VsZik6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9y dW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCA5YjQ4NTU3Li5iNTc0ZTE4IDEwMDc1NQotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMu cHkKQEAgLTEzNyw2ICsxMzcsOSBAQCBkZWYgX3NldF91cF9kZXJpdmVkX29wdGlvbnMocG9ydCwg b3B0aW9ucyk6CiAgICAgICAgIHdhcm5pbmdzLmFwcGVuZCgiLS1uby1odHRwIGlzIGlnbm9yZWQg c2luY2UgLS1mb3JjZSBpcyBhbHNvIHByb3ZpZGVkIikKICAgICAgICAgb3B0aW9ucy5odHRwID0g VHJ1ZQogCisgICAgaWYgb3B0aW9ucy5pZ25vcmVfbWV0cmljcyBhbmQgKG9wdGlvbnMubmV3X2Jh c2VsaW5lIG9yIG9wdGlvbnMucmVzZXRfcmVzdWx0cyk6CisgICAgICAgIHdhcm5pbmdzLmFwcGVu ZCgiLS1pZ25vcmUtbWV0cmljcyBoYXMgbm8gZWZmZWN0IHdpdGggLS1uZXctYmFzZWxpbmVzIG9y IHdpdGggLS1yZXNldC1yZXN1bHRzIikKKwogICAgIHJldHVybiB3YXJuaW5ncwogCiAKQEAgLTMw NSw2ICszMDgsOSBAQCBkZWYgcGFyc2VfYXJncyhhcmdzPU5vbmUpOgogICAgICAgICAgICAgZGVm YXVsdD1UcnVlLCBoZWxwPSJSdW4gSFRUUCBhbmQgV2ViU29ja2V0IHRlc3RzIChkZWZhdWx0KSIp LAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1uby1odHRwIiwgYWN0aW9uPSJzdG9y ZV9mYWxzZSIsIGRlc3Q9Imh0dHAiLAogICAgICAgICAgICAgaGVscD0iRG9uJ3QgcnVuIEhUVFAg YW5kIFdlYlNvY2tldCB0ZXN0cyIpLAorICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1p Z25vcmUtbWV0cmljcyIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9Imlnbm9yZV9tZXRyaWNz IiwKKyAgICAgICAgICAgIGRlZmF1bHQ9RmFsc2UsIGhlbHA9Iklnbm9yZSByZW5kZXJpbmcgbWV0 cmljcyByZWxhdGVkIGluZm9ybWF0aW9uIGZyb20gdGVzdCAiCisgICAgICAgICAgICAib3V0cHV0 LCBvbmx5IGNvbXBhcmUgdGhlIHN0cnVjdHVyZSBvZiB0aGUgcmVuZGVydHJlZS4iKQogICAgIF0K IAogICAgIHRlc3Rfb3B0aW9ucyA9IFsK 122434 2012-01-13 08:54:29 -0800 2012-01-16 09:48:50 -0800 fixed style bug-76278-20120113175427.patch text/plain 8591 kbalazs U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0OTQxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODdkYzBlNTQ2ZDNlZWVhYjk1MTkyOGE3NjhlOThjOTkw YjRkNDNlMi4uY2M0YzNiOTFmMmY3NTYyYjZkODEwNzA2YjlkZjhhMGRmMDFkZDA4MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTAxLTEzICBCYWxhenMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKwor ICAgICAgICBbTlJXVF0gU3VwcG9ydCAtLWlnbm9yZS1tZXRyaWNzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjI3OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBvcnQgdGhlIGZlYXR1cmUgZnJvbSBPUldU LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv c2luZ2xlX3Rlc3RfcnVubmVyLnB5OgorICAgICAgICAoU2luZ2xlVGVzdFJ1bm5lci5fcnVuX2Nv bXBhcmVfdGVzdCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9kcml2ZXIucHk6CisgICAgICAgIChEcml2ZXJPdXRwdXQpOgorICAgICAgICAoRHJpdmVyT3V0 cHV0LnN0cmlwX21ldHJpY3MpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoRHJpdmVyT3V0cHV0VGVzdCk6 CisgICAgICAgIChEcml2ZXJPdXRwdXRUZXN0LnRlc3Rfc3RyaXBfbWV0cmljcyk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAg ICAgICAgKF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKToKKyAgICAgICAgKHBhcnNlX2FyZ3MpOgor CiAyMDEyLTAxLTEzICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAg ICAgICAgW1F0XVtXSzJdUkVHUkVTU0lPTihyMTA0ODgxKTpJdCBicm9rZSBodW5kcmVkcyBvZiB0 ZXN0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CmluZGV4IGFmNGIy ZDkyZWNlN2E0ZjQ5OGVjMWJkM2Q2MjU5ODZmOWQ5YWRiZDguLjc5MWZiNjIxMzkzZDU1ZjU2Mzhh Mjc3YWQ1NDVjNjkxOWVjOGJjZTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9y dW5uZXIucHkKQEAgLTEwNCw2ICsxMDQsMTEgQEAgY2xhc3MgU2luZ2xlVGVzdFJ1bm5lcjoKICAg ICBkZWYgX3J1bl9jb21wYXJlX3Rlc3Qoc2VsZik6CiAgICAgICAgIGRyaXZlcl9vdXRwdXQgPSBz ZWxmLl9kcml2ZXIucnVuX3Rlc3Qoc2VsZi5fZHJpdmVyX2lucHV0KCkpCiAgICAgICAgIGV4cGVj dGVkX2RyaXZlcl9vdXRwdXQgPSBzZWxmLl9leHBlY3RlZF9kcml2ZXJfb3V0cHV0KCkKKworICAg ICAgICBpZiBzZWxmLl9vcHRpb25zLmlnbm9yZV9tZXRyaWNzOgorICAgICAgICAgICAgZXhwZWN0 ZWRfZHJpdmVyX291dHB1dC5zdHJpcF9tZXRyaWNzKCkKKyAgICAgICAgICAgIGRyaXZlcl9vdXRw dXQuc3RyaXBfbWV0cmljcygpCisKICAgICAgICAgdGVzdF9yZXN1bHQgPSBzZWxmLl9jb21wYXJl X291dHB1dChkcml2ZXJfb3V0cHV0LCBleHBlY3RlZF9kcml2ZXJfb3V0cHV0KQogICAgICAgICBp ZiBzZWxmLl9vcHRpb25zLm5ld190ZXN0X3Jlc3VsdHM6CiAgICAgICAgICAgICBzZWxmLl9hZGRf bWlzc2luZ19iYXNlbGluZXModGVzdF9yZXN1bHQsIGRyaXZlcl9vdXRwdXQpCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlci5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJpdmVyLnB5CmluZGV4IDkz MTI1YmVjMjMxYjFkM2I1ZmY1NWIyYzRiY2FmYjczMDMzNDNhMzYuLjE4NDAzZThiYzgxMTNiYTE5 NmEwZTk5OGUwY2U3MjBlNDY4MDIwZDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJpdmVyLnB5CkBAIC0yNiw2ICsyNiw3IEBACiAjIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0Yg VEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCitpbXBvcnQgcmUKIGltcG9ydCBzaGxleAogCiBmcm9t IHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IHBhdGgKQEAgLTQyLDYgKzQzLDggQEAgY2xh c3MgRHJpdmVySW5wdXQob2JqZWN0KToKIGNsYXNzIERyaXZlck91dHB1dChvYmplY3QpOgogICAg ICIiIkdyb3VwcyBpbmZvcm1hdGlvbiBhYm91dCBhIG91dHB1dCBmcm9tIGRyaXZlciBmb3IgZWFz eSBwYXNzaW5nIG9mIGRhdGEuIiIiCiAKKyAgICBzdHJpcF9wYXR0ZXJucyA9IFtdCisKICAgICBk ZWYgX19pbml0X18oc2VsZiwgdGV4dCwgaW1hZ2UsIGltYWdlX2hhc2gsIGF1ZGlvLCBjcmFzaD1G YWxzZSwKICAgICAgICAgICAgIHRlc3RfdGltZT0wLCB0aW1lb3V0PUZhbHNlLCBlcnJvcj0nJywg Y3Jhc2hlZF9wcm9jZXNzX25hbWU9Tm9uZSk6CiAgICAgICAgICMgRklYTUU6IEFyZ3MgY291bGQg YmUgcmVuYW1lZCB0byBiZXR0ZXIgY2xhcmlmeSB3aGF0IHRoZXkgZG8uCkBAIC01OSw2ICs2Miwy OSBAQCBjbGFzcyBEcml2ZXJPdXRwdXQob2JqZWN0KToKICAgICBkZWYgaGFzX3N0ZGVycihzZWxm KToKICAgICAgICAgcmV0dXJuIGJvb2woc2VsZi5lcnJvcikKIAorICAgIGRlZiBzdHJpcF9tZXRy aWNzKHNlbGYpOgorICAgICAgICBzdHJpcF9wYXR0ZXJucyA9IHNlbGYuX19jbGFzc19fLnN0cmlw X3BhdHRlcm5zCisgICAgICAgIGlmIHN0cmlwX3BhdHRlcm5zID09IFtdOgorICAgICAgICAgICAg c3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdhdCBcKC0/WzAtOV0rLC0/WzAtOV0r XCkgKicpLCAnJykpCisgICAgICAgICAgICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBp bGUoJ3NpemUgLT9bMC05XSt4LT9bMC05XSsgKicpLCAnJykpCisgICAgICAgICAgICBzdHJpcF9w YXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ3RleHQgcnVuIHdpZHRoIC0/WzAtOV0rOiAnKSwg JycpKQorICAgICAgICAgICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCd0ZXh0 IHJ1biB3aWR0aCAtP1swLTldKyBbYS16QS1aIF0rOiAnKSwgJycpKQorICAgICAgICAgICAgc3Ry aXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdSZW5kZXJCdXR0b24ge0JVVFRPTn0gLion KSwgJ1JlbmRlckJ1dHRvbiB7QlVUVE9OfScpKQorICAgICAgICAgICAgc3RyaXBfcGF0dGVybnMu YXBwZW5kKChyZS5jb21waWxlKCdSZW5kZXJJbWFnZSB7SU5QVVR9IC4qJyksICdSZW5kZXJJbWFn ZSB7SU5QVVR9JykpCisgICAgICAgICAgICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBp bGUoJ1JlbmRlckJsb2NrIHtJTlBVVH0gLionKSwgJ1JlbmRlckJsb2NrIHtJTlBVVH0nKSkKKyAg ICAgICAgICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnUmVuZGVyVGV4dENv bnRyb2wge0lOUFVUfSAuKicpLCAnUmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfScpKQorICAgICAg ICAgICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdcKFswLTldK3B4JyksICdw eCcpKQorICAgICAgICAgICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCcgKiIg KlxuICsiIConKSwgJyAnKSkKKyAgICAgICAgICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUu Y29tcGlsZSgnIiArJCcpLCAnIicpKQorICAgICAgICAgICAgc3RyaXBfcGF0dGVybnMuYXBwZW5k KChyZS5jb21waWxlKCctICcpLCAnLScpKQorICAgICAgICAgICAgc3RyaXBfcGF0dGVybnMuYXBw ZW5kKChyZS5jb21waWxlKCdcbiggKikiXHMrJyksIHInXG5cMSInKSkKKyAgICAgICAgICAgIHN0 cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnXHMrIlxuJyksICciXG4nKSkKKyAgICAg ICAgICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnc2Nyb2xsV2lkdGggWzAt OV0rJyksICdzY3JvbGxXaWR0aCcpKQorICAgICAgICAgICAgc3RyaXBfcGF0dGVybnMuYXBwZW5k KChyZS5jb21waWxlKCdzY3JvbGxIZWlnaHQgWzAtOV0rJyksICdzY3JvbGxIZWlnaHQnKSkKKwor ICAgICAgICBmb3IgcGF0dGVybiBpbiBzdHJpcF9wYXR0ZXJuczoKKyAgICAgICAgICAgIHNlbGYu dGV4dCA9IHJlLnN1YihwYXR0ZXJuWzBdLCBwYXR0ZXJuWzFdLCBzZWxmLnRleHQpCisKIAogY2xh c3MgRHJpdmVyKG9iamVjdCk6CiAgICAgIiIiQWJzdHJhY3QgaW50ZXJmYWNlIGZvciB0aGUgRHVt cFJlbmRlclRyZWUgaW50ZXJmYWNlLiIiIgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcml2ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlcl91bml0dGVzdC5weQppbmRleCBmMmVj MWFhZjBhNDY0NDE3MzBhOGE4MjgxNTg0ZjE3NWMxNWMxZWJmLi4xZDIzN2I3YjkzZDBhNzg0OTM3 YTE2NDJjN2M0ZmMxNzc0YTA3OWM0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlcl91bml0dGVzdC5weQpAQCAtMzUsNiAr MzUsNDcgQEAgZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnN5c3RlbWhvc3RfbW9jayBpbXBv cnQgTW9ja1N5c3RlbUhvc3QKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0 IFBvcnQsIERyaXZlciwgRHJpdmVyT3V0cHV0CiAKIAorY2xhc3MgRHJpdmVyT3V0cHV0VGVzdCh1 bml0dGVzdC5UZXN0Q2FzZSk6CisgICAgZGVmIHRlc3Rfc3RyaXBfbWV0cmljcyhzZWxmKToKKyAg ICAgICAgcGF0dGVybnMgPSBbCisgICAgICAgICAgICAoJ1JlbmRlclZpZXcgYXQgKDAsMCkgc2l6 ZSA4MDB4NjAwJywgJ1JlbmRlclZpZXcgJyksCisgICAgICAgICAgICAoJ3RleHQgcnVuIGF0ICgw LDApIHdpZHRoIDEwMDogInNvbWUgdGV4dCInLCAnInNvbWUgdGV4dCInKSwKKyAgICAgICAgICAg ICgnUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDYwMCcsICdSZW5kZXJCbG9j ayB7SFRNTH0gJyksCisgICAgICAgICAgICAoJ1JlbmRlckJsb2NrIHtJTlBVVH0gYXQgKDI5LDMp IHNpemUgMTJ4MTIgW2NvbG9yPSMwMDAwMDBdJywgJ1JlbmRlckJsb2NrIHtJTlBVVH0nKSwKKwor ICAgICAgICAgICAgKCdSZW5kZXJCbG9jayAoZmxvYXRpbmcpIHtEVH0gYXQgKDUsNSkgc2l6ZSA3 OXgzMTAgW2JvcmRlcjogKDVweCBzb2xpZCAjMDAwMDAwKV0nLAorICAgICAgICAgICAgJ1JlbmRl ckJsb2NrIChmbG9hdGluZykge0RUfSBbYm9yZGVyOiBweCBzb2xpZCAjMDAwMDAwKV0nKSwKKwor ICAgICAgICAgICAgKCdcbiAgICAidHJ1bmNhdGUgdGV4dCAgICAiXG4nLCAnXG4gICAgInRydW5j YXRlIHRleHQiXG4nKSwKKworICAgICAgICAgICAgKCdSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAs Mykgc2l6ZSA0MXgxMlxuICAgIHRleHQgcnVuIGF0ICgwLDMpIHdpZHRoIDQxOiAid2hpbXBlciAi XG4nLAorICAgICAgICAgICAgJ1JlbmRlclRleHQgeyN0ZXh0fSBcbiAgICAid2hpbXBlciJcbicp LAorCisgICAgICAgICAgICAoJ3RleHQgcnVuIGF0ICgwLDApIHdpZHRoIDEwOTogIi5vbmUge2Nv bG9yOiBncmVlbjt9IlxuXAorICAgICAgICAgIHRleHQgcnVuIGF0ICgxMDksMCkgd2lkdGggMDog IiAiXG5cCisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTcpIHdpZHRoIDgxOiAiLjEge2NvbG9y OiByZWQ7fSJcblwKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoODEsMTcpIHdpZHRoIDA6ICIgIlxu XAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDM0KSB3aWR0aCAxMDI6ICIuYTEge2NvbG9yOiBn cmVlbjt9IlxuXAorICAgICAgICAgIHRleHQgcnVuIGF0ICgxMDIsMzQpIHdpZHRoIDA6ICIgIlxu XAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDUxKSB3aWR0aCAxMjA6ICJQLnR3byB7Y29sb3I6 IHB1cnBsZTt9IlxuXAorICAgICAgICAgIHRleHQgcnVuIGF0ICgxMjAsNTEpIHdpZHRoIDA6ICIg IlxuJywKKyAgICAgICAgICAgICciLm9uZSB7Y29sb3I6IGdyZWVuO30gIC4xIHtjb2xvcjogcmVk O30gIC5hMSB7Y29sb3I6IGdyZWVuO30gIFAudHdvIHtjb2xvcjogcHVycGxlO30iXG4nKSwKKwor ICAgICAgICAgICAgKCd0ZXh0LS0gb3RoZXIgdGV4dCcsICd0ZXh0LS1vdGhlciB0ZXh0JyksCisK KyAgICAgICAgICAgICgnInRydW5jYXRlIHRyYWlsaW5nIHNwYWNlcyBhdCBlbmQgb2YgbGluZSBh ZnRlciB0ZXh0IiAgIFxuJywKKyAgICAgICAgICAgICcidHJ1bmNhdGUgdHJhaWxpbmcgc3BhY2Vz IGF0IGVuZCBvZiBsaW5lIGFmdGVyIHRleHQiXG4nKSwKKworICAgICAgICAgICAgKHInc2Nyb2xs V2lkdGggMTIwJywgcidzY3JvbGxXaWR0aCcpLAorICAgICAgICAgICAgKHInc2Nyb2xsSGVpZ2h0 IDEyMCcsIHInc2Nyb2xsSGVpZ2h0JyksCisgICAgICAgIF0KKworICAgICAgICBmb3IgcGF0dGVy biBpbiBwYXR0ZXJuczoKKyAgICAgICAgICAgIGRyaXZlcl9vdXRwdXQgPSBEcml2ZXJPdXRwdXQo cGF0dGVyblswXSwgTm9uZSwgTm9uZSwgTm9uZSkKKyAgICAgICAgICAgIGRyaXZlcl9vdXRwdXQu c3RyaXBfbWV0cmljcygpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGRyaXZlcl9vdXRw dXQudGV4dCwgcGF0dGVyblsxXSkKKworCiBjbGFzcyBEcml2ZXJUZXN0KHVuaXR0ZXN0LlRlc3RD YXNlKToKICAgICBkZWYgbWFrZV9wb3J0KHNlbGYpOgogICAgICAgICByZXR1cm4gUG9ydChNb2Nr U3lzdGVtSG9zdCgpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggOWI0ODU1NzQ4NTc3NTFiN2UwMTM3MzU0 NDgyZGJjMWIzNDI5N2M1ZC4uNDgzY2QwN2MyY2RjYmNlOWNjOTA4NDk4NmVhZDdiMTc5OGI0MTNh YyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dl YmtpdF90ZXN0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9y dW5fd2Via2l0X3Rlc3RzLnB5CkBAIC0xMzcsNiArMTM3LDkgQEAgZGVmIF9zZXRfdXBfZGVyaXZl ZF9vcHRpb25zKHBvcnQsIG9wdGlvbnMpOgogICAgICAgICB3YXJuaW5ncy5hcHBlbmQoIi0tbm8t aHR0cCBpcyBpZ25vcmVkIHNpbmNlIC0tZm9yY2UgaXMgYWxzbyBwcm92aWRlZCIpCiAgICAgICAg IG9wdGlvbnMuaHR0cCA9IFRydWUKIAorICAgIGlmIG9wdGlvbnMuaWdub3JlX21ldHJpY3MgYW5k IChvcHRpb25zLm5ld19iYXNlbGluZSBvciBvcHRpb25zLnJlc2V0X3Jlc3VsdHMpOgorICAgICAg ICB3YXJuaW5ncy5hcHBlbmQoIi0taWdub3JlLW1ldHJpY3MgaGFzIG5vIGVmZmVjdCB3aXRoIC0t bmV3LWJhc2VsaW5lcyBvciB3aXRoIC0tcmVzZXQtcmVzdWx0cyIpCisKICAgICByZXR1cm4gd2Fy bmluZ3MKIAogCkBAIC0zMDUsNiArMzA4LDkgQEAgZGVmIHBhcnNlX2FyZ3MoYXJncz1Ob25lKToK ICAgICAgICAgICAgIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iUnVuIEhUVFAgYW5kIFdlYlNvY2tldCB0 ZXN0cyAoZGVmYXVsdCkiKSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tbm8taHR0 cCIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJodHRwIiwKICAgICAgICAgICAgIGhlbHA9 IkRvbid0IHJ1biBIVFRQIGFuZCBXZWJTb2NrZXQgdGVzdHMiKSwKKyAgICAgICAgb3B0cGFyc2Uu bWFrZV9vcHRpb24oIi0taWdub3JlLW1ldHJpY3MiLCBhY3Rpb249InN0b3JlX3RydWUiLCBkZXN0 PSJpZ25vcmVfbWV0cmljcyIsCisgICAgICAgICAgICBkZWZhdWx0PUZhbHNlLCBoZWxwPSJJZ25v cmUgcmVuZGVyaW5nIG1ldHJpY3MgcmVsYXRlZCBpbmZvcm1hdGlvbiBmcm9tIHRlc3QgIgorICAg ICAgICAgICAgIm91dHB1dCwgb25seSBjb21wYXJlIHRoZSBzdHJ1Y3R1cmUgb2YgdGhlIHJlbmRl cnRyZWUuIiksCiAgICAgXQogCiAgICAgdGVzdF9vcHRpb25zID0gWwo= 122655 2012-01-16 09:48:57 -0800 2012-01-17 02:11:42 -0800 Patch bug-76278-20120116184856.patch text/plain 8434 kbalazs U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MDcwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjFiYjJjNGNlZGQ1ZWZhMjg1ZGQxYzY1MzEyYzg5ODIw YjlhMTZmYS4uNzU1MTcxZjViNTY3N2I0MzVjODE3OWFhMzdkYzZjNDY3OTBmNTAyZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTAxLTE2ICBCYWxhenMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKwor ICAgICAgICBbTlJXVF0gU3VwcG9ydCAtLWlnbm9yZS1tZXRyaWNzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjI3OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBvcnQgdGhlIGZlYXR1cmUgZnJvbSBPUldU LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv c2luZ2xlX3Rlc3RfcnVubmVyLnB5OgorICAgICAgICAoU2luZ2xlVGVzdFJ1bm5lci5fcnVuX2Nv bXBhcmVfdGVzdCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9kcml2ZXIucHk6CisgICAgICAgIChEcml2ZXJPdXRwdXQpOgorICAgICAgICAoRHJpdmVyT3V0 cHV0LnN0cmlwX21ldHJpY3MpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoRHJpdmVyT3V0cHV0VGVzdCk6 CisgICAgICAgIChEcml2ZXJPdXRwdXRUZXN0LnRlc3Rfc3RyaXBfbWV0cmljcyk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAg ICAgICAgKF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKToKKyAgICAgICAgKHBhcnNlX2FyZ3MpOgor CiAyMDEyLTAxLTE2ICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxrdWJvQHByb2Z1c2lvbi5tb2Jp PgogCiAgICAgICAgIFVucmV2aWV3ZWQ7IGZpeCB0aGUgYnVpbGQgd2hlbiAtLWFzLW5lZWRlZCBh bmQgLS1uby1jb3B5LWR0LW5lZWRlZC1lbnRyaWVzIGFyZSBwYXNzZWQgdG8gdGhlIGxpbmtlci4K ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xs ZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQppbmRleCBhZjRiMmQ5MmVj ZTdhNGY0OThlYzFiZDNkNjI1OTg2ZjlkOWFkYmQ4Li43OTFmYjYyMTM5M2Q1NWY1NjM4YTI3N2Fk NTQ1YzY5MTllYzhiY2UxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVy LnB5CkBAIC0xMDQsNiArMTA0LDExIEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXI6CiAgICAgZGVm IF9ydW5fY29tcGFyZV90ZXN0KHNlbGYpOgogICAgICAgICBkcml2ZXJfb3V0cHV0ID0gc2VsZi5f ZHJpdmVyLnJ1bl90ZXN0KHNlbGYuX2RyaXZlcl9pbnB1dCgpKQogICAgICAgICBleHBlY3RlZF9k cml2ZXJfb3V0cHV0ID0gc2VsZi5fZXhwZWN0ZWRfZHJpdmVyX291dHB1dCgpCisKKyAgICAgICAg aWYgc2VsZi5fb3B0aW9ucy5pZ25vcmVfbWV0cmljczoKKyAgICAgICAgICAgIGV4cGVjdGVkX2Ry aXZlcl9vdXRwdXQuc3RyaXBfbWV0cmljcygpCisgICAgICAgICAgICBkcml2ZXJfb3V0cHV0LnN0 cmlwX21ldHJpY3MoKQorCiAgICAgICAgIHRlc3RfcmVzdWx0ID0gc2VsZi5fY29tcGFyZV9vdXRw dXQoZHJpdmVyX291dHB1dCwgZXhwZWN0ZWRfZHJpdmVyX291dHB1dCkKICAgICAgICAgaWYgc2Vs Zi5fb3B0aW9ucy5uZXdfdGVzdF9yZXN1bHRzOgogICAgICAgICAgICAgc2VsZi5fYWRkX21pc3Np bmdfYmFzZWxpbmVzKHRlc3RfcmVzdWx0LCBkcml2ZXJfb3V0cHV0KQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcml2ZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlci5weQppbmRleCA5MzEyNWJl YzIzMWIxZDNiNWZmNTViMmM0YmNhZmI3MzAzMzQzYTM2Li5hN2U4YmMyOWQ0MGI5MmJkODk0ZDBm MmI3NTczYjI4OWEwNTEwOTE0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2RyaXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2RyaXZlci5weQpAQCAtMjYsNiArMjYsNyBAQAogIyAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KIAoraW1wb3J0IHJlCiBpbXBvcnQgc2hsZXgKIAogZnJvbSB3ZWJr aXRweS5jb21tb24uc3lzdGVtIGltcG9ydCBwYXRoCkBAIC00MCw3ICs0MSwyNSBAQCBjbGFzcyBE cml2ZXJJbnB1dChvYmplY3QpOgogCiAKIGNsYXNzIERyaXZlck91dHB1dChvYmplY3QpOgotICAg ICIiIkdyb3VwcyBpbmZvcm1hdGlvbiBhYm91dCBhIG91dHB1dCBmcm9tIGRyaXZlciBmb3IgZWFz eSBwYXNzaW5nIG9mIGRhdGEuIiIiCisgICAgIiIiR3JvdXBzIGluZm9ybWF0aW9uIGFib3V0IGEg b3V0cHV0IGZyb20gZHJpdmVyIGZvciBlYXN5IHBhc3NpbmcKKyAgICBhbmQgcG9zdC1wcm9jZXNz aW5nIG9mIGRhdGEuIiIiCisKKyAgICBzdHJpcF9wYXR0ZXJucyA9IFtdCisgICAgc3RyaXBfcGF0 dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdhdCBcKC0/WzAtOV0rLC0/WzAtOV0rXCkgKicpLCAn JykpCisgICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdzaXplIC0/WzAtOV0r eC0/WzAtOV0rIConKSwgJycpKQorICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGls ZSgndGV4dCBydW4gd2lkdGggLT9bMC05XSs6ICcpLCAnJykpCisgICAgc3RyaXBfcGF0dGVybnMu YXBwZW5kKChyZS5jb21waWxlKCd0ZXh0IHJ1biB3aWR0aCAtP1swLTldKyBbYS16QS1aIF0rOiAn KSwgJycpKQorICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnUmVuZGVyQnV0 dG9uIHtCVVRUT059IC4qJyksICdSZW5kZXJCdXR0b24ge0JVVFRPTn0nKSkKKyAgICBzdHJpcF9w YXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ1JlbmRlckltYWdlIHtJTlBVVH0gLionKSwgJ1Jl bmRlckltYWdlIHtJTlBVVH0nKSkKKyAgICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBp bGUoJ1JlbmRlckJsb2NrIHtJTlBVVH0gLionKSwgJ1JlbmRlckJsb2NrIHtJTlBVVH0nKSkKKyAg ICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ1JlbmRlclRleHRDb250cm9sIHtJ TlBVVH0gLionKSwgJ1JlbmRlclRleHRDb250cm9sIHtJTlBVVH0nKSkKKyAgICBzdHJpcF9wYXR0 ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ1woWzAtOV0rcHgnKSwgJ3B4JykpCisgICAgc3RyaXBf cGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCcgKiIgKlxuICsiIConKSwgJyAnKSkKKyAgICBz dHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJyIgKyQnKSwgJyInKSkKKyAgICBzdHJp cF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJy0gJyksICctJykpCisgICAgc3RyaXBfcGF0 dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdccysiXG4nKSwgJyJcbicpKQorICAgIHN0cmlwX3Bh dHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnc2Nyb2xsV2lkdGggWzAtOV0rJyksICdzY3JvbGxX aWR0aCcpKQorICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnc2Nyb2xsSGVp Z2h0IFswLTldKycpLCAnc2Nyb2xsSGVpZ2h0JykpCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwg dGV4dCwgaW1hZ2UsIGltYWdlX2hhc2gsIGF1ZGlvLCBjcmFzaD1GYWxzZSwKICAgICAgICAgICAg IHRlc3RfdGltZT0wLCB0aW1lb3V0PUZhbHNlLCBlcnJvcj0nJywgY3Jhc2hlZF9wcm9jZXNzX25h bWU9Tm9uZSk6CkBAIC01OSw2ICs3OCwxMCBAQCBjbGFzcyBEcml2ZXJPdXRwdXQob2JqZWN0KToK ICAgICBkZWYgaGFzX3N0ZGVycihzZWxmKToKICAgICAgICAgcmV0dXJuIGJvb2woc2VsZi5lcnJv cikKIAorICAgIGRlZiBzdHJpcF9tZXRyaWNzKHNlbGYpOgorICAgICAgICBmb3IgcGF0dGVybiBp biBzZWxmLnN0cmlwX3BhdHRlcm5zOgorICAgICAgICAgICAgc2VsZi50ZXh0ID0gcmUuc3ViKHBh dHRlcm5bMF0sIHBhdHRlcm5bMV0sIHNlbGYudGV4dCkKKwogCiBjbGFzcyBEcml2ZXIob2JqZWN0 KToKICAgICAiIiJBYnN0cmFjdCBpbnRlcmZhY2UgZm9yIHRoZSBEdW1wUmVuZGVyVHJlZSBpbnRl cmZhY2UuIiIiCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2RyaXZlcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5CmluZGV4IGYyZWMxYWFmMGE0NjQ0MTczMGE4 YTgyODE1ODRmMTc1YzE1YzFlYmYuLmY1MmZjYzczMTgwMDZkMWFmOGY2N2MwYWVmY2Y2NTJjNWQ1 MGYyYzAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvZHJpdmVyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5CkBAIC0zNSw2ICszNSw0NyBAQCBmcm9tIHdl YmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9zdF9tb2NrIGltcG9ydCBNb2NrU3lzdGVtSG9z dAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgUG9ydCwgRHJpdmVyLCBE cml2ZXJPdXRwdXQKIAogCitjbGFzcyBEcml2ZXJPdXRwdXRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKKyAgICBkZWYgdGVzdF9zdHJpcF9tZXRyaWNzKHNlbGYpOgorICAgICAgICBwYXR0ZXJucyA9 IFsKKyAgICAgICAgICAgICgnUmVuZGVyVmlldyBhdCAoMCwwKSBzaXplIDgwMHg2MDAnLCAnUmVu ZGVyVmlldyAnKSwKKyAgICAgICAgICAgICgndGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMTAwOiAi c29tZSB0ZXh0IicsICcic29tZSB0ZXh0IicpLAorICAgICAgICAgICAgKCdSZW5kZXJCbG9jayB7 SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4NjAwJywgJ1JlbmRlckJsb2NrIHtIVE1MfSAnKSwKKyAg ICAgICAgICAgICgnUmVuZGVyQmxvY2sge0lOUFVUfSBhdCAoMjksMykgc2l6ZSAxMngxMiBbY29s b3I9IzAwMDAwMF0nLCAnUmVuZGVyQmxvY2sge0lOUFVUfScpLAorCisgICAgICAgICAgICAoJ1Jl bmRlckJsb2NrIChmbG9hdGluZykge0RUfSBhdCAoNSw1KSBzaXplIDc5eDMxMCBbYm9yZGVyOiAo NXB4IHNvbGlkICMwMDAwMDApXScsCisgICAgICAgICAgICAnUmVuZGVyQmxvY2sgKGZsb2F0aW5n KSB7RFR9IFtib3JkZXI6IHB4IHNvbGlkICMwMDAwMDApXScpLAorCisgICAgICAgICAgICAoJ1xu ICAgICJ0cnVuY2F0ZSB0ZXh0ICAgICJcbicsICdcbiAgICAidHJ1bmNhdGUgdGV4dCJcbicpLAor CisgICAgICAgICAgICAoJ1JlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwzKSBzaXplIDQxeDEyXG4g ICAgdGV4dCBydW4gYXQgKDAsMykgd2lkdGggNDE6ICJ3aGltcGVyICJcbicsCisgICAgICAgICAg ICAnUmVuZGVyVGV4dCB7I3RleHR9IFxuICAgICJ3aGltcGVyIlxuJyksCisKKyAgICAgICAgICAg ICgndGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMTA5OiAiLm9uZSB7Y29sb3I6IGdyZWVuO30iXG5c CisgICAgICAgICAgdGV4dCBydW4gYXQgKDEwOSwwKSB3aWR0aCAwOiAiICJcblwKKyAgICAgICAg ICB0ZXh0IHJ1biBhdCAoMCwxNykgd2lkdGggODE6ICIuMSB7Y29sb3I6IHJlZDt9IlxuXAorICAg ICAgICAgIHRleHQgcnVuIGF0ICg4MSwxNykgd2lkdGggMDogIiAiXG5cCisgICAgICAgICAgdGV4 dCBydW4gYXQgKDAsMzQpIHdpZHRoIDEwMjogIi5hMSB7Y29sb3I6IGdyZWVuO30iXG5cCisgICAg ICAgICAgdGV4dCBydW4gYXQgKDEwMiwzNCkgd2lkdGggMDogIiAiXG5cCisgICAgICAgICAgdGV4 dCBydW4gYXQgKDAsNTEpIHdpZHRoIDEyMDogIlAudHdvIHtjb2xvcjogcHVycGxlO30iXG5cCisg ICAgICAgICAgdGV4dCBydW4gYXQgKDEyMCw1MSkgd2lkdGggMDogIiAiXG4nLAorICAgICAgICAg ICAgJyIub25lIHtjb2xvcjogZ3JlZW47fSAgLjEge2NvbG9yOiByZWQ7fSAgLmExIHtjb2xvcjog Z3JlZW47fSAgUC50d28ge2NvbG9yOiBwdXJwbGU7fSJcbicpLAorCisgICAgICAgICAgICAoJ3Rl eHQtLSBvdGhlciB0ZXh0JywgJ3RleHQtLW90aGVyIHRleHQnKSwKKworICAgICAgICAgICAgKCcg c29tZSBvdXRwdXQgICAidHJ1bmNhdGUgdHJhaWxpbmcgc3BhY2VzIGF0IGVuZCBvZiBsaW5lIGFm dGVyIHRleHQiICAgXG4nLAorICAgICAgICAgICAgJyBzb21lIG91dHB1dCAgICJ0cnVuY2F0ZSB0 cmFpbGluZyBzcGFjZXMgYXQgZW5kIG9mIGxpbmUgYWZ0ZXIgdGV4dCJcbicpLAorCisgICAgICAg ICAgICAocidzY3JvbGxXaWR0aCAxMjAnLCByJ3Njcm9sbFdpZHRoJyksCisgICAgICAgICAgICAo cidzY3JvbGxIZWlnaHQgMTIwJywgcidzY3JvbGxIZWlnaHQnKSwKKyAgICAgICAgXQorCisgICAg ICAgIGZvciBwYXR0ZXJuIGluIHBhdHRlcm5zOgorICAgICAgICAgICAgZHJpdmVyX291dHB1dCA9 IERyaXZlck91dHB1dChwYXR0ZXJuWzBdLCBOb25lLCBOb25lLCBOb25lKQorICAgICAgICAgICAg ZHJpdmVyX291dHB1dC5zdHJpcF9tZXRyaWNzKCkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoZHJpdmVyX291dHB1dC50ZXh0LCBwYXR0ZXJuWzFdKQorCisKIGNsYXNzIERyaXZlclRlc3Qo dW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBtYWtlX3BvcnQoc2VsZik6CiAgICAgICAgIHJl dHVybiBQb3J0KE1vY2tTeXN0ZW1Ib3N0KCkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCBiNjA2OGI2ZTAy NzY1NWU0YzIzZGRiOGU0NTgzOTI0ODEyZDJiOThhLi44NjJmNDdjMzM4NzcyYzEwMWUyMGMxNTI0 MTlkYzFmYWZjMTY1MGZlIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKQEAgLTEzNyw2ICsxMzcsOSBAQCBkZWYg X3NldF91cF9kZXJpdmVkX29wdGlvbnMocG9ydCwgb3B0aW9ucyk6CiAgICAgICAgIHdhcm5pbmdz LmFwcGVuZCgiLS1uby1odHRwIGlzIGlnbm9yZWQgc2luY2UgLS1mb3JjZSBpcyBhbHNvIHByb3Zp ZGVkIikKICAgICAgICAgb3B0aW9ucy5odHRwID0gVHJ1ZQogCisgICAgaWYgb3B0aW9ucy5pZ25v cmVfbWV0cmljcyBhbmQgKG9wdGlvbnMubmV3X2Jhc2VsaW5lIG9yIG9wdGlvbnMucmVzZXRfcmVz dWx0cyk6CisgICAgICAgIHdhcm5pbmdzLmFwcGVuZCgiLS1pZ25vcmUtbWV0cmljcyBoYXMgbm8g ZWZmZWN0IHdpdGggLS1uZXctYmFzZWxpbmVzIG9yIHdpdGggLS1yZXNldC1yZXN1bHRzIikKKwog ICAgIHJldHVybiB3YXJuaW5ncwogCiAKQEAgLTMwNSw2ICszMDgsOSBAQCBkZWYgcGFyc2VfYXJn cyhhcmdzPU5vbmUpOgogICAgICAgICAgICAgZGVmYXVsdD1UcnVlLCBoZWxwPSJSdW4gSFRUUCBh bmQgV2ViU29ja2V0IHRlc3RzIChkZWZhdWx0KSIpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29w dGlvbigiLS1uby1odHRwIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9Imh0dHAiLAogICAg ICAgICAgICAgaGVscD0iRG9uJ3QgcnVuIEhUVFAgYW5kIFdlYlNvY2tldCB0ZXN0cyIpLAorICAg ICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1pZ25vcmUtbWV0cmljcyIsIGFjdGlvbj0ic3Rv cmVfdHJ1ZSIsIGRlc3Q9Imlnbm9yZV9tZXRyaWNzIiwKKyAgICAgICAgICAgIGRlZmF1bHQ9RmFs c2UsIGhlbHA9Iklnbm9yZSByZW5kZXJpbmcgbWV0cmljcyByZWxhdGVkIGluZm9ybWF0aW9uIGZy b20gdGVzdCAiCisgICAgICAgICAgICAib3V0cHV0LCBvbmx5IGNvbXBhcmUgdGhlIHN0cnVjdHVy ZSBvZiB0aGUgcmVuZGVydHJlZS4iKSwKICAgICBdCiAKICAgICB0ZXN0X29wdGlvbnMgPSBbCg== 122737 2012-01-17 02:11:49 -0800 2012-01-26 02:11:39 -0800 Patch bug-76278-20120117111147.patch text/plain 8481 kbalazs U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MDcwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjFiYjJjNGNlZGQ1ZWZhMjg1ZGQxYzY1MzEyYzg5ODIw YjlhMTZmYS4uNzU1MTcxZjViNTY3N2I0MzVjODE3OWFhMzdkYzZjNDY3OTBmNTAyZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTAxLTE2ICBCYWxhenMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKwor ICAgICAgICBbTlJXVF0gU3VwcG9ydCAtLWlnbm9yZS1tZXRyaWNzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjI3OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBvcnQgdGhlIGZlYXR1cmUgZnJvbSBPUldU LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv c2luZ2xlX3Rlc3RfcnVubmVyLnB5OgorICAgICAgICAoU2luZ2xlVGVzdFJ1bm5lci5fcnVuX2Nv bXBhcmVfdGVzdCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9kcml2ZXIucHk6CisgICAgICAgIChEcml2ZXJPdXRwdXQpOgorICAgICAgICAoRHJpdmVyT3V0 cHV0LnN0cmlwX21ldHJpY3MpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoRHJpdmVyT3V0cHV0VGVzdCk6 CisgICAgICAgIChEcml2ZXJPdXRwdXRUZXN0LnRlc3Rfc3RyaXBfbWV0cmljcyk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAg ICAgICAgKF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKToKKyAgICAgICAgKHBhcnNlX2FyZ3MpOgor CiAyMDEyLTAxLTE2ICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxrdWJvQHByb2Z1c2lvbi5tb2Jp PgogCiAgICAgICAgIFVucmV2aWV3ZWQ7IGZpeCB0aGUgYnVpbGQgd2hlbiAtLWFzLW5lZWRlZCBh bmQgLS1uby1jb3B5LWR0LW5lZWRlZC1lbnRyaWVzIGFyZSBwYXNzZWQgdG8gdGhlIGxpbmtlci4K ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xs ZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQppbmRleCBhZjRiMmQ5MmVj ZTdhNGY0OThlYzFiZDNkNjI1OTg2ZjlkOWFkYmQ4Li43OTFmYjYyMTM5M2Q1NWY1NjM4YTI3N2Fk NTQ1YzY5MTllYzhiY2UxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVy LnB5CkBAIC0xMDQsNiArMTA0LDExIEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXI6CiAgICAgZGVm IF9ydW5fY29tcGFyZV90ZXN0KHNlbGYpOgogICAgICAgICBkcml2ZXJfb3V0cHV0ID0gc2VsZi5f ZHJpdmVyLnJ1bl90ZXN0KHNlbGYuX2RyaXZlcl9pbnB1dCgpKQogICAgICAgICBleHBlY3RlZF9k cml2ZXJfb3V0cHV0ID0gc2VsZi5fZXhwZWN0ZWRfZHJpdmVyX291dHB1dCgpCisKKyAgICAgICAg aWYgc2VsZi5fb3B0aW9ucy5pZ25vcmVfbWV0cmljczoKKyAgICAgICAgICAgIGV4cGVjdGVkX2Ry aXZlcl9vdXRwdXQuc3RyaXBfbWV0cmljcygpCisgICAgICAgICAgICBkcml2ZXJfb3V0cHV0LnN0 cmlwX21ldHJpY3MoKQorCiAgICAgICAgIHRlc3RfcmVzdWx0ID0gc2VsZi5fY29tcGFyZV9vdXRw dXQoZHJpdmVyX291dHB1dCwgZXhwZWN0ZWRfZHJpdmVyX291dHB1dCkKICAgICAgICAgaWYgc2Vs Zi5fb3B0aW9ucy5uZXdfdGVzdF9yZXN1bHRzOgogICAgICAgICAgICAgc2VsZi5fYWRkX21pc3Np bmdfYmFzZWxpbmVzKHRlc3RfcmVzdWx0LCBkcml2ZXJfb3V0cHV0KQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcml2ZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlci5weQppbmRleCA5MzEyNWJl YzIzMWIxZDNiNWZmNTViMmM0YmNhZmI3MzAzMzQzYTM2Li4wYTI1NWMxNmUzZWJkNWMxYTE1NDFk ZjExMjFhMTM3MDhhZTc5NjNmIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2RyaXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2RyaXZlci5weQpAQCAtMjYsNiArMjYsNyBAQAogIyAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KIAoraW1wb3J0IHJlCiBpbXBvcnQgc2hsZXgKIAogZnJvbSB3ZWJr aXRweS5jb21tb24uc3lzdGVtIGltcG9ydCBwYXRoCkBAIC00MCw3ICs0MSwyNSBAQCBjbGFzcyBE cml2ZXJJbnB1dChvYmplY3QpOgogCiAKIGNsYXNzIERyaXZlck91dHB1dChvYmplY3QpOgotICAg ICIiIkdyb3VwcyBpbmZvcm1hdGlvbiBhYm91dCBhIG91dHB1dCBmcm9tIGRyaXZlciBmb3IgZWFz eSBwYXNzaW5nIG9mIGRhdGEuIiIiCisgICAgIiIiR3JvdXBzIGluZm9ybWF0aW9uIGFib3V0IGEg b3V0cHV0IGZyb20gZHJpdmVyIGZvciBlYXN5IHBhc3NpbmcKKyAgICBhbmQgcG9zdC1wcm9jZXNz aW5nIG9mIGRhdGEuIiIiCisKKyAgICBzdHJpcF9wYXR0ZXJucyA9IFtdCisgICAgc3RyaXBfcGF0 dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdhdCBcKC0/WzAtOV0rLC0/WzAtOV0rXCkgKicpLCAn JykpCisgICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdzaXplIC0/WzAtOV0r eC0/WzAtOV0rIConKSwgJycpKQorICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGls ZSgndGV4dCBydW4gd2lkdGggLT9bMC05XSs6ICcpLCAnJykpCisgICAgc3RyaXBfcGF0dGVybnMu YXBwZW5kKChyZS5jb21waWxlKCd0ZXh0IHJ1biB3aWR0aCAtP1swLTldKyBbYS16QS1aIF0rOiAn KSwgJycpKQorICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnUmVuZGVyQnV0 dG9uIHtCVVRUT059IC4qJyksICdSZW5kZXJCdXR0b24ge0JVVFRPTn0nKSkKKyAgICBzdHJpcF9w YXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ1JlbmRlckltYWdlIHtJTlBVVH0gLionKSwgJ1Jl bmRlckltYWdlIHtJTlBVVH0nKSkKKyAgICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBp bGUoJ1JlbmRlckJsb2NrIHtJTlBVVH0gLionKSwgJ1JlbmRlckJsb2NrIHtJTlBVVH0nKSkKKyAg ICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ1JlbmRlclRleHRDb250cm9sIHtJ TlBVVH0gLionKSwgJ1JlbmRlclRleHRDb250cm9sIHtJTlBVVH0nKSkKKyAgICBzdHJpcF9wYXR0 ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ1woWzAtOV0rcHgnKSwgJ3B4JykpCisgICAgc3RyaXBf cGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCcgKiIgKlxuICsiIConKSwgJyAnKSkKKyAgICBz dHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJyIgKyQnKSwgJyInKSkKKyAgICBzdHJp cF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJy0gJyksICctJykpCisgICAgc3RyaXBfcGF0 dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdccysiXG4nKSwgJyJcbicpKQorICAgIHN0cmlwX3Bh dHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnc2Nyb2xsV2lkdGggWzAtOV0rJyksICdzY3JvbGxX aWR0aCcpKQorICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnc2Nyb2xsSGVp Z2h0IFswLTldKycpLCAnc2Nyb2xsSGVpZ2h0JykpCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwg dGV4dCwgaW1hZ2UsIGltYWdlX2hhc2gsIGF1ZGlvLCBjcmFzaD1GYWxzZSwKICAgICAgICAgICAg IHRlc3RfdGltZT0wLCB0aW1lb3V0PUZhbHNlLCBlcnJvcj0nJywgY3Jhc2hlZF9wcm9jZXNzX25h bWU9Tm9uZSk6CkBAIC01OSw2ICs3OCwxMiBAQCBjbGFzcyBEcml2ZXJPdXRwdXQob2JqZWN0KToK ICAgICBkZWYgaGFzX3N0ZGVycihzZWxmKToKICAgICAgICAgcmV0dXJuIGJvb2woc2VsZi5lcnJv cikKIAorICAgIGRlZiBzdHJpcF9tZXRyaWNzKHNlbGYpOgorICAgICAgICBpZiBub3Qgc2VsZi50 ZXh0OgorICAgICAgICAgICAgcmV0dXJuCisgICAgICAgIGZvciBwYXR0ZXJuIGluIHNlbGYuc3Ry aXBfcGF0dGVybnM6CisgICAgICAgICAgICBzZWxmLnRleHQgPSByZS5zdWIocGF0dGVyblswXSwg cGF0dGVyblsxXSwgc2VsZi50ZXh0KQorCiAKIGNsYXNzIERyaXZlcihvYmplY3QpOgogICAgICIi IkFic3RyYWN0IGludGVyZmFjZSBmb3IgdGhlIER1bXBSZW5kZXJUcmVlIGludGVyZmFjZS4iIiIK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJp dmVyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9kcml2ZXJfdW5pdHRlc3QucHkKaW5kZXggZjJlYzFhYWYwYTQ2NDQxNzMwYThhODI4MTU4NGYx NzVjMTVjMWViZi4uZjUyZmNjNzMxODAwNmQxYWY4ZjY3YzBhZWZjZjY1MmM1ZDUwZjJjMCAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcml2ZXJf dW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9kcml2ZXJfdW5pdHRlc3QucHkKQEAgLTM1LDYgKzM1LDQ3IEBAIGZyb20gd2Via2l0cHkuY29t bW9uLnN5c3RlbS5zeXN0ZW1ob3N0X21vY2sgaW1wb3J0IE1vY2tTeXN0ZW1Ib3N0CiBmcm9tIHdl YmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBQb3J0LCBEcml2ZXIsIERyaXZlck91dHB1 dAogCiAKK2NsYXNzIERyaXZlck91dHB1dFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgorICAgIGRl ZiB0ZXN0X3N0cmlwX21ldHJpY3Moc2VsZik6CisgICAgICAgIHBhdHRlcm5zID0gWworICAgICAg ICAgICAgKCdSZW5kZXJWaWV3IGF0ICgwLDApIHNpemUgODAweDYwMCcsICdSZW5kZXJWaWV3ICcp LAorICAgICAgICAgICAgKCd0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAxMDA6ICJzb21lIHRleHQi JywgJyJzb21lIHRleHQiJyksCisgICAgICAgICAgICAoJ1JlbmRlckJsb2NrIHtIVE1MfSBhdCAo MCwwKSBzaXplIDgwMHg2MDAnLCAnUmVuZGVyQmxvY2sge0hUTUx9ICcpLAorICAgICAgICAgICAg KCdSZW5kZXJCbG9jayB7SU5QVVR9IGF0ICgyOSwzKSBzaXplIDEyeDEyIFtjb2xvcj0jMDAwMDAw XScsICdSZW5kZXJCbG9jayB7SU5QVVR9JyksCisKKyAgICAgICAgICAgICgnUmVuZGVyQmxvY2sg KGZsb2F0aW5nKSB7RFR9IGF0ICg1LDUpIHNpemUgNzl4MzEwIFtib3JkZXI6ICg1cHggc29saWQg IzAwMDAwMCldJywKKyAgICAgICAgICAgICdSZW5kZXJCbG9jayAoZmxvYXRpbmcpIHtEVH0gW2Jv cmRlcjogcHggc29saWQgIzAwMDAwMCldJyksCisKKyAgICAgICAgICAgICgnXG4gICAgInRydW5j YXRlIHRleHQgICAgIlxuJywgJ1xuICAgICJ0cnVuY2F0ZSB0ZXh0IlxuJyksCisKKyAgICAgICAg ICAgICgnUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDMpIHNpemUgNDF4MTJcbiAgICB0ZXh0IHJ1 biBhdCAoMCwzKSB3aWR0aCA0MTogIndoaW1wZXIgIlxuJywKKyAgICAgICAgICAgICdSZW5kZXJU ZXh0IHsjdGV4dH0gXG4gICAgIndoaW1wZXIiXG4nKSwKKworICAgICAgICAgICAgKCd0ZXh0IHJ1 biBhdCAoMCwwKSB3aWR0aCAxMDk6ICIub25lIHtjb2xvcjogZ3JlZW47fSJcblwKKyAgICAgICAg ICB0ZXh0IHJ1biBhdCAoMTA5LDApIHdpZHRoIDA6ICIgIlxuXAorICAgICAgICAgIHRleHQgcnVu IGF0ICgwLDE3KSB3aWR0aCA4MTogIi4xIHtjb2xvcjogcmVkO30iXG5cCisgICAgICAgICAgdGV4 dCBydW4gYXQgKDgxLDE3KSB3aWR0aCAwOiAiICJcblwKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAo MCwzNCkgd2lkdGggMTAyOiAiLmExIHtjb2xvcjogZ3JlZW47fSJcblwKKyAgICAgICAgICB0ZXh0 IHJ1biBhdCAoMTAyLDM0KSB3aWR0aCAwOiAiICJcblwKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAo MCw1MSkgd2lkdGggMTIwOiAiUC50d28ge2NvbG9yOiBwdXJwbGU7fSJcblwKKyAgICAgICAgICB0 ZXh0IHJ1biBhdCAoMTIwLDUxKSB3aWR0aCAwOiAiICJcbicsCisgICAgICAgICAgICAnIi5vbmUg e2NvbG9yOiBncmVlbjt9ICAuMSB7Y29sb3I6IHJlZDt9ICAuYTEge2NvbG9yOiBncmVlbjt9ICBQ LnR3byB7Y29sb3I6IHB1cnBsZTt9IlxuJyksCisKKyAgICAgICAgICAgICgndGV4dC0tIG90aGVy IHRleHQnLCAndGV4dC0tb3RoZXIgdGV4dCcpLAorCisgICAgICAgICAgICAoJyBzb21lIG91dHB1 dCAgICJ0cnVuY2F0ZSB0cmFpbGluZyBzcGFjZXMgYXQgZW5kIG9mIGxpbmUgYWZ0ZXIgdGV4dCIg ICBcbicsCisgICAgICAgICAgICAnIHNvbWUgb3V0cHV0ICAgInRydW5jYXRlIHRyYWlsaW5nIHNw YWNlcyBhdCBlbmQgb2YgbGluZSBhZnRlciB0ZXh0IlxuJyksCisKKyAgICAgICAgICAgIChyJ3Nj cm9sbFdpZHRoIDEyMCcsIHInc2Nyb2xsV2lkdGgnKSwKKyAgICAgICAgICAgIChyJ3Njcm9sbEhl aWdodCAxMjAnLCByJ3Njcm9sbEhlaWdodCcpLAorICAgICAgICBdCisKKyAgICAgICAgZm9yIHBh dHRlcm4gaW4gcGF0dGVybnM6CisgICAgICAgICAgICBkcml2ZXJfb3V0cHV0ID0gRHJpdmVyT3V0 cHV0KHBhdHRlcm5bMF0sIE5vbmUsIE5vbmUsIE5vbmUpCisgICAgICAgICAgICBkcml2ZXJfb3V0 cHV0LnN0cmlwX21ldHJpY3MoKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChkcml2ZXJf b3V0cHV0LnRleHQsIHBhdHRlcm5bMV0pCisKKwogY2xhc3MgRHJpdmVyVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgZGVmIG1ha2VfcG9ydChzZWxmKToKICAgICAgICAgcmV0dXJuIFBvcnQo TW9ja1N5c3RlbUhvc3QoKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IGI2MDY4YjZlMDI3NjU1ZTRjMjNk ZGI4ZTQ1ODM5MjQ4MTJkMmI5OGEuLjg2MmY0N2MzMzg3NzJjMTAxZTIwYzE1MjQxOWRjMWZhZmMx NjUwZmUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl93ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMTM3LDYgKzEzNyw5IEBAIGRlZiBfc2V0X3VwX2Rl cml2ZWRfb3B0aW9ucyhwb3J0LCBvcHRpb25zKToKICAgICAgICAgd2FybmluZ3MuYXBwZW5kKCIt LW5vLWh0dHAgaXMgaWdub3JlZCBzaW5jZSAtLWZvcmNlIGlzIGFsc28gcHJvdmlkZWQiKQogICAg ICAgICBvcHRpb25zLmh0dHAgPSBUcnVlCiAKKyAgICBpZiBvcHRpb25zLmlnbm9yZV9tZXRyaWNz IGFuZCAob3B0aW9ucy5uZXdfYmFzZWxpbmUgb3Igb3B0aW9ucy5yZXNldF9yZXN1bHRzKToKKyAg ICAgICAgd2FybmluZ3MuYXBwZW5kKCItLWlnbm9yZS1tZXRyaWNzIGhhcyBubyBlZmZlY3Qgd2l0 aCAtLW5ldy1iYXNlbGluZXMgb3Igd2l0aCAtLXJlc2V0LXJlc3VsdHMiKQorCiAgICAgcmV0dXJu IHdhcm5pbmdzCiAKIApAQCAtMzA1LDYgKzMwOCw5IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3M9Tm9u ZSk6CiAgICAgICAgICAgICBkZWZhdWx0PVRydWUsIGhlbHA9IlJ1biBIVFRQIGFuZCBXZWJTb2Nr ZXQgdGVzdHMgKGRlZmF1bHQpIiksCiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLW5v LWh0dHAiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0iaHR0cCIsCiAgICAgICAgICAgICBo ZWxwPSJEb24ndCBydW4gSFRUUCBhbmQgV2ViU29ja2V0IHRlc3RzIiksCisgICAgICAgIG9wdHBh cnNlLm1ha2Vfb3B0aW9uKCItLWlnbm9yZS1tZXRyaWNzIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwg ZGVzdD0iaWdub3JlX21ldHJpY3MiLAorICAgICAgICAgICAgZGVmYXVsdD1GYWxzZSwgaGVscD0i SWdub3JlIHJlbmRlcmluZyBtZXRyaWNzIHJlbGF0ZWQgaW5mb3JtYXRpb24gZnJvbSB0ZXN0ICIK KyAgICAgICAgICAgICJvdXRwdXQsIG9ubHkgY29tcGFyZSB0aGUgc3RydWN0dXJlIG9mIHRoZSBy ZW5kZXJ0cmVlLiIpLAogICAgIF0KIAogICAgIHRlc3Rfb3B0aW9ucyA9IFsK