28907 2009-09-02 04:36:34 -0700 [Qt] The --strict switch of run-webkit-tests does not work 2009-09-08 05:36:48 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 abecsi webkit-unassigned vestbo oldest_to_newest 144188 0 38922 abecsi 2009-09-02 04:36:34 -0700 Created attachment 38922 Implement --without-metrics switch for the Qt port Using run-webkit-tests --strict on the Qt port should compare the mac expected files with the actual files of the Qt port with the font size metrics removed from the files. In this way only the render tree is compared and so the obvious differences can be tracked, and the related bugs can be corrected. The attached patch completes and corrects the implementation of --strict and renames the switch to --without-metrics. 144191 1 38924 abecsi 2009-09-02 04:54:43 -0700 Created attachment 38924 Add Changelog entry to my without-metrics patch 144299 2 38924 eric 2009-09-02 13:58:27 -0700 Comment on attachment 38924 Add Changelog entry to my without-metrics patch Indentation issues in this patch. 144441 3 abecsi 2009-09-03 01:51:15 -0700 (In reply to comment #2) > (From update of attachment 38924 [details]) > Indentation issues in this patch. Seems that there are indentation issues in the whole run-webkit-tests file. Should there be the same policy applied to perl scripts as to the cpp files? The check-webkit-style script only checks cpp and h files so I tried to apply the indentation of the context, which seemed to me to be the most consequent in the obviously messy script. 144796 4 38924 ariya.hidayat 2009-09-04 06:27:30 -0700 Comment on attachment 38924 Add Changelog entry to my without-metrics patch As discussed over IRC, this patch should not remove --strict and it should just compare between test result and expected of the port (i.e. not mixing it with Qt vs Mac). Also, a name like exclude-metrics or skip-metrics sounds like a better name than without-metrics. r- until the issue is addressed. 145126 5 39140 abecsi 2009-09-07 04:23:49 -0700 Created attachment 39140 Change my patch as discussed on IRC 145131 6 39140 vestbo 2009-09-07 04:39:06 -0700 Comment on attachment 39140 Change my patch as discussed on IRC Good stuff, but can you please split up the --strict fix and the new option into two separate patches? A few comments: > print "\tThis allows the pixel tests to have consistent color values across all machines.\n"; > - > + > if (isPerianInstalled()) { Don't add whitespace-hunks > + if ( !isAppleMacWebKit() && $strictTesting && !$isText ) { No space in "if (something)" > + $excludeMetrics = 1; > + my $expectedFile = "$testDirectory/platform/mac/$expectedFileName"; > + if ( !-s $expectedFile ) { > + $expectedFile = "$testDirectory/$expectedFileName"; > + } There can be several layers of results, see expectedDirectoryForTest() and @platformResultHierarchy > + $modBase = catfile( $simplifiedDir, basename($base)); Space after ( 145163 7 39149 abecsi 2009-09-07 08:33:23 -0700 Created attachment 39149 Refactor --strict switch to --ignore-metrics Refactor --strict switch to --ignore-metrics and correct the implementation to make the feature usable on all platforms. This is much simpler and straightforward then my previous patches and it can be easily extended to support advanced comparisons (eg. to other platform's expected files) later. 145165 8 39149 vestbo 2009-09-07 08:42:22 -0700 Comment on attachment 39149 Refactor --strict switch to --ignore-metrics Nice. A few finishing touches: > +my $simpleTag = "simple"; This is no longer needed. > + 'ignore-metrics' => \$ignoreMetrics, Should be postixed with a ! since it's a boolean flag, this will make GetOptions support --no-ignore-metrics, etc > 'strip-editing-callbacks!' => \$stripEditingCallbacks, Like this one > +sub simplify($$) Suggest renaming to stripMetrics() > + my $simpleExpected = $expected; > + my $simpleActual = $actual; No need to assign these, you already have it in $actual and $expected. > + $simpleActual = $actual; And def. no need to re-assign a second time ;) > + $simpleActual =~ s/at \(-?[0-9]+,-?[0-9]+\) *//g; Just use $actual here, it's passed by value > + $simpleExpected =~ s/at \(-?[0-9]+,-?[0-9]+\) *//g; Same, just use $expected directly 145200 9 39155 abecsi 2009-09-07 10:34:40 -0700 Created attachment 39155 Corrected copy-paste issues, and applied suggestions to previous patch 145208 10 39157 abecsi 2009-09-07 10:42:47 -0700 Created attachment 39157 Fixed my previous patch which had an error. 145219 11 vestbo 2009-09-07 11:10:50 -0700 I'll land this tomorrow. Also, I just realized the stripMetrics() function can be simplified to: my ($actual, $expected) = @_; foreach my $result ($actual, $expected) { $result =~ s/at \(-?[0-9]+,-?[0-9]+\) *//g; ... } But I'll do that change before landing. 145221 12 abecsi 2009-09-07 11:38:50 -0700 Thank you very much for the extensive review, suggestions and help. I also noticed this possibility of simplification and I noticed a typo in the Changelog text too (succesfull -> succesful), so I created a fixed patch: http://gist.github.com/182506 ----------- (In reply to comment #11) > I'll land this tomorrow. > > Also, I just realized the stripMetrics() function can be simplified to: > > my ($actual, $expected) = @_; > > foreach my $result ($actual, $expected) { > $result =~ s/at \(-?[0-9]+,-?[0-9]+\) *//g; > ... > } > > But I'll do that change before landing. 145320 13 vestbo 2009-09-08 05:36:48 -0700 Landed in r48148 38922 2009-09-02 04:36:34 -0700 2009-09-02 04:54:43 -0700 Implement --without-metrics switch for the Qt port simplified.diff text/plain 8151 abecsi SW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMJKHJldmlzaW9uIDQ3OTYxKQor KysgV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCSh3b3JraW5nIGNvcHkpCkBA IC01LDYgKzUsNyBAQAogIyBDb3B5cmlnaHQgKEMpIDIwMDcgTWF0dCBMaWxlayAocGV3dGVybW9v c2VAZ21haWwuY29tKQogIyBDb3B5cmlnaHQgKEMpIDIwMDcgRXJpYyBTZWlkZWwgPGVyaWNAd2Vi a2l0Lm9yZz4KICMgQ29weXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAwOSBBbmRyYXMgQmVjc2kgKGJlY3NpLmFuZHJhc0Bz dHVkLnUtc3plZ2VkLmh1KSwgVW5pdmVyc2l0eSBvZiBTemVnZWQKICMKICMgUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAj IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucwpAQCAtMTMxLDcgKzEzMiw3IEBACiBteSAkdHJlYXRTa2lwcGVkID0gImRlZmF1 bHQiOwogbXkgJHZlcmJvc2UgPSAwOwogbXkgJHVzZVZhbGdyaW5kID0gMDsKLW15ICRzdHJpY3RU ZXN0aW5nID0gMDsKK215ICR3aXRob3V0TWV0cmljcyA9IDA7CiBteSAkZ2VuZXJhdGVOZXdSZXN1 bHRzID0gaXNBcHBsZU1hY1dlYktpdCgpID8gMSA6IDA7CiBteSAkc3RyaXBFZGl0aW5nQ2FsbGJh Y2tzID0gaXNDeWd3aW4oKTsKIG15ICRydW5TYW1wbGUgPSAxOwpAQCAtMTQyLDYgKzE0Myw4IEBA CiBteSAkdGltZW91dFNlY29uZHMgPSAxNTsKIG15ICR1c2VSZW1vdGVMaW5rc1RvVGVzdHMgPSAw OwogbXkgQGxlYWtzRmlsZW5hbWVzOworbXkgJG1hY0V4cGVjdGVkRmlsZTsKK215ICRzaW1wbGlm aWVkRGlyOwogCiAjIERlZmF1bHQgdG8gLS1uby1odHRwIGZvciBRdCwgYW5kIHd4IGZvciBub3cu CiAkdGVzdEhUVFAgPSAwIGlmIChpc1F0KCkgfHwgaXNXeCgpKTsKQEAgLTE4Nyw3ICsxOTAsNiBA QAogbXkgJGh0dHBEZWZhdWx0ID0gJHRlc3RIVFRQID8gInJ1biIgOiAiZG8gbm90IHJ1biI7CiBt eSAkc2FtcGxlRGVmYXVsdCA9ICRydW5TYW1wbGUgPyAicnVuIiA6ICJkbyBub3QgcnVuIjsKIAot IyBGSVhNRTogIi0tc3RyaWN0IiBzaG91bGQgYmUgcmVuYW1lZCB0byBxdC1tYWMtY29tcGFyaXNv biwgb3Igc29tZXRoaW5nIGFsb25nIHRob3NlIGxpbmVzLgogbXkgJHVzYWdlID0gPDxFT0Y7CiBV c2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbdGVzdGRpcnx0ZXN0cGF0aCAuLi5dCiAgIC0t YWRkLXBsYXRmb3JtLWV4Y2VwdGlvbnMgICAgICAgUHV0IG5ldyByZXN1bHRzIGZvciBub24tcGxh dGZvcm0tc3BlY2lmaWMgZmFpbGluZyB0ZXN0cyBpbnRvIHRoZSBwbGF0Zm9ybS1zcGVjaWZpYyBy ZXN1bHRzIGRpcmVjdG9yeQpAQCAtMjE5LDcgKzIyMSw3IEBACiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaWdub3JlOiAgVGhlIFNraXBwZWQgZmlsZSBpcyBpZ25vcmVkCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb25seTogICAgT25seSB0aG9zZSB0 ZXN0cy9kaXJlY3RvcmllcyBsaXN0ZWQgaW4gdGhlIFNraXBwZWQgZmlsZSB3aWxsIGJlIHJ1bgog ICAtLXNsb3dlc3QgICAgICAgICAgICAgICAgICAgICAgIFJlcG9ydCB0aGUgMTAgc2xvd2VzdCB0 ZXN0cwotICAtLXN0cmljdCAgICAgICAgICAgICAgICAgICAgICAgIERvIGEgY29tcGFyaXNvbiB3 aXRoIHRoZSBvdXRwdXQgb24gTWFjIChRdCBvbmx5KQorICAtLXdpdGhvdXQtbWV0cmljcyAgICAg ICAgICAgICAgIERvIGEgcmVuZGVyLXRyZWUgY29tcGFyaXNvbiB3aXRoIHRoZSBvdXRwdXQgb24g TWFjIHdpdGhvdXQgbWV0cmljcyAoUXQgb25seSkKICAgLS1bbm8tXXN0cmlwLWVkaXRpbmctY2Fs bGJhY2tzICBSZW1vdmUgZWRpdGluZyBjYWxsYmFja3MgZnJvbSBleHBlY3RlZCByZXN1bHRzCiAg IC10fC0tdGhyZWFkZWQgICAgICAgICAgICAgICAgICAgUnVuIGEgY29uY3VycmVudCBKYXZhU2Ny aXB0IHRoZWFkIHdpdGggZWFjaCB0ZXN0CiAgIC0tdGltZW91dCB0ICAgICAgICAgICAgICAgICAg ICAgU2V0cyB0aGUgbnVtYmVyIG9mIHNlY29uZHMgYmVmb3JlIGEgdGVzdCB0aW1lcyBvdXQgKGRl ZmF1bHQ6ICR0aW1lb3V0U2Vjb25kcykKQEAgLTI1Niw3ICsyNTgsNyBAQAogICAgICd2ZXJib3Nl fHYnID0+IFwkdmVyYm9zZSwKICAgICAndmFsZ3JpbmQnID0+IFwkdXNlVmFsZ3JpbmQsCiAgICAg J3NhbXBsZS1vbi10aW1lb3V0IScgPT4gXCRydW5TYW1wbGUsCi0gICAgJ3N0cmljdCcgPT4gXCRz dHJpY3RUZXN0aW5nLAorICAgICd3aXRob3V0LW1ldHJpY3MnID0+IFwkd2l0aG91dE1ldHJpY3Ms CiAgICAgJ3N0cmlwLWVkaXRpbmctY2FsbGJhY2tzIScgPT4gXCRzdHJpcEVkaXRpbmdDYWxsYmFj a3MsCiAgICAgJ3JhbmRvbScgPT4gXCRyYW5kb21pemVUZXN0cywKICAgICAncmV2ZXJzZScgPT4g XCRyZXZlcnNlVGVzdHMsCkBAIC03MDMsMTQgKzcwNSwxOCBAQAogICAgICAgICBjbG9zZSBFWFBF Q1RFRDsKICAgICB9CiAgICAgbXkgJGV4cGVjdGVkTWFjOwotICAgIGlmICghaXNBcHBsZU1hY1dl YktpdCgpICYmICRzdHJpY3RUZXN0aW5nICYmICEkaXNUZXh0KSB7Ci0gICAgICBpZiAoISRyZXNl dFJlc3VsdHMgJiYgb3BlbiBFWFBFQ1RFRCwgIjwiLCAiJHRlc3REaXJlY3RvcnkvcGxhdGZvcm0v bWFjLyRleHBlY3RlZEZpbGVOYW1lIikgewotICAgICAgICAkZXhwZWN0ZWRNYWMgPSAiIjsKLSAg ICAgICAgd2hpbGUgKDxFWFBFQ1RFRD4pIHsKLSAgICAgICAgICAkZXhwZWN0ZWRNYWMgLj0gJF87 Ci0gICAgICAgIH0KLSAgICAgICAgY2xvc2UgRVhQRUNURUQ7CisgICAgaWYgKCFpc0FwcGxlTWFj V2ViS2l0KCkgJiYgJHdpdGhvdXRNZXRyaWNzICYmICEkaXNUZXh0KSB7CisgICAgICAkbWFjRXhw ZWN0ZWRGaWxlID0gIiR0ZXN0RGlyZWN0b3J5L3BsYXRmb3JtL21hYy8kZXhwZWN0ZWRGaWxlTmFt ZSI7CisgICAgICBpZiAoICEtZSAkbWFjRXhwZWN0ZWRGaWxlICkgeworICAgICAgICAkbWFjRXhw ZWN0ZWRGaWxlID0gIiR0ZXN0RGlyZWN0b3J5LyRleHBlY3RlZEZpbGVOYW1lIjsKICAgICAgIH0K KyAgICAgIGlmICghJHJlc2V0UmVzdWx0cyAmJiBvcGVuIEVYUEVDVEVELCAiPCIsICIkbWFjRXhw ZWN0ZWRGaWxlIikgeworICAgICAgICAgICAgJGV4cGVjdGVkTWFjID0gIiI7CisgICAgICAgICAg ICB3aGlsZSAoPEVYUEVDVEVEPikgeworICAgICAgICAgICAgICAgICRleHBlY3RlZE1hYyAuPSAk XzsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGNsb3NlIEVYUEVDVEVEOworICAgICAgfQog ICAgIH0KIAogICAgIGlmICgkc2hvdWxkQ2hlY2tMZWFrcyAmJiAkdGVzdHNQZXJEdW1wVG9vbCA9 PSAxKSB7CkBAIC03NzcsNyArNzgzLDYgQEAKICAgICAgICAgICAgICAgICAgICAgJGltYWdlRGlm ZmVyZW5jZXN7JGJhc2V9ID0gJGRpZmZQZXJjZW50YWdlOwogICAgICAgICAgICAgICAgICAgICAk ZGlmZlJlc3VsdCA9ICQyOwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAKICAg ICAgICAgICAgICAgICBpZiAoJGRpZmZQZXJjZW50YWdlID09IDApIHsKICAgICAgICAgICAgICAg ICAgICAgcHJpbnRGYWlsdXJlTWVzc2FnZUZvclRlc3QoJHRlc3QsICJwaXhlbCBoYXNoIGZhaWxl ZCAoYnV0IHBpeGVsIHRlc3Qgc3RpbGwgcGFzc2VzKSIpOwogICAgICAgICAgICAgICAgIH0KQEAg LTc5Niw3ICs4MDEsNyBAQAogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKCFpc0FwcGxlTWFj V2ViS2l0KCkgJiYgJHN0cmljdFRlc3RpbmcgJiYgISRpc1RleHQpIHsKKyAgICBpZiAoIWlzQXBw bGVNYWNXZWJLaXQoKSAmJiAkd2l0aG91dE1ldHJpY3MgJiYgISRpc1RleHQpIHsKICAgICAgIGlm IChkZWZpbmVkICRleHBlY3RlZE1hYykgewogICAgICAgICBteSAkc2ltcGxpZmllZF9hY3R1YWw7 CiAgICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9ICRhY3R1YWw7CkBAIC04MTUsNyArODIwLDkg QEAKICAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvLSAvLS9nOwogICAgICAgICAkc2lt cGxpZmllZF9hY3R1YWwgPX4gcy9cbiggKikiXHMrL1xuJDEiL2c7CiAgICAgICAgICRzaW1wbGlm aWVkX2FjdHVhbCA9fiBzL1xzKyJcbi8iXG4vZzsKLSAgICAgICAgCisgICAgICAgICRzaW1wbGlm aWVkX2FjdHVhbCA9fiBzL3Njcm9sbFdpZHRoIFswLTldKy9zY3JvbGxXaWR0aC9nOworICAgICAg ICAkc2ltcGxpZmllZF9hY3R1YWwgPX4gcy9zY3JvbGxIZWlnaHQgWzAtOV0rL3Njcm9sbEhlaWdo dC9nOworCiAgICAgICAgICRleHBlY3RlZE1hYyA9fiBzL2F0IFwoLT9bMC05XSssLT9bMC05XStc KSAqLy9nOwogICAgICAgICAkZXhwZWN0ZWRNYWMgPX4gcy9zaXplIC0/WzAtOV0reC0/WzAtOV0r ICovL2c7CiAgICAgICAgICRleHBlY3RlZE1hYyA9fiBzL3RleHQgcnVuIHdpZHRoIC0/WzAtOV0r OiAvL2c7CkBAIC04MzEsMTIgKzgzOCwyNSBAQAogICAgICAgICAkZXhwZWN0ZWRNYWMgPX4gcy8t IC8tL2c7CiAgICAgICAgICRleHBlY3RlZE1hYyA9fiBzL1xuKCAqKSJccysvXG4kMSIvZzsKICAg ICAgICAgJGV4cGVjdGVkTWFjID1+IHMvXHMrIlxuLyJcbi9nOwotICAgICAgICAKLSAgICAgICAg aWYgKCRzaW1wbGlmaWVkX2FjdHVhbCBuZSAkZXhwZWN0ZWRNYWMpIHsKLSAgICAgICAgICB3cml0 ZVRvRmlsZSgiL3RtcC9hY3R1YWwudHh0IiwgJHNpbXBsaWZpZWRfYWN0dWFsKTsKLSAgICAgICAg ICB3cml0ZVRvRmlsZSgiL3RtcC9leHBlY3RlZC50eHQiLCAkZXhwZWN0ZWRNYWMpOwotICAgICAg ICAgIHN5c3RlbSAiZGlmZiAtdSBcIi90bXAvZXhwZWN0ZWQudHh0XCIgXCIvdG1wL2FjdHVhbC50 eHRcIiA+IFwiL3RtcC9zaW1wbGlmaWVkLmRpZmZcIiI7CisgICAgICAgICRleHBlY3RlZE1hYyA9 fiBzL3Njcm9sbFdpZHRoIFswLTldKy9zY3JvbGxXaWR0aC9nOworICAgICAgICAkZXhwZWN0ZWRN YWMgPX4gcy9zY3JvbGxIZWlnaHQgWzAtOV0rL3Njcm9sbEhlaWdodC9nOwogCisgICAgICAgIGlm ICggJGV4cGVjdGVkTWFjIG5lICRzaW1wbGlmaWVkX2FjdHVhbCl7CisgICAgICAgICAgJHNpbXBs aWZpZWREaXIgPSBjYXRmaWxlKCR0ZXN0UmVzdWx0c0RpcmVjdG9yeSwgZGlybmFtZSgkYmFzZSks ICJzaW1wbGlmaWVkIik7CisgICAgICAgICAgbXkgJHNpbXBsaWZpZWRGaWxlID0gY2F0ZmlsZSgg JHNpbXBsaWZpZWREaXIsIGJhc2VuYW1lKCRiYXNlKSk7CisgICAgICAgICAgbWtwYXRoICRzaW1w bGlmaWVkRGlyOworCisgICAgICAgICAgY29weSgkbWFjRXhwZWN0ZWRGaWxlLCAiJHNpbXBsaWZp ZWRGaWxlLW1hYy1leHBlY3RlZC50eHQiKTsKKworICAgICAgICAgIHdyaXRlVG9GaWxlKCIkc2lt cGxpZmllZEZpbGUtYWN0dWFsLnR4dCIsICRzaW1wbGlmaWVkX2FjdHVhbCk7CisgICAgICAgICAg d3JpdGVUb0ZpbGUoIiRzaW1wbGlmaWVkRmlsZS1leHBlY3RlZC50eHQiLCAkZXhwZWN0ZWRNYWMp OworICAgICAgICAgIHN5c3RlbSAiZGlmZiAtdSBcIiRzaW1wbGlmaWVkRmlsZS1leHBlY3RlZC50 eHRcIiBcIiRzaW1wbGlmaWVkRmlsZS1hY3R1YWwudHh0XCIgPiBcIiRzaW1wbGlmaWVkRmlsZS1k aWZmcy50eHRcIiI7CisKKyAgICAgICAgICBteSAkcHJldHR5RGlmZk91dHB1dFBhdGggPSAiJHNp bXBsaWZpZWRGaWxlLSRwcmV0dHlEaWZmVGFnLmh0bWwiOworICAgICAgICAgIG15ICRwcmV0dHlQ YXRjaFBhdGggPSAiQnVnc1NpdGUvUHJldHR5UGF0Y2gvIjsKKyAgICAgICAgICBteSAkcHJldHRp ZnlQYXRoID0gIiRwcmV0dHlQYXRjaFBhdGgvcHJldHRpZnkucmIiOworICAgICAgICAgIHN5c3Rl bSAicnVieSAtSSBcIiRwcmV0dHlQYXRjaFBhdGhcIiBcIiRwcmV0dGlmeVBhdGhcIiBcIiRzaW1w bGlmaWVkRmlsZS1kaWZmcy50eHRcIiA+IFwiJHByZXR0eURpZmZPdXRwdXRQYXRoXCIiOworCiAg ICAgICAgICAgJGRpZmZSZXN1bHQgPSAiZmFpbGVkIjsKICAgICAgICAgICBpZiAoJHZlcmJvc2Up IHsKICAgICAgICAgICAgIHByaW50ICJcbiI7CkBAIC04OTIsNiArOTEyLDkgQEAKICAgICAgICAg bXkgJHRlc3RGYWlsZWQgPSAkYWN0dWFsIG5lICRleHBlY3RlZDsKIAogICAgICAgICBteSAkbWVz c2FnZSA9ICEkdGVzdEZhaWxlZCA/ICJwaXhlbCB0ZXN0IGZhaWxlZCIgOiAiZmFpbGVkIjsKKyAg ICAgICAgaWYgKCAkd2l0aG91dE1ldHJpY3MgJiYgJG1lc3NhZ2UgZXEgInBpeGVsIHRlc3QgZmFp bGVkIiApeworICAgICAgICAgICAgJG1lc3NhZ2UgPSAicmVuZGVyIHRyZWUgY29tcGFyaXNvbiBm YWlsZWQiOworICAgICAgICB9CiAKICAgICAgICAgaWYgKCgkdGVzdEZhaWxlZCB8fCAkcGl4ZWxU ZXN0RmFpbGVkKSAmJiAkYWRkUGxhdGZvcm1FeGNlcHRpb25zKSB7CiAgICAgICAgICAgICBteSAk dGVzdEJhc2UgPSBjYXRmaWxlKCR0ZXN0RGlyZWN0b3J5LCAkYmFzZSk7CkBAIC0xNzU2LDE3ICsx Nzc5LDI0IEBACiAgICAgbXkgKCRiYXNlKSA9IEBfOwogCiAgICAgbXkgQGxpbmtzID0gKCk7Ci0K LSAgICByZXR1cm4gXEBsaW5rcyB1bmxlc3MgLXMgIiR0ZXN0UmVzdWx0c0RpcmVjdG9yeS8kYmFz ZS0kZGlmZnNUYWcudHh0IjsKLSAgICAKLSAgICBteSAkZXhwZWN0ZWRSZXN1bHRQYXRoID0gJGV4 cGVjdGVkUmVzdWx0UGF0aHN7JGJhc2V9OworICAgIG15ICRtb2RCYXNlID0gIiRiYXNlIjsKKyAg ICBteSAkZXhwZWN0ZWRSZXN1bHRQYXRoPSAkZXhwZWN0ZWRSZXN1bHRQYXRoc3skYmFzZX07CiAg ICAgbXkgKCRleHBlY3RlZFJlc3VsdEZpbGVOYW1lLCAkZXhwZWN0ZWRSZXN1bHRzRGlyZWN0b3J5 LCAkZXhwZWN0ZWRSZXN1bHRFeHRlbnNpb24pID0gZmlsZXBhcnNlKCRleHBlY3RlZFJlc3VsdFBh dGgsIHFye1wuW14uXSskfSk7CisgICAgbXkgJHNpbXBsaWZpZWREaXIgPSBjYXRmaWxlKCR0ZXN0 UmVzdWx0c0RpcmVjdG9yeSwgZGlybmFtZSgkYmFzZSkpLiAiL3NpbXBsaWZpZWQvIjsKIAotICAg IHB1c2ggQGxpbmtzLCB7IGhyZWYgPT4gIiRiYXNlLSRleHBlY3RlZFRhZyRleHBlY3RlZFJlc3Vs dEV4dGVuc2lvbiIsIHRleHQgPT4gImV4cGVjdGVkIiB9OwotICAgIHB1c2ggQGxpbmtzLCB7IGhy ZWYgPT4gIiRiYXNlLSRhY3R1YWxUYWckZXhwZWN0ZWRSZXN1bHRFeHRlbnNpb24iLCB0ZXh0ID0+ ICJhY3R1YWwiIH07Ci0gICAgcHVzaCBAbGlua3MsIHsgaHJlZiA9PiAiJGJhc2UtJGRpZmZzVGFn LnR4dCIsIHRleHQgPT4gImRpZmYiIH07Ci0gICAgcHVzaCBAbGlua3MsIHsgaHJlZiA9PiAiJGJh c2UtJHByZXR0eURpZmZUYWcuaHRtbCIsIHRleHQgPT4gInByZXR0eSBkaWZmIiB9OworICAgIHJl dHVybiBcQGxpbmtzIHVubGVzcyAtcyAiJHRlc3RSZXN1bHRzRGlyZWN0b3J5LyRiYXNlLSRkaWZm c1RhZy50eHQiIHx8ICR3aXRob3V0TWV0cmljczsKIAorICAgIGlmICggJHdpdGhvdXRNZXRyaWNz ICYmIC1zICIkc2ltcGxpZmllZERpciIgKSB7CisgICAgICAgICRtb2RCYXNlID0gY2F0ZmlsZSgg JHNpbXBsaWZpZWREaXIsIGJhc2VuYW1lKCRiYXNlKSk7CisgICAgICAgICRleHBlY3RlZFJlc3Vs dFBhdGggPSAkc2ltcGxpZmllZERpcjsKKyAgICAgICAgJGV4cGVjdGVkUmVzdWx0RXh0ZW5zaW9u ID0gIi50eHQiOworICAgIH0KKworICAgIHB1c2ggQGxpbmtzLCB7IGhyZWYgPT4gIiRtb2RCYXNl LSRleHBlY3RlZFRhZyRleHBlY3RlZFJlc3VsdEV4dGVuc2lvbiIsIHRleHQgPT4gImV4cGVjdGVk IiB9OworICAgIHB1c2ggQGxpbmtzLCB7IGhyZWYgPT4gIiRtb2RCYXNlLSRhY3R1YWxUYWckZXhw ZWN0ZWRSZXN1bHRFeHRlbnNpb24iLCB0ZXh0ID0+ICJhY3R1YWwiIH07CisgICAgcHVzaCBAbGlu a3MsIHsgaHJlZiA9PiAiJG1vZEJhc2UtJGRpZmZzVGFnLnR4dCIsIHRleHQgPT4gImRpZmYiIH07 CisgICAgcHVzaCBAbGlua3MsIHsgaHJlZiA9PiAiJG1vZEJhc2UtJHByZXR0eURpZmZUYWcuaHRt bCIsIHRleHQgPT4gInByZXR0eSBkaWZmIiB9OworCiAgICAgcmV0dXJuIFxAbGlua3M7CiB9CiAK 38924 2009-09-02 04:54:43 -0700 2009-09-07 04:23:49 -0700 Add Changelog entry to my without-metrics patch run-tests.patch text/plain 9366 abecsi SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ3OTYyKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMDktMDIgIEFuZHJhcyBCZWNzaSAgPGJl Y3NpLmFuZHJhc0BzdHVkLnUtc3plZ2VkLmh1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gQ29tcGxldGUgYW5kIGNvcnJlY3QgdGhlIGltcGxl bWVudGF0aW9uIG9mIC0tc3RyaWN0IGFuZAorICAgICAgICByZW5hbWUgdGhlIHN3aXRjaCB0byAt LXdpdGhvdXQtbWV0cmljcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI4OTA3CisKKyAgICAgICAgVXNpbmcgcnVuLXdlYmtpdC10ZXN0cyAtLXdpdGhv dXQtbWV0cmljcyBvbiB0aGUgUXQgcG9ydCBjb21wYXJlcyB0aGUgbWFjIGV4cGVjdGVkCisgICAg ICAgIGZpbGVzIHdpdGggdGhlIGFjdHVhbCBmaWxlcyBvZiB0aGUgUXQgcG9ydCB3aXRoIHRoZSBm b250IHNpemUgbWV0cmljcyByZW1vdmVkCisgICAgICAgIGZyb20gdGhlIGZpbGVzLiBJbiB0aGlz IHdheSBvbmx5IHRoZSByZW5kZXIgdHJlZSBpcyBjb21wYXJlZCBhbmQgc28gdGhlIG9idmlvdXMK KyAgICAgICAgZGlmZmVyZW5jZXMgY2FuIGJlIHRyYWNrZWQsIGFuZCB0aGUgcmVsYXRlZCBidWdz IGNhbiBiZSBjb3JyZWN0ZWQuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi13ZWJraXQtdGVzdHM6 CisKIDIwMDktMDktMDEgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEu Y29tPgogCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IFNpbW9uIEhhdXNtYW5uLgpJbmRleDog V2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwkocmV2aXNpb24gNDc5NjIpCisrKyBXZWJL aXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMJKHdvcmtpbmcgY29weSkKQEAgLTUsNiAr NSw3IEBACiAjIENvcHlyaWdodCAoQykgMjAwNyBNYXR0IExpbGVrIChwZXd0ZXJtb29zZUBnbWFp bC5jb20pCiAjIENvcHlyaWdodCAoQykgMjAwNyBFcmljIFNlaWRlbCA8ZXJpY0B3ZWJraXQub3Jn PgogIyBDb3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyMgQ29weXJpZ2h0IChDKSAyMDA5IEFuZHJhcyBCZWNzaSAoYmVjc2kuYW5kcmFzQHN0dWQudS1z emVnZWQuaHUpLCBVbml2ZXJzaXR5IG9mIFN6ZWdlZAogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC0xMzEsNyArMTMyLDcgQEAgbXkgJHRvbGVyYW5jZSA9IDA7CiBteSAkdHJlYXRTa2lw cGVkID0gImRlZmF1bHQiOwogbXkgJHZlcmJvc2UgPSAwOwogbXkgJHVzZVZhbGdyaW5kID0gMDsK LW15ICRzdHJpY3RUZXN0aW5nID0gMDsKK215ICR3aXRob3V0TWV0cmljcyA9IDA7CiBteSAkZ2Vu ZXJhdGVOZXdSZXN1bHRzID0gaXNBcHBsZU1hY1dlYktpdCgpID8gMSA6IDA7CiBteSAkc3RyaXBF ZGl0aW5nQ2FsbGJhY2tzID0gaXNDeWd3aW4oKTsKIG15ICRydW5TYW1wbGUgPSAxOwpAQCAtMTQy LDYgKzE0Myw4IEBAIG15ICRtZXJnZURlcHRoOwogbXkgJHRpbWVvdXRTZWNvbmRzID0gMTU7CiBt eSAkdXNlUmVtb3RlTGlua3NUb1Rlc3RzID0gMDsKIG15IEBsZWFrc0ZpbGVuYW1lczsKK215ICRt YWNFeHBlY3RlZEZpbGU7CitteSAkc2ltcGxpZmllZERpcjsKIAogIyBEZWZhdWx0IHRvIC0tbm8t aHR0cCBmb3IgUXQsIGFuZCB3eCBmb3Igbm93LgogJHRlc3RIVFRQID0gMCBpZiAoaXNRdCgpIHx8 IGlzV3goKSk7CkBAIC0xODcsNyArMTkwLDYgQEAgbXkgJGxhdW5jaFNhZmFyaURlZmF1bHQgPSAk bGF1bmNoU2FmYXJpIAogbXkgJGh0dHBEZWZhdWx0ID0gJHRlc3RIVFRQID8gInJ1biIgOiAiZG8g bm90IHJ1biI7CiBteSAkc2FtcGxlRGVmYXVsdCA9ICRydW5TYW1wbGUgPyAicnVuIiA6ICJkbyBu b3QgcnVuIjsKIAotIyBGSVhNRTogIi0tc3RyaWN0IiBzaG91bGQgYmUgcmVuYW1lZCB0byBxdC1t YWMtY29tcGFyaXNvbiwgb3Igc29tZXRoaW5nIGFsb25nIHRob3NlIGxpbmVzLgogbXkgJHVzYWdl ID0gPDxFT0Y7CiBVc2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbdGVzdGRpcnx0ZXN0cGF0 aCAuLi5dCiAgIC0tYWRkLXBsYXRmb3JtLWV4Y2VwdGlvbnMgICAgICAgUHV0IG5ldyByZXN1bHRz IGZvciBub24tcGxhdGZvcm0tc3BlY2lmaWMgZmFpbGluZyB0ZXN0cyBpbnRvIHRoZSBwbGF0Zm9y bS1zcGVjaWZpYyByZXN1bHRzIGRpcmVjdG9yeQpAQCAtMjE5LDcgKzIyMSw3IEBAIFVzYWdlOiAk cHJvZ3JhbU5hbWUgW29wdGlvbnNdIFt0ZXN0ZGlyfHQKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpZ25vcmU6ICBUaGUgU2tpcHBlZCBmaWxlIGlzIGlnbm9yZWQKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvbmx5OiAgICBPbmx5IHRob3NlIHRlc3Rz L2RpcmVjdG9yaWVzIGxpc3RlZCBpbiB0aGUgU2tpcHBlZCBmaWxlIHdpbGwgYmUgcnVuCiAgIC0t c2xvd2VzdCAgICAgICAgICAgICAgICAgICAgICAgUmVwb3J0IHRoZSAxMCBzbG93ZXN0IHRlc3Rz Ci0gIC0tc3RyaWN0ICAgICAgICAgICAgICAgICAgICAgICAgRG8gYSBjb21wYXJpc29uIHdpdGgg dGhlIG91dHB1dCBvbiBNYWMgKFF0IG9ubHkpCisgIC0td2l0aG91dC1tZXRyaWNzICAgICAgICAg ICAgICAgRG8gYSByZW5kZXItdHJlZSBjb21wYXJpc29uIHdpdGggdGhlIG91dHB1dCBvbiBNYWMg d2l0aG91dCBtZXRyaWNzIChRdCBvbmx5KQogICAtLVtuby1dc3RyaXAtZWRpdGluZy1jYWxsYmFj a3MgIFJlbW92ZSBlZGl0aW5nIGNhbGxiYWNrcyBmcm9tIGV4cGVjdGVkIHJlc3VsdHMKICAgLXR8 LS10aHJlYWRlZCAgICAgICAgICAgICAgICAgICBSdW4gYSBjb25jdXJyZW50IEphdmFTY3JpcHQg dGhlYWQgd2l0aCBlYWNoIHRlc3QKICAgLS10aW1lb3V0IHQgICAgICAgICAgICAgICAgICAgICBT ZXRzIHRoZSBudW1iZXIgb2Ygc2Vjb25kcyBiZWZvcmUgYSB0ZXN0IHRpbWVzIG91dCAoZGVmYXVs dDogJHRpbWVvdXRTZWNvbmRzKQpAQCAtMjU2LDcgKzI1OCw3IEBAIG15ICRnZXRPcHRpb25zUmVz dWx0ID0gR2V0T3B0aW9ucygKICAgICAndmVyYm9zZXx2JyA9PiBcJHZlcmJvc2UsCiAgICAgJ3Zh bGdyaW5kJyA9PiBcJHVzZVZhbGdyaW5kLAogICAgICdzYW1wbGUtb24tdGltZW91dCEnID0+IFwk cnVuU2FtcGxlLAotICAgICdzdHJpY3QnID0+IFwkc3RyaWN0VGVzdGluZywKKyAgICAnd2l0aG91 dC1tZXRyaWNzJyA9PiBcJHdpdGhvdXRNZXRyaWNzLAogICAgICdzdHJpcC1lZGl0aW5nLWNhbGxi YWNrcyEnID0+IFwkc3RyaXBFZGl0aW5nQ2FsbGJhY2tzLAogICAgICdyYW5kb20nID0+IFwkcmFu ZG9taXplVGVzdHMsCiAgICAgJ3JldmVyc2UnID0+IFwkcmV2ZXJzZVRlc3RzLApAQCAtNzAzLDEz ICs3MDUsMTcgQEAgZm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAgICAgICAgY2xvc2UgRVhQRUNU RUQ7CiAgICAgfQogICAgIG15ICRleHBlY3RlZE1hYzsKLSAgICBpZiAoIWlzQXBwbGVNYWNXZWJL aXQoKSAmJiAkc3RyaWN0VGVzdGluZyAmJiAhJGlzVGV4dCkgewotICAgICAgaWYgKCEkcmVzZXRS ZXN1bHRzICYmIG9wZW4gRVhQRUNURUQsICI8IiwgIiR0ZXN0RGlyZWN0b3J5L3BsYXRmb3JtL21h Yy8kZXhwZWN0ZWRGaWxlTmFtZSIpIHsKLSAgICAgICAgJGV4cGVjdGVkTWFjID0gIiI7Ci0gICAg ICAgIHdoaWxlICg8RVhQRUNURUQ+KSB7Ci0gICAgICAgICAgJGV4cGVjdGVkTWFjIC49ICRfOwot ICAgICAgICB9Ci0gICAgICAgIGNsb3NlIEVYUEVDVEVEOworICAgIGlmICghaXNBcHBsZU1hY1dl YktpdCgpICYmICR3aXRob3V0TWV0cmljcyAmJiAhJGlzVGV4dCkgeworICAgICAgJG1hY0V4cGVj dGVkRmlsZSA9ICIkdGVzdERpcmVjdG9yeS9wbGF0Zm9ybS9tYWMvJGV4cGVjdGVkRmlsZU5hbWUi OworICAgICAgaWYgKCAhLWUgJG1hY0V4cGVjdGVkRmlsZSApIHsKKyAgICAgICAgJG1hY0V4cGVj dGVkRmlsZSA9ICIkdGVzdERpcmVjdG9yeS8kZXhwZWN0ZWRGaWxlTmFtZSI7CisgICAgICB9Cisg ICAgICBpZiAoISRyZXNldFJlc3VsdHMgJiYgb3BlbiBFWFBFQ1RFRCwgIjwiLCAiJG1hY0V4cGVj dGVkRmlsZSIpIHsKKyAgICAgICAgICAgICRleHBlY3RlZE1hYyA9ICIiOworICAgICAgICAgICAg d2hpbGUgKDxFWFBFQ1RFRD4pIHsKKyAgICAgICAgICAgICAgICAkZXhwZWN0ZWRNYWMgLj0gJF87 CisgICAgICAgICAgICB9CisgICAgICAgICAgICBjbG9zZSBFWFBFQ1RFRDsKICAgICAgIH0KICAg ICB9CiAKQEAgLTc3Nyw3ICs3ODMsNiBAQCBmb3IgbXkgJHRlc3QgKEB0ZXN0cykgewogICAgICAg ICAgICAgICAgICAgICAkaW1hZ2VEaWZmZXJlbmNlc3skYmFzZX0gPSAkZGlmZlBlcmNlbnRhZ2U7 CiAgICAgICAgICAgICAgICAgICAgICRkaWZmUmVzdWx0ID0gJDI7CiAgICAgICAgICAgICAgICAg fQotICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgIGlmICgkZGlmZlBlcmNlbnRhZ2Ug PT0gMCkgewogICAgICAgICAgICAgICAgICAgICBwcmludEZhaWx1cmVNZXNzYWdlRm9yVGVzdCgk dGVzdCwgInBpeGVsIGhhc2ggZmFpbGVkIChidXQgcGl4ZWwgdGVzdCBzdGlsbCBwYXNzZXMpIik7 CiAgICAgICAgICAgICAgICAgfQpAQCAtNzk2LDcgKzgwMSw3IEBAIGZvciBteSAkdGVzdCAoQHRl c3RzKSB7CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoIWlzQXBwbGVNYWNXZWJLaXQoKSAm JiAkc3RyaWN0VGVzdGluZyAmJiAhJGlzVGV4dCkgeworICAgIGlmICghaXNBcHBsZU1hY1dlYktp dCgpICYmICR3aXRob3V0TWV0cmljcyAmJiAhJGlzVGV4dCkgewogICAgICAgaWYgKGRlZmluZWQg JGV4cGVjdGVkTWFjKSB7CiAgICAgICAgIG15ICRzaW1wbGlmaWVkX2FjdHVhbDsKICAgICAgICAg JHNpbXBsaWZpZWRfYWN0dWFsID0gJGFjdHVhbDsKQEAgLTgxNSw3ICs4MjAsOSBAQCBmb3IgbXkg JHRlc3QgKEB0ZXN0cykgewogICAgICAgICAkc2ltcGxpZmllZF9hY3R1YWwgPX4gcy8tIC8tL2c7 CiAgICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9fiBzL1xuKCAqKSJccysvXG4kMSIvZzsKICAg ICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvXHMrIlxuLyJcbi9nOwotICAgICAgICAKKyAg ICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvc2Nyb2xsV2lkdGggWzAtOV0rL3Njcm9sbFdp ZHRoL2c7CisgICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9fiBzL3Njcm9sbEhlaWdodCBbMC05 XSsvc2Nyb2xsSGVpZ2h0L2c7CisKICAgICAgICAgJGV4cGVjdGVkTWFjID1+IHMvYXQgXCgtP1sw LTldKywtP1swLTldK1wpICovL2c7CiAgICAgICAgICRleHBlY3RlZE1hYyA9fiBzL3NpemUgLT9b MC05XSt4LT9bMC05XSsgKi8vZzsKICAgICAgICAgJGV4cGVjdGVkTWFjID1+IHMvdGV4dCBydW4g d2lkdGggLT9bMC05XSs6IC8vZzsKQEAgLTgzMSwxMSArODM4LDI0IEBAIGZvciBteSAkdGVzdCAo QHRlc3RzKSB7CiAgICAgICAgICRleHBlY3RlZE1hYyA9fiBzLy0gLy0vZzsKICAgICAgICAgJGV4 cGVjdGVkTWFjID1+IHMvXG4oICopIlxzKy9cbiQxIi9nOwogICAgICAgICAkZXhwZWN0ZWRNYWMg PX4gcy9ccysiXG4vIlxuL2c7Ci0gICAgICAgIAotICAgICAgICBpZiAoJHNpbXBsaWZpZWRfYWN0 dWFsIG5lICRleHBlY3RlZE1hYykgewotICAgICAgICAgIHdyaXRlVG9GaWxlKCIvdG1wL2FjdHVh bC50eHQiLCAkc2ltcGxpZmllZF9hY3R1YWwpOwotICAgICAgICAgIHdyaXRlVG9GaWxlKCIvdG1w L2V4cGVjdGVkLnR4dCIsICRleHBlY3RlZE1hYyk7Ci0gICAgICAgICAgc3lzdGVtICJkaWZmIC11 IFwiL3RtcC9leHBlY3RlZC50eHRcIiBcIi90bXAvYWN0dWFsLnR4dFwiID4gXCIvdG1wL3NpbXBs aWZpZWQuZGlmZlwiIjsKKyAgICAgICAgJGV4cGVjdGVkTWFjID1+IHMvc2Nyb2xsV2lkdGggWzAt OV0rL3Njcm9sbFdpZHRoL2c7CisgICAgICAgICRleHBlY3RlZE1hYyA9fiBzL3Njcm9sbEhlaWdo dCBbMC05XSsvc2Nyb2xsSGVpZ2h0L2c7CisKKyAgICAgICAgaWYgKCAkZXhwZWN0ZWRNYWMgbmUg JHNpbXBsaWZpZWRfYWN0dWFsKXsKKyAgICAgICAgICAkc2ltcGxpZmllZERpciA9IGNhdGZpbGUo JHRlc3RSZXN1bHRzRGlyZWN0b3J5LCBkaXJuYW1lKCRiYXNlKSwgInNpbXBsaWZpZWQiKTsKKyAg ICAgICAgICBteSAkc2ltcGxpZmllZEZpbGUgPSBjYXRmaWxlKCAkc2ltcGxpZmllZERpciwgYmFz ZW5hbWUoJGJhc2UpKTsKKyAgICAgICAgICBta3BhdGggJHNpbXBsaWZpZWREaXI7CisKKyAgICAg ICAgICBjb3B5KCRtYWNFeHBlY3RlZEZpbGUsICIkc2ltcGxpZmllZEZpbGUtbWFjLWV4cGVjdGVk LnR4dCIpOworCisgICAgICAgICAgd3JpdGVUb0ZpbGUoIiRzaW1wbGlmaWVkRmlsZS1hY3R1YWwu dHh0IiwgJHNpbXBsaWZpZWRfYWN0dWFsKTsKKyAgICAgICAgICB3cml0ZVRvRmlsZSgiJHNpbXBs aWZpZWRGaWxlLWV4cGVjdGVkLnR4dCIsICRleHBlY3RlZE1hYyk7CisgICAgICAgICAgc3lzdGVt ICJkaWZmIC11IFwiJHNpbXBsaWZpZWRGaWxlLWV4cGVjdGVkLnR4dFwiIFwiJHNpbXBsaWZpZWRG aWxlLWFjdHVhbC50eHRcIiA+IFwiJHNpbXBsaWZpZWRGaWxlLWRpZmZzLnR4dFwiIjsKKworICAg ICAgICAgIG15ICRwcmV0dHlEaWZmT3V0cHV0UGF0aCA9ICIkc2ltcGxpZmllZEZpbGUtJHByZXR0 eURpZmZUYWcuaHRtbCI7CisgICAgICAgICAgbXkgJHByZXR0eVBhdGNoUGF0aCA9ICJCdWdzU2l0 ZS9QcmV0dHlQYXRjaC8iOworICAgICAgICAgIG15ICRwcmV0dGlmeVBhdGggPSAiJHByZXR0eVBh dGNoUGF0aC9wcmV0dGlmeS5yYiI7CisgICAgICAgICAgc3lzdGVtICJydWJ5IC1JIFwiJHByZXR0 eVBhdGNoUGF0aFwiIFwiJHByZXR0aWZ5UGF0aFwiIFwiJHNpbXBsaWZpZWRGaWxlLWRpZmZzLnR4 dFwiID4gXCIkcHJldHR5RGlmZk91dHB1dFBhdGhcIiI7CiAKICAgICAgICAgICAkZGlmZlJlc3Vs dCA9ICJmYWlsZWQiOwogICAgICAgICAgIGlmICgkdmVyYm9zZSkgewpAQCAtODkyLDYgKzkxMiw5 IEBAIGZvciBteSAkdGVzdCAoQHRlc3RzKSB7CiAgICAgICAgIG15ICR0ZXN0RmFpbGVkID0gJGFj dHVhbCBuZSAkZXhwZWN0ZWQ7CiAKICAgICAgICAgbXkgJG1lc3NhZ2UgPSAhJHRlc3RGYWlsZWQg PyAicGl4ZWwgdGVzdCBmYWlsZWQiIDogImZhaWxlZCI7CisgICAgICAgIGlmICggJHdpdGhvdXRN ZXRyaWNzICYmICRtZXNzYWdlIGVxICJwaXhlbCB0ZXN0IGZhaWxlZCIgKXsKKyAgICAgICAgICAg ICRtZXNzYWdlID0gInJlbmRlciB0cmVlIGNvbXBhcmlzb24gZmFpbGVkIjsKKyAgICAgICAgfQog CiAgICAgICAgIGlmICgoJHRlc3RGYWlsZWQgfHwgJHBpeGVsVGVzdEZhaWxlZCkgJiYgJGFkZFBs YXRmb3JtRXhjZXB0aW9ucykgewogICAgICAgICAgICAgbXkgJHRlc3RCYXNlID0gY2F0ZmlsZSgk dGVzdERpcmVjdG9yeSwgJGJhc2UpOwpAQCAtMTc1NiwxNiArMTc3OSwyMyBAQCBzdWIgbGlua3NG b3JFeHBlY3RlZEFuZEFjdHVhbFJlc3VsdHMoJCkKICAgICBteSAoJGJhc2UpID0gQF87CiAKICAg ICBteSBAbGlua3MgPSAoKTsKLQotICAgIHJldHVybiBcQGxpbmtzIHVubGVzcyAtcyAiJHRlc3RS ZXN1bHRzRGlyZWN0b3J5LyRiYXNlLSRkaWZmc1RhZy50eHQiOwotICAgIAotICAgIG15ICRleHBl Y3RlZFJlc3VsdFBhdGggPSAkZXhwZWN0ZWRSZXN1bHRQYXRoc3skYmFzZX07CisgICAgbXkgJG1v ZEJhc2UgPSAiJGJhc2UiOworICAgIG15ICRleHBlY3RlZFJlc3VsdFBhdGg9ICRleHBlY3RlZFJl c3VsdFBhdGhzeyRiYXNlfTsKICAgICBteSAoJGV4cGVjdGVkUmVzdWx0RmlsZU5hbWUsICRleHBl Y3RlZFJlc3VsdHNEaXJlY3RvcnksICRleHBlY3RlZFJlc3VsdEV4dGVuc2lvbikgPSBmaWxlcGFy c2UoJGV4cGVjdGVkUmVzdWx0UGF0aCwgcXJ7XC5bXi5dKyR9KTsKKyAgICBteSAkc2ltcGxpZmll ZERpciA9IGNhdGZpbGUoJHRlc3RSZXN1bHRzRGlyZWN0b3J5LCBkaXJuYW1lKCRiYXNlKSkuICIv c2ltcGxpZmllZC8iOworCisgICAgcmV0dXJuIFxAbGlua3MgdW5sZXNzIC1zICIkdGVzdFJlc3Vs dHNEaXJlY3RvcnkvJGJhc2UtJGRpZmZzVGFnLnR4dCIgfHwgJHdpdGhvdXRNZXRyaWNzOworCisg ICAgaWYgKCAkd2l0aG91dE1ldHJpY3MgJiYgLXMgIiRzaW1wbGlmaWVkRGlyIiApIHsKKyAgICAg ICAgJG1vZEJhc2UgPSBjYXRmaWxlKCAkc2ltcGxpZmllZERpciwgYmFzZW5hbWUoJGJhc2UpKTsK KyAgICAgICAgJGV4cGVjdGVkUmVzdWx0UGF0aCA9ICRzaW1wbGlmaWVkRGlyOworICAgICAgICAk ZXhwZWN0ZWRSZXN1bHRFeHRlbnNpb24gPSAiLnR4dCI7CisgICAgfQogCi0gICAgcHVzaCBAbGlu a3MsIHsgaHJlZiA9PiAiJGJhc2UtJGV4cGVjdGVkVGFnJGV4cGVjdGVkUmVzdWx0RXh0ZW5zaW9u IiwgdGV4dCA9PiAiZXhwZWN0ZWQiIH07Ci0gICAgcHVzaCBAbGlua3MsIHsgaHJlZiA9PiAiJGJh c2UtJGFjdHVhbFRhZyRleHBlY3RlZFJlc3VsdEV4dGVuc2lvbiIsIHRleHQgPT4gImFjdHVhbCIg fTsKLSAgICBwdXNoIEBsaW5rcywgeyBocmVmID0+ICIkYmFzZS0kZGlmZnNUYWcudHh0IiwgdGV4 dCA9PiAiZGlmZiIgfTsKLSAgICBwdXNoIEBsaW5rcywgeyBocmVmID0+ICIkYmFzZS0kcHJldHR5 RGlmZlRhZy5odG1sIiwgdGV4dCA9PiAicHJldHR5IGRpZmYiIH07CisgICAgcHVzaCBAbGlua3Ms IHsgaHJlZiA9PiAiJG1vZEJhc2UtJGV4cGVjdGVkVGFnJGV4cGVjdGVkUmVzdWx0RXh0ZW5zaW9u IiwgdGV4dCA9PiAiZXhwZWN0ZWQiIH07CisgICAgcHVzaCBAbGlua3MsIHsgaHJlZiA9PiAiJG1v ZEJhc2UtJGFjdHVhbFRhZyRleHBlY3RlZFJlc3VsdEV4dGVuc2lvbiIsIHRleHQgPT4gImFjdHVh bCIgfTsKKyAgICBwdXNoIEBsaW5rcywgeyBocmVmID0+ICIkbW9kQmFzZS0kZGlmZnNUYWcudHh0 IiwgdGV4dCA9PiAiZGlmZiIgfTsKKyAgICBwdXNoIEBsaW5rcywgeyBocmVmID0+ICIkbW9kQmFz ZS0kcHJldHR5RGlmZlRhZy5odG1sIiwgdGV4dCA9PiAicHJldHR5IGRpZmYiIH07CiAKICAgICBy ZXR1cm4gXEBsaW5rczsKIH0K 39140 2009-09-07 04:23:49 -0700 2009-09-07 08:33:23 -0700 Change my patch as discussed on IRC run-webkit-tests.patch text/plain 13686 abecsi SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ4MTEwKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMDktMDcgIEFuZHJhcyBCZWNzaSAgPGJl Y3NpLmFuZHJhc0BzdHVkLnUtc3plZ2VkLmh1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gQ29ycmVjdCBhbmQgY29tcGxldGUgdGhlIGltcGxl bWVudGF0aW9uIG9mIHRoZSBRdC1vbmx5CisgICAgICAgIC0tc3RyaWN0IHN3aXRjaCB3aGljaCBj b21wYXJlcyB0byBNYWMgZXhwZWN0ZWQgZmlsZXMsIGFuZCBhZGQKKyAgICAgICAgLS1leGNsdWRl LW1ldHJpY3Mgd2hpY2ggY29tcGFyZXMgdG8gdGhlIGV4cGVjdGVkIG9mIHRoZSBwb3J0LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg5MDcKKworICAg ICAgICBVc2luZyBydW4td2Via2l0LXRlc3RzIC0tZXhjbHVkZS1tZXRyaWNzIG9uIHRoZSBRdCBw b3J0IHJ1bnMgdGhlIHRlc3RzIHdpdGgKKyAgICAgICAgc2ltcGxpZmllZCBleHBlY3RlZCBhbmQg YWN0dWFsIGZpbGVzICh0aGUgZm9udCByZWxhdGVkIG1ldHJpY3MgZXhjbHVkZWQpLgorICAgICAg ICBJbiB0aGlzIHdheSBvbmx5IHRoZSByZW5kZXIgdHJlZSBpcyBjb21wYXJlZCBhbmQgc28gdGhl IG9idmlvdXMgZGlmZmVyZW5jZXMgY2FuIGJlCisgICAgICAgIHRyYWNrZWQsIGFuZCB0aGUgcmVs YXRlZCBidWdzIGNhbiBiZSBjb3JyZWN0ZWQuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi13ZWJr aXQtdGVzdHM6CisKIDIwMDktMDktMDQgIEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2 aWVycy5jb20+CiAKICAgICAgICAgd3ggYnVpbGQgZml4LiBTd2l0Y2ggVVNFXyBkZWZpbmVzIG92 ZXIgdG8gdGhlIGNvbXBpbGVyIHNvIHRoYXQgdGhleSBjYW4gYmUKSW5kZXg6IFdlYktpdFRvb2xz L1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3Jp cHRzL3J1bi13ZWJraXQtdGVzdHMJKHJldmlzaW9uIDQ4MTEwKQorKysgV2ViS2l0VG9vbHMvU2Ny aXB0cy9ydW4td2Via2l0LXRlc3RzCSh3b3JraW5nIGNvcHkpCkBAIC01LDYgKzUsNyBAQAogIyBD b3B5cmlnaHQgKEMpIDIwMDcgTWF0dCBMaWxlayAocGV3dGVybW9vc2VAZ21haWwuY29tKQogIyBD b3B5cmlnaHQgKEMpIDIwMDcgRXJpYyBTZWlkZWwgPGVyaWNAd2Via2l0Lm9yZz4KICMgQ29weXJp Z2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdo dCAoQykgMjAwOSBBbmRyYXMgQmVjc2kgKGJlY3NpLmFuZHJhc0BzdHVkLnUtc3plZ2VkLmh1KSwg VW5pdmVyc2l0eSBvZiBTemVnZWQKICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTMy LDYgKzEzMyw3IEBAIG15ICR0cmVhdFNraXBwZWQgPSAiZGVmYXVsdCI7CiBteSAkdmVyYm9zZSA9 IDA7CiBteSAkdXNlVmFsZ3JpbmQgPSAwOwogbXkgJHN0cmljdFRlc3RpbmcgPSAwOworbXkgJGV4 Y2x1ZGVNZXRyaWNzID0gMDsKIG15ICRnZW5lcmF0ZU5ld1Jlc3VsdHMgPSBpc0FwcGxlTWFjV2Vi S2l0KCkgPyAxIDogMDsKIG15ICRzdHJpcEVkaXRpbmdDYWxsYmFja3MgPSBpc0N5Z3dpbigpOwog bXkgJHJ1blNhbXBsZSA9IDE7CkBAIC0xNDIsNiArMTQ0LDggQEAgbXkgJG1lcmdlRGVwdGg7CiBt eSAkdGltZW91dFNlY29uZHMgPSAxNTsKIG15ICR1c2VSZW1vdGVMaW5rc1RvVGVzdHMgPSAwOwog bXkgQGxlYWtzRmlsZW5hbWVzOworbXkgJHNpbXBsZUV4cGVjdGVkOworbXkgJHNpbXBsZUFjdHVh bDsKIAogIyBEZWZhdWx0IHRvIC0tbm8taHR0cCBmb3IgUXQsIGFuZCB3eCBmb3Igbm93LgogJHRl c3RIVFRQID0gMCBpZiAoaXNRdCgpIHx8IGlzV3goKSk7CkBAIC0yMjgsNiArMjMyLDcgQEAgVXNh Z2U6ICRwcm9ncmFtTmFtZSBbb3B0aW9uc10gW3Rlc3RkaXJ8dAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG9ubHk6ICAgIE9ubHkgdGhvc2UgdGVzdHMvZGlyZWN0b3JpZXMg bGlzdGVkIGluIHRoZSBTa2lwcGVkIGZpbGUgd2lsbCBiZSBydW4KICAgLS1zbG93ZXN0ICAgICAg ICAgICAgICAgICAgICAgICBSZXBvcnQgdGhlIDEwIHNsb3dlc3QgdGVzdHMKICAgLS1zdHJpY3Qg ICAgICAgICAgICAgICAgICAgICAgICBEbyBhIGNvbXBhcmlzb24gd2l0aCB0aGUgb3V0cHV0IG9u IE1hYyAoUXQgb25seSkKKyAgLS1leGNsdWRlLW1ldHJpY3MgICAgICAgICAgICAgICBSdW4gdGhl IHRlc3RzIHdpdGggdGhlIGZvbnQgcmVsYXRlZCBtZXRyaWNzIGV4Y2x1ZGVkIChRdCBvbmx5KQog ICAtLVtuby1dc3RyaXAtZWRpdGluZy1jYWxsYmFja3MgIFJlbW92ZSBlZGl0aW5nIGNhbGxiYWNr cyBmcm9tIGV4cGVjdGVkIHJlc3VsdHMKICAgLXR8LS10aHJlYWRlZCAgICAgICAgICAgICAgICAg ICBSdW4gYSBjb25jdXJyZW50IEphdmFTY3JpcHQgdGhlYWQgd2l0aCBlYWNoIHRlc3QKICAgLS10 aW1lb3V0IHQgICAgICAgICAgICAgICAgICAgICBTZXRzIHRoZSBudW1iZXIgb2Ygc2Vjb25kcyBi ZWZvcmUgYSB0ZXN0IHRpbWVzIG91dCAoZGVmYXVsdDogJHRpbWVvdXRTZWNvbmRzKQpAQCAtMjY1 LDYgKzI3MCw3IEBAIG15ICRnZXRPcHRpb25zUmVzdWx0ID0gR2V0T3B0aW9ucygKICAgICAndmFs Z3JpbmQnID0+IFwkdXNlVmFsZ3JpbmQsCiAgICAgJ3NhbXBsZS1vbi10aW1lb3V0IScgPT4gXCRy dW5TYW1wbGUsCiAgICAgJ3N0cmljdCcgPT4gXCRzdHJpY3RUZXN0aW5nLAorICAgICdleGNsdWRl LW1ldHJpY3MnID0+IFwkZXhjbHVkZU1ldHJpY3MsCiAgICAgJ3N0cmlwLWVkaXRpbmctY2FsbGJh Y2tzIScgPT4gXCRzdHJpcEVkaXRpbmdDYWxsYmFja3MsCiAgICAgJ3JhbmRvbScgPT4gXCRyYW5k b21pemVUZXN0cywKICAgICAncmV2ZXJzZScgPT4gXCRyZXZlcnNlVGVzdHMsCkBAIC0zNzIsNyAr Mzc4LDcgQEAgaWYgKCRwaXhlbFRlc3RzKSB7CiAgICAgICAgIHByaW50ICJXQVJOSU5HOiBUZW1w b3JhcmlseSBjaGFuZ2luZyB0aGUgbWFpbiBkaXNwbGF5IGNvbG9yIHByb2ZpbGU6XG4iOwogICAg ICAgICBwcmludCAiXHRUaGUgY29sb3JzIG9uIHlvdXIgc2NyZWVuIHdpbGwgY2hhbmdlIGZvciB0 aGUgZHVyYXRpb24gb2YgdGhlIHRlc3RpbmcuXG4iOwogICAgICAgICBwcmludCAiXHRUaGlzIGFs bG93cyB0aGUgcGl4ZWwgdGVzdHMgdG8gaGF2ZSBjb25zaXN0ZW50IGNvbG9yIHZhbHVlcyBhY3Jv c3MgYWxsIG1hY2hpbmVzLlxuIjsKLSAgICAgICAgCisKICAgICAgICAgaWYgKGlzUGVyaWFuSW5z dGFsbGVkKCkpIHsKICAgICAgICAgICAgIHByaW50ICJXQVJOSU5HOiBQZXJpYW4ncyBRdWlja1Rp bWUgY29tcG9uZW50IGlzIGluc3RhbGxlZCBhbmQgdGhpcyBtYXkgYWZmZWN0IHBpeGVsIHRlc3Qg cmVzdWx0cyFcbiI7CiAgICAgICAgICAgICBwcmludCAiXHRZb3Ugc2hvdWxkIGF2b2lkIGdlbmVy YXRpbmcgbmV3IHBpeGVsIHJlc3VsdHMgaW4gdGhpcyBlbnZpcm9ubWVudC5cbiI7CkBAIC01ODYs NyArNTkyLDcgQEAgZm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKIAogICAgIG15ICRiYXNlID0gc3Ry aXBFeHRlbnNpb24oJHRlc3QpOwogICAgIG15ICRleHBlY3RlZEV4dGVuc2lvbiA9ICIudHh0IjsK LSAgICAKKwogICAgIG15ICRkaXIgPSAkYmFzZTsKICAgICAkZGlyID1+IHN8L1teL10rJHx8Owog CkBAIC02MzgsNyArNjQ0LDcgQEAgZm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAgICAgICAgICAg IG15ICRleHBlY3RlZEhhc2ggPSA8RVhQRUNURURIQVNIPjsKICAgICAgICAgICAgIGNob21wKCRl eHBlY3RlZEhhc2gpOwogICAgICAgICAgICAgY2xvc2UgRVhQRUNURURIQVNIOwotICAgICAgICAg ICAgCisKICAgICAgICAgICAgICMgRm9ybWF0IGV4cGVjdGVkIGhhc2ggaW50byBhIHN1ZmZpeCBz dHJpbmcgdGhhdCBpcyBhcHBlbmRlZCB0byB0aGUgcGF0aCAvIFVSTCBwYXNzZWQgdG8gRFJUCiAg ICAgICAgICAgICAkc3VmZml4RXhwZWN0ZWRIYXNoID0gIickZXhwZWN0ZWRIYXNoIjsKICAgICAg ICAgfQpAQCAtNzEwLDE1ICs3MTYsMjAgQEAgZm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAgICAg ICAgfQogICAgICAgICBjbG9zZSBFWFBFQ1RFRDsKICAgICB9Ci0gICAgbXkgJGV4cGVjdGVkTWFj OwotICAgIGlmICghaXNBcHBsZU1hY1dlYktpdCgpICYmICRzdHJpY3RUZXN0aW5nICYmICEkaXNU ZXh0KSB7Ci0gICAgICBpZiAoISRyZXNldFJlc3VsdHMgJiYgb3BlbiBFWFBFQ1RFRCwgIjwiLCAi JHRlc3REaXJlY3RvcnkvcGxhdGZvcm0vbWFjLyRleHBlY3RlZEZpbGVOYW1lIikgewotICAgICAg ICAkZXhwZWN0ZWRNYWMgPSAiIjsKLSAgICAgICAgd2hpbGUgKDxFWFBFQ1RFRD4pIHsKLSAgICAg ICAgICAkZXhwZWN0ZWRNYWMgLj0gJF87CisKKyAgICBpZiAoICFpc0FwcGxlTWFjV2ViS2l0KCkg JiYgJHN0cmljdFRlc3RpbmcgJiYgISRpc1RleHQgKSB7CisgICAgICAgICRleGNsdWRlTWV0cmlj cyA9IDE7CisgICAgICAgIG15ICRleHBlY3RlZEZpbGUgPSAiJHRlc3REaXJlY3RvcnkvcGxhdGZv cm0vbWFjLyRleHBlY3RlZEZpbGVOYW1lIjsKKyAgICAgICAgaWYgKCAhLXMgJGV4cGVjdGVkRmls ZSApIHsKKyAgICAgICAgICAgICRleHBlY3RlZEZpbGUgPSAiJHRlc3REaXJlY3RvcnkvJGV4cGVj dGVkRmlsZU5hbWUiOworICAgICAgICB9CisgICAgICAgIGlmICghJHJlc2V0UmVzdWx0cyAmJiBv cGVuIEVYUEVDVEVELCAiPCIsICIkZXhwZWN0ZWRGaWxlIikgeworICAgICAgICAgICAgJGV4cGVj dGVkID0gIiI7CisgICAgICAgICAgICB3aGlsZSAoPEVYUEVDVEVEPikgeworICAgICAgICAgICAg ICAgICRleHBlY3RlZCAuPSAkXzsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGNsb3NlIEVY UEVDVEVEOwogICAgICAgICB9Ci0gICAgICAgIGNsb3NlIEVYUEVDVEVEOwotICAgICAgfQogICAg IH0KIAogICAgIGlmICgkc2hvdWxkQ2hlY2tMZWFrcyAmJiAkdGVzdHNQZXJEdW1wVG9vbCA9PSAx KSB7CkBAIC03ODUsNyArNzk2LDYgQEAgZm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAgICAgICAg ICAgICAgICAgICAgJGltYWdlRGlmZmVyZW5jZXN7JGJhc2V9ID0gJGRpZmZQZXJjZW50YWdlOwog ICAgICAgICAgICAgICAgICAgICAkZGlmZlJlc3VsdCA9ICQyOwogICAgICAgICAgICAgICAgIH0K LSAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICBpZiAoJGRpZmZQZXJjZW50YWdlID09 IDApIHsKICAgICAgICAgICAgICAgICAgICAgcHJpbnRGYWlsdXJlTWVzc2FnZUZvclRlc3QoJHRl c3QsICJwaXhlbCBoYXNoIGZhaWxlZCAoYnV0IHBpeGVsIHRlc3Qgc3RpbGwgcGFzc2VzKSIpOwog ICAgICAgICAgICAgICAgIH0KQEAgLTgwNCw1NSArODE0LDYzIEBAIGZvciBteSAkdGVzdCAoQHRl c3RzKSB7CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoIWlzQXBwbGVNYWNXZWJLaXQoKSAm JiAkc3RyaWN0VGVzdGluZyAmJiAhJGlzVGV4dCkgewotICAgICAgaWYgKGRlZmluZWQgJGV4cGVj dGVkTWFjKSB7Ci0gICAgICAgIG15ICRzaW1wbGlmaWVkX2FjdHVhbDsKLSAgICAgICAgJHNpbXBs aWZpZWRfYWN0dWFsID0gJGFjdHVhbDsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMv YXQgXCgtP1swLTldKywtP1swLTldK1wpICovL2c7Ci0gICAgICAgICRzaW1wbGlmaWVkX2FjdHVh bCA9fiBzL3NpemUgLT9bMC05XSt4LT9bMC05XSsgKi8vZzsKLSAgICAgICAgJHNpbXBsaWZpZWRf YWN0dWFsID1+IHMvdGV4dCBydW4gd2lkdGggLT9bMC05XSs6IC8vZzsKLSAgICAgICAgJHNpbXBs aWZpZWRfYWN0dWFsID1+IHMvdGV4dCBydW4gd2lkdGggLT9bMC05XSsgW2EtekEtWiBdKzogLy9n OwotICAgICAgICAkc2ltcGxpZmllZF9hY3R1YWwgPX4gcy9SZW5kZXJCdXR0b24ge0JVVFRPTn0g LiovUmVuZGVyQnV0dG9uIHtCVVRUT059L2c7Ci0gICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9 fiBzL1JlbmRlckltYWdlIHtJTlBVVH0gLiovUmVuZGVySW1hZ2Uge0lOUFVUfS9nOwotICAgICAg ICAkc2ltcGxpZmllZF9hY3R1YWwgPX4gcy9SZW5kZXJCbG9jayB7SU5QVVR9IC4qL1JlbmRlckJs b2NrIHtJTlBVVH0vZzsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvUmVuZGVyVGV4 dENvbnRyb2wge0lOUFVUfSAuKi9SZW5kZXJUZXh0Q29udHJvbCB7SU5QVVR9L2c7Ci0gICAgICAg ICRzaW1wbGlmaWVkX2FjdHVhbCA9fiBzL1woWzAtOV0rcHgvcHgvZzsKLSAgICAgICAgJHNpbXBs aWZpZWRfYWN0dWFsID1+IHMvICoiICpcbiArIiAqLyAvZzsKLSAgICAgICAgJHNpbXBsaWZpZWRf YWN0dWFsID1+IHMvIiArJC8iL2c7Ci0KLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMv LSAvLS9nOwotICAgICAgICAkc2ltcGxpZmllZF9hY3R1YWwgPX4gcy9cbiggKikiXHMrL1xuJDEi L2c7Ci0gICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9fiBzL1xzKyJcbi8iXG4vZzsKLSAgICAg ICAgCi0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzL2F0IFwoLT9bMC05XSssLT9bMC05XStcKSAq Ly9nOwotICAgICAgICAkZXhwZWN0ZWRNYWMgPX4gcy9zaXplIC0/WzAtOV0reC0/WzAtOV0rICov L2c7Ci0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzL3RleHQgcnVuIHdpZHRoIC0/WzAtOV0rOiAv L2c7Ci0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzL3RleHQgcnVuIHdpZHRoIC0/WzAtOV0rIFth LXpBLVogXSs6IC8vZzsKLSAgICAgICAgJGV4cGVjdGVkTWFjID1+IHMvUmVuZGVyQnV0dG9uIHtC VVRUT059IC4qL1JlbmRlckJ1dHRvbiB7QlVUVE9OfS9nOwotICAgICAgICAkZXhwZWN0ZWRNYWMg PX4gcy9SZW5kZXJJbWFnZSB7SU5QVVR9IC4qL1JlbmRlckltYWdlIHtJTlBVVH0vZzsKLSAgICAg ICAgJGV4cGVjdGVkTWFjID1+IHMvUmVuZGVyQmxvY2sge0lOUFVUfSAuKi9SZW5kZXJCbG9jayB7 SU5QVVR9L2c7Ci0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzL1JlbmRlclRleHRDb250cm9sIHtJ TlBVVH0gLiovUmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfS9nOwotICAgICAgICAkZXhwZWN0ZWRN YWMgPX4gcy9cKFswLTldK3B4L3B4L2c7Ci0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzLyAqIiAq XG4gKyIgKi8gL2c7Ci0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzLyIgKyQvIi9nOwotCi0gICAg ICAgICRleHBlY3RlZE1hYyA9fiBzLy0gLy0vZzsKLSAgICAgICAgJGV4cGVjdGVkTWFjID1+IHMv XG4oICopIlxzKy9cbiQxIi9nOwotICAgICAgICAkZXhwZWN0ZWRNYWMgPX4gcy9ccysiXG4vIlxu L2c7Ci0gICAgICAgIAotICAgICAgICBpZiAoJHNpbXBsaWZpZWRfYWN0dWFsIG5lICRleHBlY3Rl ZE1hYykgewotICAgICAgICAgIHdyaXRlVG9GaWxlKCIvdG1wL2FjdHVhbC50eHQiLCAkc2ltcGxp ZmllZF9hY3R1YWwpOwotICAgICAgICAgIHdyaXRlVG9GaWxlKCIvdG1wL2V4cGVjdGVkLnR4dCIs ICRleHBlY3RlZE1hYyk7Ci0gICAgICAgICAgc3lzdGVtICJkaWZmIC11IFwiL3RtcC9leHBlY3Rl ZC50eHRcIiBcIi90bXAvYWN0dWFsLnR4dFwiID4gXCIvdG1wL3NpbXBsaWZpZWQuZGlmZlwiIjsK LQotICAgICAgICAgICRkaWZmUmVzdWx0ID0gImZhaWxlZCI7Ci0gICAgICAgICAgaWYgKCR2ZXJi b3NlKSB7Ci0gICAgICAgICAgICBwcmludCAiXG4iOwotICAgICAgICAgICAgc3lzdGVtICJjYXQg L3RtcC9zaW1wbGlmaWVkLmRpZmYiOwotICAgICAgICAgICAgcHJpbnQgImZhaWxlZCEhISEhIjsK LSAgICAgICAgICB9CisgICAgaWYgKCFpc0FwcGxlTWFjV2ViS2l0KCkgJiYgJGV4Y2x1ZGVNZXRy aWNzICYmICEkaXNUZXh0KSB7CisgICAgICAgICRzaW1wbGVFeHBlY3RlZCA9ICRleHBlY3RlZDsK KyAgICAgICAgaWYgKGRlZmluZWQgJHNpbXBsZUV4cGVjdGVkKSB7CisgICAgICAgICAgICAkc2lt cGxlQWN0dWFsID0gJGFjdHVhbDsKKyAgICAgICAgICAgICRzaW1wbGVBY3R1YWwgPX4gcy9hdCBc KC0/WzAtOV0rLC0/WzAtOV0rXCkgKi8vZzsKKyAgICAgICAgICAgICRzaW1wbGVBY3R1YWwgPX4g cy9zaXplIC0/WzAtOV0reC0/WzAtOV0rICovL2c7CisgICAgICAgICAgICAkc2ltcGxlQWN0dWFs ID1+IHMvdGV4dCBydW4gd2lkdGggLT9bMC05XSs6IC8vZzsKKyAgICAgICAgICAgICRzaW1wbGVB Y3R1YWwgPX4gcy90ZXh0IHJ1biB3aWR0aCAtP1swLTldKyBbYS16QS1aIF0rOiAvL2c7CisgICAg ICAgICAgICAkc2ltcGxlQWN0dWFsID1+IHMvUmVuZGVyQnV0dG9uIHtCVVRUT059IC4qL1JlbmRl ckJ1dHRvbiB7QlVUVE9OfS9nOworICAgICAgICAgICAgJHNpbXBsZUFjdHVhbCA9fiBzL1JlbmRl ckltYWdlIHtJTlBVVH0gLiovUmVuZGVySW1hZ2Uge0lOUFVUfS9nOworICAgICAgICAgICAgJHNp bXBsZUFjdHVhbCA9fiBzL1JlbmRlckJsb2NrIHtJTlBVVH0gLiovUmVuZGVyQmxvY2sge0lOUFVU fS9nOworICAgICAgICAgICAgJHNpbXBsZUFjdHVhbCA9fiBzL1JlbmRlclRleHRDb250cm9sIHtJ TlBVVH0gLiovUmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfS9nOworICAgICAgICAgICAgJHNpbXBs ZUFjdHVhbCA9fiBzL1woWzAtOV0rcHgvcHgvZzsKKyAgICAgICAgICAgICRzaW1wbGVBY3R1YWwg PX4gcy8gKiIgKlxuICsiICovIC9nOworICAgICAgICAgICAgJHNpbXBsZUFjdHVhbCA9fiBzLyIg KyQvIi9nOworCisgICAgICAgICAgICAkc2ltcGxlQWN0dWFsID1+IHMvLSAvLS9nOworICAgICAg ICAgICAgJHNpbXBsZUFjdHVhbCA9fiBzL1xuKCAqKSJccysvXG4kMSIvZzsKKyAgICAgICAgICAg ICRzaW1wbGVBY3R1YWwgPX4gcy9ccysiXG4vIlxuL2c7CisgICAgICAgICAgICAkc2ltcGxlQWN0 dWFsID1+IHMvc2Nyb2xsV2lkdGggWzAtOV0rL3Njcm9sbFdpZHRoL2c7CisgICAgICAgICAgICAk c2ltcGxlQWN0dWFsID1+IHMvc2Nyb2xsSGVpZ2h0IFswLTldKy9zY3JvbGxIZWlnaHQvZzsKKwor ICAgICAgICAgICAgJHNpbXBsZUV4cGVjdGVkID1+IHMvYXQgXCgtP1swLTldKywtP1swLTldK1wp ICovL2c7CisgICAgICAgICAgICAkc2ltcGxlRXhwZWN0ZWQgPX4gcy9zaXplIC0/WzAtOV0reC0/ WzAtOV0rICovL2c7CisgICAgICAgICAgICAkc2ltcGxlRXhwZWN0ZWQgPX4gcy90ZXh0IHJ1biB3 aWR0aCAtP1swLTldKzogLy9nOworICAgICAgICAgICAgJHNpbXBsZUV4cGVjdGVkID1+IHMvdGV4 dCBydW4gd2lkdGggLT9bMC05XSsgW2EtekEtWiBdKzogLy9nOworICAgICAgICAgICAgJHNpbXBs ZUV4cGVjdGVkID1+IHMvUmVuZGVyQnV0dG9uIHtCVVRUT059IC4qL1JlbmRlckJ1dHRvbiB7QlVU VE9OfS9nOworICAgICAgICAgICAgJHNpbXBsZUV4cGVjdGVkID1+IHMvUmVuZGVySW1hZ2Uge0lO UFVUfSAuKi9SZW5kZXJJbWFnZSB7SU5QVVR9L2c7CisgICAgICAgICAgICAkc2ltcGxlRXhwZWN0 ZWQgPX4gcy9SZW5kZXJCbG9jayB7SU5QVVR9IC4qL1JlbmRlckJsb2NrIHtJTlBVVH0vZzsKKyAg ICAgICAgICAgICRzaW1wbGVFeHBlY3RlZCA9fiBzL1JlbmRlclRleHRDb250cm9sIHtJTlBVVH0g LiovUmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfS9nOworICAgICAgICAgICAgJHNpbXBsZUV4cGVj dGVkID1+IHMvXChbMC05XStweC9weC9nOworICAgICAgICAgICAgJHNpbXBsZUV4cGVjdGVkID1+ IHMvICoiICpcbiArIiAqLyAvZzsKKyAgICAgICAgICAgICRzaW1wbGVFeHBlY3RlZCA9fiBzLyIg KyQvIi9nOworCisgICAgICAgICAgICAkc2ltcGxlRXhwZWN0ZWQgPX4gcy8tIC8tL2c7CisgICAg ICAgICAgICAkc2ltcGxlRXhwZWN0ZWQgPX4gcy9cbiggKikiXHMrL1xuJDEiL2c7CisgICAgICAg ICAgICAkc2ltcGxlRXhwZWN0ZWQgPX4gcy9ccysiXG4vIlxuL2c7CisgICAgICAgICAgICAkc2lt cGxlRXhwZWN0ZWQgPX4gcy9zY3JvbGxXaWR0aCBbMC05XSsvc2Nyb2xsV2lkdGgvZzsKKyAgICAg ICAgICAgICRzaW1wbGVFeHBlY3RlZCA9fiBzL3Njcm9sbEhlaWdodCBbMC05XSsvc2Nyb2xsSGVp Z2h0L2c7CisKKyAgICAgICAgICAgIGlmICggJHNpbXBsZUV4cGVjdGVkIG5lICRzaW1wbGVBY3R1 YWwgKXsKKyAgICAgICAgICAgICAgICBteSAkc2ltcGxpZmllZERpciA9IGNhdGZpbGUoJHRlc3RS ZXN1bHRzRGlyZWN0b3J5LCBkaXJuYW1lKCRiYXNlKSwgInNpbXBsaWZpZWQiKTsKKyAgICAgICAg ICAgICAgICBteSAkc2ltcGxpZmllZEZpbGUgPSBjYXRmaWxlKCAkc2ltcGxpZmllZERpciwgYmFz ZW5hbWUoJGJhc2UpKTsKKyAgICAgICAgICAgICAgICBta3BhdGggJHNpbXBsaWZpZWREaXI7CisK KyAgICAgICAgICAgICAgICB3cml0ZVRvRmlsZSgiJHNpbXBsaWZpZWRGaWxlLWFjdHVhbC50eHQi LCAkc2ltcGxlQWN0dWFsKTsKKyAgICAgICAgICAgICAgICB3cml0ZVRvRmlsZSgiJHNpbXBsaWZp ZWRGaWxlLWV4cGVjdGVkLnR4dCIsICRzaW1wbGVFeHBlY3RlZCk7CisgICAgICAgICAgICAgICAg c3lzdGVtICJkaWZmIC11IFwiJHNpbXBsaWZpZWRGaWxlLWV4cGVjdGVkLnR4dFwiIFwiJHNpbXBs aWZpZWRGaWxlLWFjdHVhbC50eHRcIiA+IFwiJHNpbXBsaWZpZWRGaWxlLWRpZmZzLnR4dFwiIjsK KworICAgICAgICAgICAgICAgIG15ICRwcmV0dHlEaWZmT3V0cHV0UGF0aCA9ICIkc2ltcGxpZmll ZEZpbGUtJHByZXR0eURpZmZUYWcuaHRtbCI7CisgICAgICAgICAgICAgICAgbXkgJHByZXR0eVBh dGNoUGF0aCA9ICJCdWdzU2l0ZS9QcmV0dHlQYXRjaC8iOworICAgICAgICAgICAgICAgIG15ICRw cmV0dGlmeVBhdGggPSAiJHByZXR0eVBhdGNoUGF0aC9wcmV0dGlmeS5yYiI7CisgICAgICAgICAg ICAgICAgc3lzdGVtICJydWJ5IC1JIFwiJHByZXR0eVBhdGNoUGF0aFwiIFwiJHByZXR0aWZ5UGF0 aFwiIFwiJHNpbXBsaWZpZWRGaWxlLWRpZmZzLnR4dFwiID4gXCIkcHJldHR5RGlmZk91dHB1dFBh dGhcIiI7CisKKyAgICAgICAgICAgICAgICAkZGlmZlJlc3VsdCA9ICJmYWlsZWQiOworICAgICAg ICAgICAgfQogICAgICAgICB9Ci0gICAgICB9CiAgICAgfQogCiAgICAgaWYgKGR1bXBUb29sRGlk Q3Jhc2goKSkgewpAQCAtOTAxLDYgKzkxOSwyMCBAQCBmb3IgbXkgJHRlc3QgKEB0ZXN0cykgewog CiAgICAgICAgIG15ICRtZXNzYWdlID0gISR0ZXN0RmFpbGVkID8gInBpeGVsIHRlc3QgZmFpbGVk IiA6ICJmYWlsZWQiOwogCisgICAgICAgIGlmICggJGV4Y2x1ZGVNZXRyaWNzICkgeworICAgICAg ICAgICAgaWYgKCAhZGVmaW5lZCAkc2ltcGxlRXhwZWN0ZWQgKSB7CisgICAgICAgICAgICAgICAg JG1lc3NhZ2UgPSAibmV3IjsKKyAgICAgICAgICAgICAgICAkcmVzdWx0ID0gJG1lc3NhZ2U7Cisg ICAgICAgICAgICB9IGVsc2lmICggJHNpbXBsZUV4cGVjdGVkIGVxICRzaW1wbGVBY3R1YWwgJiYg ISRpc1RleHQgKXsKKyAgICAgICAgICAgICAgICAkbWVzc2FnZSA9ICJzaW1wbGlmaWVkIG1hdGNo IjsKKyAgICAgICAgICAgICAgICAkcmVzdWx0ID0gIm1hdGNoIjsKKyAgICAgICAgICAgIH0gZWxz aWYgKCAhJGlzVGV4dCApeworICAgICAgICAgICAgICAgICRtZXNzYWdlID0gInJlbmRlciB0cmVl IGNvbXBhcmlzb24gZmFpbGVkIjsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAg ICAgJG1lc3NhZ2UgPSAic2hvdWxkIGJlIHRleHQgb25seSI7CisgICAgICAgICAgICB9CisgICAg ICAgIH0KKwogICAgICAgICBpZiAoKCR0ZXN0RmFpbGVkIHx8ICRwaXhlbFRlc3RGYWlsZWQpICYm ICRhZGRQbGF0Zm9ybUV4Y2VwdGlvbnMpIHsKICAgICAgICAgICAgIG15ICR0ZXN0QmFzZSA9IGNh dGZpbGUoJHRlc3REaXJlY3RvcnksICRiYXNlKTsKICAgICAgICAgICAgIG15ICRleHBlY3RlZEJh c2UgPSBjYXRmaWxlKCRleHBlY3RlZERpciwgJGJhc2UpOwpAQCAtMTc2NSwxNSArMTc5NywyNCBA QCBzdWIgbGlua3NGb3JFeHBlY3RlZEFuZEFjdHVhbFJlc3VsdHMoJCkKIAogICAgIG15IEBsaW5r cyA9ICgpOwogCi0gICAgcmV0dXJuIFxAbGlua3MgdW5sZXNzIC1zICIkdGVzdFJlc3VsdHNEaXJl Y3RvcnkvJGJhc2UtJGRpZmZzVGFnLnR4dCI7Ci0gICAgCi0gICAgbXkgJGV4cGVjdGVkUmVzdWx0 UGF0aCA9ICRleHBlY3RlZFJlc3VsdFBhdGhzeyRiYXNlfTsKKyAgICBteSAkbW9kQmFzZSA9ICRi YXNlOworICAgIG15ICRleHBlY3RlZFJlc3VsdFBhdGg9ICRleHBlY3RlZFJlc3VsdFBhdGhzeyRi YXNlfTsKICAgICBteSAoJGV4cGVjdGVkUmVzdWx0RmlsZU5hbWUsICRleHBlY3RlZFJlc3VsdHNE aXJlY3RvcnksICRleHBlY3RlZFJlc3VsdEV4dGVuc2lvbikgPSBmaWxlcGFyc2UoJGV4cGVjdGVk UmVzdWx0UGF0aCwgcXJ7XC5bXi5dKyR9KTsKIAotICAgIHB1c2ggQGxpbmtzLCB7IGhyZWYgPT4g IiRiYXNlLSRleHBlY3RlZFRhZyRleHBlY3RlZFJlc3VsdEV4dGVuc2lvbiIsIHRleHQgPT4gImV4 cGVjdGVkIiB9OwotICAgIHB1c2ggQGxpbmtzLCB7IGhyZWYgPT4gIiRiYXNlLSRhY3R1YWxUYWck ZXhwZWN0ZWRSZXN1bHRFeHRlbnNpb24iLCB0ZXh0ID0+ICJhY3R1YWwiIH07Ci0gICAgcHVzaCBA bGlua3MsIHsgaHJlZiA9PiAiJGJhc2UtJGRpZmZzVGFnLnR4dCIsIHRleHQgPT4gImRpZmYiIH07 Ci0gICAgcHVzaCBAbGlua3MsIHsgaHJlZiA9PiAiJGJhc2UtJHByZXR0eURpZmZUYWcuaHRtbCIs IHRleHQgPT4gInByZXR0eSBkaWZmIiB9OworICAgIHJldHVybiBcQGxpbmtzIHVubGVzcyAtcyAi JHRlc3RSZXN1bHRzRGlyZWN0b3J5LyRiYXNlLSRkaWZmc1RhZy50eHQiIHx8ICRleGNsdWRlTWV0 cmljczsKKworICAgIG15ICRzaW1wbGlmaWVkRGlyID0gY2F0ZmlsZSgkdGVzdFJlc3VsdHNEaXJl Y3RvcnksIGRpcm5hbWUoJGJhc2UpLCAic2ltcGxpZmllZCIpOworCisgICAgaWYgKCAkZXhjbHVk ZU1ldHJpY3MgJiYgLWQgIiRzaW1wbGlmaWVkRGlyIiApIHsKKyAgICAgICAgJG1vZEJhc2UgPSBj YXRmaWxlKCAkc2ltcGxpZmllZERpciwgYmFzZW5hbWUoJGJhc2UpKTsKKyAgICAgICAgJGV4cGVj dGVkUmVzdWx0UGF0aCA9ICRzaW1wbGlmaWVkRGlyOworICAgICAgICAkZXhwZWN0ZWRSZXN1bHRF eHRlbnNpb24gPSAiLnR4dCI7CisgICAgfQorCisgICAgcHVzaCBAbGlua3MsIHsgaHJlZiA9PiAi JG1vZEJhc2UtJGV4cGVjdGVkVGFnJGV4cGVjdGVkUmVzdWx0RXh0ZW5zaW9uIiwgdGV4dCA9PiAi ZXhwZWN0ZWQiIH07CisgICAgcHVzaCBAbGlua3MsIHsgaHJlZiA9PiAiJG1vZEJhc2UtJGFjdHVh bFRhZyRleHBlY3RlZFJlc3VsdEV4dGVuc2lvbiIsIHRleHQgPT4gImFjdHVhbCIgfTsKKyAgICBw dXNoIEBsaW5rcywgeyBocmVmID0+ICIkbW9kQmFzZS0kZGlmZnNUYWcudHh0IiwgdGV4dCA9PiAi ZGlmZiIgfTsKKyAgICBwdXNoIEBsaW5rcywgeyBocmVmID0+ICIkbW9kQmFzZS0kcHJldHR5RGlm ZlRhZy5odG1sIiwgdGV4dCA9PiAicHJldHR5IGRpZmYiIH07CiAKICAgICByZXR1cm4gXEBsaW5r czsKIH0K 39149 2009-09-07 08:33:23 -0700 2009-09-07 10:34:40 -0700 Refactor --strict switch to --ignore-metrics ignore-metrics.patch text/plain 9726 abecsi SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ4MTE0KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMDktMDcgIEFuZHJhcyBCZWNzaSAgPGJl Y3NpLmFuZHJhc0BzdHVkLnUtc3plZ2VkLmh1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yIC0tc3RyaWN0IHN3aXRjaCB0byAtLWlnbm9y ZS1tZXRyaWNzIGFuZCBjb3JyZWN0IHRoZQorICAgICAgICBpbXBsZW1lbnRhdGlvbiB0byBtYWtl IHRoZSBmZWF0dXJlIHVzYWJsZSBvbiBhbGwgcGxhdGZvcm1zLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg5MDcKKworICAgICAgICBydW4td2Via2l0 LXRlc3RzIC0taWdub3JlLW1ldHJpY3MgY29tcGFyZXMgc2ltcGxpZmllZCBleHBlY3RlZAorICAg ICAgICBhZ2FpbnN0IHNpbXBsaWZpZWQgYWN0dWFsIGZpbGVzICh0aGUgZm9udCByZWxhdGVkIG1l dHJpY3MgZXhjbHVkZWQpLgorICAgICAgICBJbiB0aGlzIHdheSBvbmx5IHRoZSByZW5kZXIgdHJl ZSBpcyBjaGVja2VkIGFuZCBzbyB0aGUgb2J2aW91cworICAgICAgICBkaWZmZXJlbmNlcyBjYW4g YmUgdHJhY2tlZC4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLXdlYmtpdC10ZXN0czoKKwogMjAw OS0wOS0wNCAgS2V2aW4gT2xsaXZpZXIgIDxrZXZpbm9AdGhlb2xsaXZpZXJzLmNvbT4KIAogICAg ICAgICB3eCBidWlsZCBmaXguIFN3aXRjaCBVU0VfIGRlZmluZXMgb3ZlciB0byB0aGUgY29tcGls ZXIgc28gdGhhdCB0aGV5IGNhbiBiZQpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Vi a2l0LXRlc3RzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10 ZXN0cwkocmV2aXNpb24gNDgxMTQpCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQt dGVzdHMJKHdvcmtpbmcgY29weSkKQEAgLTUsNiArNSw3IEBACiAjIENvcHlyaWdodCAoQykgMjAw NyBNYXR0IExpbGVrIChwZXd0ZXJtb29zZUBnbWFpbC5jb20pCiAjIENvcHlyaWdodCAoQykgMjAw NyBFcmljIFNlaWRlbCA8ZXJpY0B3ZWJraXQub3JnPgogIyBDb3B5cmlnaHQgKEMpIDIwMDkgR29v Z2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDA5IEFuZHJh cyBCZWNzaSAoYmVjc2kuYW5kcmFzQHN0dWQudS1zemVnZWQuaHUpLCBVbml2ZXJzaXR5IG9mIFN6 ZWdlZAogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0xMDUsNiArMTA2LDcgQEAgc3Vi IHBhcnNlTGVha3NhbmRQcmludFVuaXF1ZUxlYWtzKCk7CiBzdWIgcmVhZEZyb21EdW1wVG9vbFdp dGhUaW1lcigqKik7CiBzdWIgc2V0RmlsZUhhbmRsZU5vbkJsb2NraW5nKCokKTsKIHN1YiB3cml0 ZVRvRmlsZSgkJCk7CitzdWIgc2ltcGxpZnkoJCQpOwogCiAjIEFyZ3VtZW50IGhhbmRsaW5nCiBt eSAkYWRkUGxhdGZvcm1FeGNlcHRpb25zID0gMDsKQEAgLTEzMSw3ICsxMzMsNyBAQCBteSAkdG9s ZXJhbmNlID0gMDsKIG15ICR0cmVhdFNraXBwZWQgPSAiZGVmYXVsdCI7CiBteSAkdmVyYm9zZSA9 IDA7CiBteSAkdXNlVmFsZ3JpbmQgPSAwOwotbXkgJHN0cmljdFRlc3RpbmcgPSAwOworbXkgJGln bm9yZU1ldHJpY3MgPSAwOwogbXkgJGdlbmVyYXRlTmV3UmVzdWx0cyA9IGlzQXBwbGVNYWNXZWJL aXQoKSA/IDEgOiAwOwogbXkgJHN0cmlwRWRpdGluZ0NhbGxiYWNrcyA9IGlzQ3lnd2luKCk7CiBt eSAkcnVuU2FtcGxlID0gMTsKQEAgLTE0Nyw2ICsxNDksNyBAQCBteSBAbGVha3NGaWxlbmFtZXM7 CiAkdGVzdEhUVFAgPSAwIGlmIChpc1F0KCkgfHwgaXNXeCgpKTsKIAogbXkgJGV4cGVjdGVkVGFn ID0gImV4cGVjdGVkIjsKK215ICRzaW1wbGVUYWcgPSAic2ltcGxlIjsKIG15ICRhY3R1YWxUYWcg PSAiYWN0dWFsIjsKIG15ICRwcmV0dHlEaWZmVGFnID0gInByZXR0eS1kaWZmIjsKIG15ICRkaWZm c1RhZyA9ICJkaWZmcyI7CkBAIC0xOTUsNyArMTk4LDYgQEAgbXkgJGxhdW5jaFNhZmFyaURlZmF1 bHQgPSAkbGF1bmNoU2FmYXJpIAogbXkgJGh0dHBEZWZhdWx0ID0gJHRlc3RIVFRQID8gInJ1biIg OiAiZG8gbm90IHJ1biI7CiBteSAkc2FtcGxlRGVmYXVsdCA9ICRydW5TYW1wbGUgPyAicnVuIiA6 ICJkbyBub3QgcnVuIjsKIAotIyBGSVhNRTogIi0tc3RyaWN0IiBzaG91bGQgYmUgcmVuYW1lZCB0 byBxdC1tYWMtY29tcGFyaXNvbiwgb3Igc29tZXRoaW5nIGFsb25nIHRob3NlIGxpbmVzLgogbXkg JHVzYWdlID0gPDxFT0Y7CiBVc2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbdGVzdGRpcnx0 ZXN0cGF0aCAuLi5dCiAgIC0tYWRkLXBsYXRmb3JtLWV4Y2VwdGlvbnMgICAgICAgUHV0IG5ldyBy ZXN1bHRzIGZvciBub24tcGxhdGZvcm0tc3BlY2lmaWMgZmFpbGluZyB0ZXN0cyBpbnRvIHRoZSBw bGF0Zm9ybS1zcGVjaWZpYyByZXN1bHRzIGRpcmVjdG9yeQpAQCAtMjI3LDcgKzIyOSw3IEBAIFVz YWdlOiAkcHJvZ3JhbU5hbWUgW29wdGlvbnNdIFt0ZXN0ZGlyfHQKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBpZ25vcmU6ICBUaGUgU2tpcHBlZCBmaWxlIGlzIGlnbm9yZWQK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvbmx5OiAgICBPbmx5IHRob3Nl IHRlc3RzL2RpcmVjdG9yaWVzIGxpc3RlZCBpbiB0aGUgU2tpcHBlZCBmaWxlIHdpbGwgYmUgcnVu CiAgIC0tc2xvd2VzdCAgICAgICAgICAgICAgICAgICAgICAgUmVwb3J0IHRoZSAxMCBzbG93ZXN0 IHRlc3RzCi0gIC0tc3RyaWN0ICAgICAgICAgICAgICAgICAgICAgICAgRG8gYSBjb21wYXJpc29u IHdpdGggdGhlIG91dHB1dCBvbiBNYWMgKFF0IG9ubHkpCisgIC0taWdub3JlLW1ldHJpY3MgICAg ICAgICAgICAgICAgSWdub3JlIG1ldHJpY3MgaW4gdGVzdHMKICAgLS1bbm8tXXN0cmlwLWVkaXRp bmctY2FsbGJhY2tzICBSZW1vdmUgZWRpdGluZyBjYWxsYmFja3MgZnJvbSBleHBlY3RlZCByZXN1 bHRzCiAgIC10fC0tdGhyZWFkZWQgICAgICAgICAgICAgICAgICAgUnVuIGEgY29uY3VycmVudCBK YXZhU2NyaXB0IHRoZWFkIHdpdGggZWFjaCB0ZXN0CiAgIC0tdGltZW91dCB0ICAgICAgICAgICAg ICAgICAgICAgU2V0cyB0aGUgbnVtYmVyIG9mIHNlY29uZHMgYmVmb3JlIGEgdGVzdCB0aW1lcyBv dXQgKGRlZmF1bHQ6ICR0aW1lb3V0U2Vjb25kcykKQEAgLTI2NCw3ICsyNjYsNyBAQCBteSAkZ2V0 T3B0aW9uc1Jlc3VsdCA9IEdldE9wdGlvbnMoCiAgICAgJ3ZlcmJvc2V8dicgPT4gXCR2ZXJib3Nl LAogICAgICd2YWxncmluZCcgPT4gXCR1c2VWYWxncmluZCwKICAgICAnc2FtcGxlLW9uLXRpbWVv dXQhJyA9PiBcJHJ1blNhbXBsZSwKLSAgICAnc3RyaWN0JyA9PiBcJHN0cmljdFRlc3RpbmcsCisg ICAgJ2lnbm9yZS1tZXRyaWNzJyA9PiBcJGlnbm9yZU1ldHJpY3MsCiAgICAgJ3N0cmlwLWVkaXRp bmctY2FsbGJhY2tzIScgPT4gXCRzdHJpcEVkaXRpbmdDYWxsYmFja3MsCiAgICAgJ3JhbmRvbScg PT4gXCRyYW5kb21pemVUZXN0cywKICAgICAncmV2ZXJzZScgPT4gXCRyZXZlcnNlVGVzdHMsCkBA IC03MTAsMTUgKzcxMiw5IEBAIGZvciBteSAkdGVzdCAoQHRlc3RzKSB7CiAgICAgICAgIH0KICAg ICAgICAgY2xvc2UgRVhQRUNURUQ7CiAgICAgfQotICAgIG15ICRleHBlY3RlZE1hYzsKLSAgICBp ZiAoIWlzQXBwbGVNYWNXZWJLaXQoKSAmJiAkc3RyaWN0VGVzdGluZyAmJiAhJGlzVGV4dCkgewot ICAgICAgaWYgKCEkcmVzZXRSZXN1bHRzICYmIG9wZW4gRVhQRUNURUQsICI8IiwgIiR0ZXN0RGly ZWN0b3J5L3BsYXRmb3JtL21hYy8kZXhwZWN0ZWRGaWxlTmFtZSIpIHsKLSAgICAgICAgJGV4cGVj dGVkTWFjID0gIiI7Ci0gICAgICAgIHdoaWxlICg8RVhQRUNURUQ+KSB7Ci0gICAgICAgICAgJGV4 cGVjdGVkTWFjIC49ICRfOwotICAgICAgICB9Ci0gICAgICAgIGNsb3NlIEVYUEVDVEVEOwotICAg ICAgfQorCisgICAgaWYgKCRpZ25vcmVNZXRyaWNzICYmICEkaXNUZXh0KSB7CisgICAgICAgICgk YWN0dWFsLCRleHBlY3RlZCkgPSBzaW1wbGlmeSgkYWN0dWFsLCAkZXhwZWN0ZWQpOwogICAgIH0K IAogICAgIGlmICgkc2hvdWxkQ2hlY2tMZWFrcyAmJiAkdGVzdHNQZXJEdW1wVG9vbCA9PSAxKSB7 CkBAIC04MDQsNTcgKzgwMCw2IEBAIGZvciBteSAkdGVzdCAoQHRlc3RzKSB7CiAgICAgICAgIH0K ICAgICB9CiAKLSAgICBpZiAoIWlzQXBwbGVNYWNXZWJLaXQoKSAmJiAkc3RyaWN0VGVzdGluZyAm JiAhJGlzVGV4dCkgewotICAgICAgaWYgKGRlZmluZWQgJGV4cGVjdGVkTWFjKSB7Ci0gICAgICAg IG15ICRzaW1wbGlmaWVkX2FjdHVhbDsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID0gJGFj dHVhbDsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvYXQgXCgtP1swLTldKywtP1sw LTldK1wpICovL2c7Ci0gICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9fiBzL3NpemUgLT9bMC05 XSt4LT9bMC05XSsgKi8vZzsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvdGV4dCBy dW4gd2lkdGggLT9bMC05XSs6IC8vZzsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMv dGV4dCBydW4gd2lkdGggLT9bMC05XSsgW2EtekEtWiBdKzogLy9nOwotICAgICAgICAkc2ltcGxp ZmllZF9hY3R1YWwgPX4gcy9SZW5kZXJCdXR0b24ge0JVVFRPTn0gLiovUmVuZGVyQnV0dG9uIHtC VVRUT059L2c7Ci0gICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9fiBzL1JlbmRlckltYWdlIHtJ TlBVVH0gLiovUmVuZGVySW1hZ2Uge0lOUFVUfS9nOwotICAgICAgICAkc2ltcGxpZmllZF9hY3R1 YWwgPX4gcy9SZW5kZXJCbG9jayB7SU5QVVR9IC4qL1JlbmRlckJsb2NrIHtJTlBVVH0vZzsKLSAg ICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvUmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfSAu Ki9SZW5kZXJUZXh0Q29udHJvbCB7SU5QVVR9L2c7Ci0gICAgICAgICRzaW1wbGlmaWVkX2FjdHVh bCA9fiBzL1woWzAtOV0rcHgvcHgvZzsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMv ICoiICpcbiArIiAqLyAvZzsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvIiArJC8i L2c7Ci0KLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvLSAvLS9nOwotICAgICAgICAk c2ltcGxpZmllZF9hY3R1YWwgPX4gcy9cbiggKikiXHMrL1xuJDEiL2c7Ci0gICAgICAgICRzaW1w bGlmaWVkX2FjdHVhbCA9fiBzL1xzKyJcbi8iXG4vZzsKLSAgICAgICAgCi0gICAgICAgICRleHBl Y3RlZE1hYyA9fiBzL2F0IFwoLT9bMC05XSssLT9bMC05XStcKSAqLy9nOwotICAgICAgICAkZXhw ZWN0ZWRNYWMgPX4gcy9zaXplIC0/WzAtOV0reC0/WzAtOV0rICovL2c7Ci0gICAgICAgICRleHBl Y3RlZE1hYyA9fiBzL3RleHQgcnVuIHdpZHRoIC0/WzAtOV0rOiAvL2c7Ci0gICAgICAgICRleHBl Y3RlZE1hYyA9fiBzL3RleHQgcnVuIHdpZHRoIC0/WzAtOV0rIFthLXpBLVogXSs6IC8vZzsKLSAg ICAgICAgJGV4cGVjdGVkTWFjID1+IHMvUmVuZGVyQnV0dG9uIHtCVVRUT059IC4qL1JlbmRlckJ1 dHRvbiB7QlVUVE9OfS9nOwotICAgICAgICAkZXhwZWN0ZWRNYWMgPX4gcy9SZW5kZXJJbWFnZSB7 SU5QVVR9IC4qL1JlbmRlckltYWdlIHtJTlBVVH0vZzsKLSAgICAgICAgJGV4cGVjdGVkTWFjID1+ IHMvUmVuZGVyQmxvY2sge0lOUFVUfSAuKi9SZW5kZXJCbG9jayB7SU5QVVR9L2c7Ci0gICAgICAg ICRleHBlY3RlZE1hYyA9fiBzL1JlbmRlclRleHRDb250cm9sIHtJTlBVVH0gLiovUmVuZGVyVGV4 dENvbnRyb2wge0lOUFVUfS9nOwotICAgICAgICAkZXhwZWN0ZWRNYWMgPX4gcy9cKFswLTldK3B4 L3B4L2c7Ci0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzLyAqIiAqXG4gKyIgKi8gL2c7Ci0gICAg ICAgICRleHBlY3RlZE1hYyA9fiBzLyIgKyQvIi9nOwotCi0gICAgICAgICRleHBlY3RlZE1hYyA9 fiBzLy0gLy0vZzsKLSAgICAgICAgJGV4cGVjdGVkTWFjID1+IHMvXG4oICopIlxzKy9cbiQxIi9n OwotICAgICAgICAkZXhwZWN0ZWRNYWMgPX4gcy9ccysiXG4vIlxuL2c7Ci0gICAgICAgIAotICAg ICAgICBpZiAoJHNpbXBsaWZpZWRfYWN0dWFsIG5lICRleHBlY3RlZE1hYykgewotICAgICAgICAg IHdyaXRlVG9GaWxlKCIvdG1wL2FjdHVhbC50eHQiLCAkc2ltcGxpZmllZF9hY3R1YWwpOwotICAg ICAgICAgIHdyaXRlVG9GaWxlKCIvdG1wL2V4cGVjdGVkLnR4dCIsICRleHBlY3RlZE1hYyk7Ci0g ICAgICAgICAgc3lzdGVtICJkaWZmIC11IFwiL3RtcC9leHBlY3RlZC50eHRcIiBcIi90bXAvYWN0 dWFsLnR4dFwiID4gXCIvdG1wL3NpbXBsaWZpZWQuZGlmZlwiIjsKLQotICAgICAgICAgICRkaWZm UmVzdWx0ID0gImZhaWxlZCI7Ci0gICAgICAgICAgaWYgKCR2ZXJib3NlKSB7Ci0gICAgICAgICAg ICBwcmludCAiXG4iOwotICAgICAgICAgICAgc3lzdGVtICJjYXQgL3RtcC9zaW1wbGlmaWVkLmRp ZmYiOwotICAgICAgICAgICAgcHJpbnQgImZhaWxlZCEhISEhIjsKLSAgICAgICAgICB9Ci0gICAg ICAgIH0KLSAgICAgIH0KLSAgICB9Ci0KICAgICBpZiAoZHVtcFRvb2xEaWRDcmFzaCgpKSB7CiAg ICAgICAgICRyZXN1bHQgPSAiY3Jhc2giOwogICAgICAgICB0ZXN0Q3Jhc2hlZE9yVGltZWRPdXQo JHRlc3QsICRiYXNlLCAxLCAkYWN0dWFsLCAkZXJyb3IpOwpAQCAtMTA5OSw2ICsxMDQ0LDEwIEBA IHByaW50IEhUTUwgIjx0aXRsZT5MYXlvdXQgVGVzdCBSZXN1bHRzPC8KIHByaW50IEhUTUwgIjwv aGVhZD5cbiI7CiBwcmludCBIVE1MICI8Ym9keT5cbiI7CiAKK2lmICgkaWdub3JlTWV0cmljcykg eworICAgIHByaW50IEhUTUwgIjxoND5UZXN0ZWQgd2l0aCBtZXRyaWNzIGlnbm9yZWQuPC9oND4i OworfQorCiBwcmludCBIVE1MIGh0bWxGb3JSZXN1bHRzU2VjdGlvbihAeyR0ZXN0c3ttaXNtYXRj aH19LCAiVGVzdHMgd2hlcmUgcmVzdWx0cyBkaWQgbm90IG1hdGNoIGV4cGVjdGVkIHJlc3VsdHMi LCBcJmxpbmtzRm9yTWlzbWF0Y2hUZXN0KTsKIHByaW50IEhUTUwgaHRtbEZvclJlc3VsdHNTZWN0 aW9uKEB7JHRlc3Rze3RpbWVkb3V0fX0sICJUZXN0cyB0aGF0IHRpbWVkIG91dCIsIFwmbGlua3NG b3JFcnJvclRlc3QpOwogcHJpbnQgSFRNTCBodG1sRm9yUmVzdWx0c1NlY3Rpb24oQHskdGVzdHN7 Y3Jhc2h9fSwgIlRlc3RzIHRoYXQgY2F1c2VkIHRoZSBEdW1wUmVuZGVyVHJlZSB0b29sIHRvIGNy YXNoIiwgXCZsaW5rc0ZvckVycm9yVGVzdCk7CkBAIC0yMDgzLDMgKzIwMzIsNTAgQEAgc3ViIHNh bXBsZUR1bXBUb29sKCkKICAgICBteSAkb3V0cHV0RmlsZSA9ICIkb3V0cHV0RGlyZWN0b3J5L0hh bmdSZXBvcnQudHh0IjsKICAgICBzeXN0ZW0gIi91c3IvYmluL3NhbXBsZSIsICRkdW1wVG9vbFBJ RCwgcXcoMTAgMTAgLWZpbGUpLCAkb3V0cHV0RmlsZTsKIH0KKworc3ViIHNpbXBsaWZ5KCQkKQor eworICAgIG15ICgkYWN0dWFsLCAkZXhwZWN0ZWQpID0gQF87CisKKyAgICBteSAkc2ltcGxlRXhw ZWN0ZWQgPSAkZXhwZWN0ZWQ7CisgICAgbXkgJHNpbXBsZUFjdHVhbCA9ICRhY3R1YWw7CisKKyAg ICAkc2ltcGxlQWN0dWFsID0gJGFjdHVhbDsKKyAgICAkc2ltcGxlQWN0dWFsID1+IHMvYXQgXCgt P1swLTldKywtP1swLTldK1wpICovL2c7CisgICAgJHNpbXBsZUFjdHVhbCA9fiBzL3NpemUgLT9b MC05XSt4LT9bMC05XSsgKi8vZzsKKyAgICAkc2ltcGxlQWN0dWFsID1+IHMvdGV4dCBydW4gd2lk dGggLT9bMC05XSs6IC8vZzsKKyAgICAkc2ltcGxlQWN0dWFsID1+IHMvdGV4dCBydW4gd2lkdGgg LT9bMC05XSsgW2EtekEtWiBdKzogLy9nOworICAgICRzaW1wbGVBY3R1YWwgPX4gcy9SZW5kZXJC dXR0b24ge0JVVFRPTn0gLiovUmVuZGVyQnV0dG9uIHtCVVRUT059L2c7CisgICAgJHNpbXBsZUFj dHVhbCA9fiBzL1JlbmRlckltYWdlIHtJTlBVVH0gLiovUmVuZGVySW1hZ2Uge0lOUFVUfS9nOwor ICAgICRzaW1wbGVBY3R1YWwgPX4gcy9SZW5kZXJCbG9jayB7SU5QVVR9IC4qL1JlbmRlckJsb2Nr IHtJTlBVVH0vZzsKKyAgICAkc2ltcGxlQWN0dWFsID1+IHMvUmVuZGVyVGV4dENvbnRyb2wge0lO UFVUfSAuKi9SZW5kZXJUZXh0Q29udHJvbCB7SU5QVVR9L2c7CisgICAgJHNpbXBsZUFjdHVhbCA9 fiBzL1woWzAtOV0rcHgvcHgvZzsKKyAgICAkc2ltcGxlQWN0dWFsID1+IHMvICoiICpcbiArIiAq LyAvZzsKKyAgICAkc2ltcGxlQWN0dWFsID1+IHMvIiArJC8iL2c7CisKKyAgICAkc2ltcGxlQWN0 dWFsID1+IHMvLSAvLS9nOworICAgICRzaW1wbGVBY3R1YWwgPX4gcy9cbiggKikiXHMrL1xuJDEi L2c7CisgICAgJHNpbXBsZUFjdHVhbCA9fiBzL1xzKyJcbi8iXG4vZzsKKyAgICAkc2ltcGxlQWN0 dWFsID1+IHMvc2Nyb2xsV2lkdGggWzAtOV0rL3Njcm9sbFdpZHRoL2c7CisgICAgJHNpbXBsZUFj dHVhbCA9fiBzL3Njcm9sbEhlaWdodCBbMC05XSsvc2Nyb2xsSGVpZ2h0L2c7CisKKyAgICAkc2lt cGxlRXhwZWN0ZWQgPX4gcy9hdCBcKC0/WzAtOV0rLC0/WzAtOV0rXCkgKi8vZzsKKyAgICAkc2lt cGxlRXhwZWN0ZWQgPX4gcy9zaXplIC0/WzAtOV0reC0/WzAtOV0rICovL2c7CisgICAgJHNpbXBs ZUV4cGVjdGVkID1+IHMvdGV4dCBydW4gd2lkdGggLT9bMC05XSs6IC8vZzsKKyAgICAkc2ltcGxl RXhwZWN0ZWQgPX4gcy90ZXh0IHJ1biB3aWR0aCAtP1swLTldKyBbYS16QS1aIF0rOiAvL2c7Cisg ICAgJHNpbXBsZUV4cGVjdGVkID1+IHMvUmVuZGVyQnV0dG9uIHtCVVRUT059IC4qL1JlbmRlckJ1 dHRvbiB7QlVUVE9OfS9nOworICAgICRzaW1wbGVFeHBlY3RlZCA9fiBzL1JlbmRlckltYWdlIHtJ TlBVVH0gLiovUmVuZGVySW1hZ2Uge0lOUFVUfS9nOworICAgICRzaW1wbGVFeHBlY3RlZCA9fiBz L1JlbmRlckJsb2NrIHtJTlBVVH0gLiovUmVuZGVyQmxvY2sge0lOUFVUfS9nOworICAgICRzaW1w bGVFeHBlY3RlZCA9fiBzL1JlbmRlclRleHRDb250cm9sIHtJTlBVVH0gLiovUmVuZGVyVGV4dENv bnRyb2wge0lOUFVUfS9nOworICAgICRzaW1wbGVFeHBlY3RlZCA9fiBzL1woWzAtOV0rcHgvcHgv ZzsKKyAgICAkc2ltcGxlRXhwZWN0ZWQgPX4gcy8gKiIgKlxuICsiICovIC9nOworICAgICRzaW1w bGVFeHBlY3RlZCA9fiBzLyIgKyQvIi9nOworCisgICAgJHNpbXBsZUV4cGVjdGVkID1+IHMvLSAv LS9nOworICAgICRzaW1wbGVFeHBlY3RlZCA9fiBzL1xuKCAqKSJccysvXG4kMSIvZzsKKyAgICAk c2ltcGxlRXhwZWN0ZWQgPX4gcy9ccysiXG4vIlxuL2c7CisgICAgJHNpbXBsZUV4cGVjdGVkID1+ IHMvc2Nyb2xsV2lkdGggWzAtOV0rL3Njcm9sbFdpZHRoL2c7CisgICAgJHNpbXBsZUV4cGVjdGVk ID1+IHMvc2Nyb2xsSGVpZ2h0IFswLTldKy9zY3JvbGxIZWlnaHQvZzsKKworICAgIHJldHVybiAo JHNpbXBsZUFjdHVhbCwgJHNpbXBsZUV4cGVjdGVkKTsKK30K 39155 2009-09-07 10:34:40 -0700 2009-09-07 10:42:47 -0700 Corrected copy-paste issues, and applied suggestions to previous patch ignore.patch text/plain 9244 abecsi ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiZTEzM2ExLi5hNDJmZTFjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMDkt MDcgIEFuZHJhcyBCZWNzaSAgPGJlY3NpLmFuZHJhc0BzdHVkLnUtc3plZ2VkLmh1PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yIC0tc3Ry aWN0IHN3aXRjaCB0byAtLWlnbm9yZS1tZXRyaWNzIGFuZCBjb3JyZWN0IHRoZQorICAgICAgICBp bXBsZW1lbnRhdGlvbiB0byBtYWtlIHRoZSBmZWF0dXJlIHVzYWJsZSBvbiBhbGwgcGxhdGZvcm1z LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg5MDcK KworICAgICAgICBydW4td2Via2l0LXRlc3RzIC0taWdub3JlLW1ldHJpY3Mgc3RyaXBzIHRoZSBm b250IHJlbGF0ZWQgbWV0cmljcyBmcm9tCisgICAgICAgIHRoZSBhY3R1YWwgYW5kIGV4cGVjdGVk IGRhdGEgYmVmb3JlIGNvbXBhcmluZyB0aGVtLgorICAgICAgICBJbiB0aGlzIHdheSB0aGUgcmVu ZGVyIHRyZWVzIGNhbiBiZSBjaGVja2VkIGZvciBvYnZpb3VzIGRpZmZlcmVuY2VzIGJ1dAorICAg ICAgICBhIHN1Y2Nlc2Z1bGwgdGVzdCBpbXBsaWVzIGJ5IG5vIG1lYW5zIHRoYXQgdGhlIGxheW91 dCBpcyBhY3R1YWxseSBjb3JyZWN0LgorCisgICAgICAgICogU2NyaXB0cy9ydW4td2Via2l0LXRl c3RzOgorCiAyMDA5LTA5LTA0ICBLZXZpbiBPbGxpdmllciAgPGtldmlub0B0aGVvbGxpdmllcnMu Y29tPgogCiAgICAgICAgIHd4IGJ1aWxkIGZpeC4gU3dpdGNoIFVTRV8gZGVmaW5lcyBvdmVyIHRv IHRoZSBjb21waWxlciBzbyB0aGF0IHRoZXkgY2FuIGJlCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJr aXQtdGVzdHMKaW5kZXggNzM4MWM3ZS4uOTQ1YTQ2NiAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdl YmtpdC10ZXN0cwpAQCAtNSw2ICs1LDcgQEAKICMgQ29weXJpZ2h0IChDKSAyMDA3IE1hdHQgTGls ZWsgKHBld3Rlcm1vb3NlQGdtYWlsLmNvbSkKICMgQ29weXJpZ2h0IChDKSAyMDA3IEVyaWMgU2Vp ZGVsIDxlcmljQHdlYmtpdC5vcmc+CiAjIENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMDkgQW5kcmFzIEJlY3NpIChi ZWNzaS5hbmRyYXNAc3R1ZC51LXN6ZWdlZC5odSksIFVuaXZlcnNpdHkgb2YgU3plZ2VkCiAjCiAj IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTEwNSw2ICsxMDYsNyBAQCBzdWIgcGFyc2VMZWFr c2FuZFByaW50VW5pcXVlTGVha3MoKTsKIHN1YiByZWFkRnJvbUR1bXBUb29sV2l0aFRpbWVyKCoq KTsKIHN1YiBzZXRGaWxlSGFuZGxlTm9uQmxvY2tpbmcoKiQpOwogc3ViIHdyaXRlVG9GaWxlKCQk KTsKK3N1YiBzdHJpcE1ldHJpY3MoJCQpOwogCiAjIEFyZ3VtZW50IGhhbmRsaW5nCiBteSAkYWRk UGxhdGZvcm1FeGNlcHRpb25zID0gMDsKQEAgLTEzMSw3ICsxMzMsNyBAQCBteSAkdG9sZXJhbmNl ID0gMDsKIG15ICR0cmVhdFNraXBwZWQgPSAiZGVmYXVsdCI7CiBteSAkdmVyYm9zZSA9IDA7CiBt eSAkdXNlVmFsZ3JpbmQgPSAwOwotbXkgJHN0cmljdFRlc3RpbmcgPSAwOworbXkgJGlnbm9yZU1l dHJpY3MgPSAwOwogbXkgJGdlbmVyYXRlTmV3UmVzdWx0cyA9IGlzQXBwbGVNYWNXZWJLaXQoKSA/ IDEgOiAwOwogbXkgJHN0cmlwRWRpdGluZ0NhbGxiYWNrcyA9IGlzQ3lnd2luKCk7CiBteSAkcnVu U2FtcGxlID0gMTsKQEAgLTE5NSw3ICsxOTcsNiBAQCBteSAkbGF1bmNoU2FmYXJpRGVmYXVsdCA9 ICRsYXVuY2hTYWZhcmkgPyAibGF1bmNoIiA6ICJkbyBub3QgbGF1bmNoIjsKIG15ICRodHRwRGVm YXVsdCA9ICR0ZXN0SFRUUCA/ICJydW4iIDogImRvIG5vdCBydW4iOwogbXkgJHNhbXBsZURlZmF1 bHQgPSAkcnVuU2FtcGxlID8gInJ1biIgOiAiZG8gbm90IHJ1biI7CiAKLSMgRklYTUU6ICItLXN0 cmljdCIgc2hvdWxkIGJlIHJlbmFtZWQgdG8gcXQtbWFjLWNvbXBhcmlzb24sIG9yIHNvbWV0aGlu ZyBhbG9uZyB0aG9zZSBsaW5lcy4KIG15ICR1c2FnZSA9IDw8RU9GOwogVXNhZ2U6ICRwcm9ncmFt TmFtZSBbb3B0aW9uc10gW3Rlc3RkaXJ8dGVzdHBhdGggLi4uXQogICAtLWFkZC1wbGF0Zm9ybS1l eGNlcHRpb25zICAgICAgIFB1dCBuZXcgcmVzdWx0cyBmb3Igbm9uLXBsYXRmb3JtLXNwZWNpZmlj IGZhaWxpbmcgdGVzdHMgaW50byB0aGUgcGxhdGZvcm0tc3BlY2lmaWMgcmVzdWx0cyBkaXJlY3Rv cnkKQEAgLTIyNyw3ICsyMjgsNyBAQCBVc2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbdGVz dGRpcnx0ZXN0cGF0aCAuLi5dCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg aWdub3JlOiAgVGhlIFNraXBwZWQgZmlsZSBpcyBpZ25vcmVkCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgb25seTogICAgT25seSB0aG9zZSB0ZXN0cy9kaXJlY3RvcmllcyBs aXN0ZWQgaW4gdGhlIFNraXBwZWQgZmlsZSB3aWxsIGJlIHJ1bgogICAtLXNsb3dlc3QgICAgICAg ICAgICAgICAgICAgICAgIFJlcG9ydCB0aGUgMTAgc2xvd2VzdCB0ZXN0cwotICAtLXN0cmljdCAg ICAgICAgICAgICAgICAgICAgICAgIERvIGEgY29tcGFyaXNvbiB3aXRoIHRoZSBvdXRwdXQgb24g TWFjIChRdCBvbmx5KQorICAtLWlnbm9yZS1tZXRyaWNzICAgICAgICAgICAgICAgIElnbm9yZSBt ZXRyaWNzIGluIHRlc3RzCiAgIC0tW25vLV1zdHJpcC1lZGl0aW5nLWNhbGxiYWNrcyAgUmVtb3Zl IGVkaXRpbmcgY2FsbGJhY2tzIGZyb20gZXhwZWN0ZWQgcmVzdWx0cwogICAtdHwtLXRocmVhZGVk ICAgICAgICAgICAgICAgICAgIFJ1biBhIGNvbmN1cnJlbnQgSmF2YVNjcmlwdCB0aGVhZCB3aXRo IGVhY2ggdGVzdAogICAtLXRpbWVvdXQgdCAgICAgICAgICAgICAgICAgICAgIFNldHMgdGhlIG51 bWJlciBvZiBzZWNvbmRzIGJlZm9yZSBhIHRlc3QgdGltZXMgb3V0IChkZWZhdWx0OiAkdGltZW91 dFNlY29uZHMpCkBAIC0yNjQsNyArMjY1LDcgQEAgbXkgJGdldE9wdGlvbnNSZXN1bHQgPSBHZXRP cHRpb25zKAogICAgICd2ZXJib3NlfHYnID0+IFwkdmVyYm9zZSwKICAgICAndmFsZ3JpbmQnID0+ IFwkdXNlVmFsZ3JpbmQsCiAgICAgJ3NhbXBsZS1vbi10aW1lb3V0IScgPT4gXCRydW5TYW1wbGUs Ci0gICAgJ3N0cmljdCcgPT4gXCRzdHJpY3RUZXN0aW5nLAorICAgICdpZ25vcmUtbWV0cmljcyEn ID0+IFwkaWdub3JlTWV0cmljcywKICAgICAnc3RyaXAtZWRpdGluZy1jYWxsYmFja3MhJyA9PiBc JHN0cmlwRWRpdGluZ0NhbGxiYWNrcywKICAgICAncmFuZG9tJyA9PiBcJHJhbmRvbWl6ZVRlc3Rz LAogICAgICdyZXZlcnNlJyA9PiBcJHJldmVyc2VUZXN0cywKQEAgLTcxMCwxNSArNzExLDkgQEAg Zm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAgICAgICAgfQogICAgICAgICBjbG9zZSBFWFBFQ1RF RDsKICAgICB9Ci0gICAgbXkgJGV4cGVjdGVkTWFjOwotICAgIGlmICghaXNBcHBsZU1hY1dlYktp dCgpICYmICRzdHJpY3RUZXN0aW5nICYmICEkaXNUZXh0KSB7Ci0gICAgICBpZiAoISRyZXNldFJl c3VsdHMgJiYgb3BlbiBFWFBFQ1RFRCwgIjwiLCAiJHRlc3REaXJlY3RvcnkvcGxhdGZvcm0vbWFj LyRleHBlY3RlZEZpbGVOYW1lIikgewotICAgICAgICAkZXhwZWN0ZWRNYWMgPSAiIjsKLSAgICAg ICAgd2hpbGUgKDxFWFBFQ1RFRD4pIHsKLSAgICAgICAgICAkZXhwZWN0ZWRNYWMgLj0gJF87Ci0g ICAgICAgIH0KLSAgICAgICAgY2xvc2UgRVhQRUNURUQ7Ci0gICAgICB9CisKKyAgICBpZiAoJGln bm9yZU1ldHJpY3MgJiYgISRpc1RleHQpIHsKKyAgICAgICAgKCRhY3R1YWwsJGV4cGVjdGVkKSA9 IHNpbXBsaWZ5KCRhY3R1YWwsICRleHBlY3RlZCk7CiAgICAgfQogCiAgICAgaWYgKCRzaG91bGRD aGVja0xlYWtzICYmICR0ZXN0c1BlckR1bXBUb29sID09IDEpIHsKQEAgLTgwNCw1NyArNzk5LDYg QEAgZm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAgICAgICAgfQogICAgIH0KIAotICAgIGlmICgh aXNBcHBsZU1hY1dlYktpdCgpICYmICRzdHJpY3RUZXN0aW5nICYmICEkaXNUZXh0KSB7Ci0gICAg ICBpZiAoZGVmaW5lZCAkZXhwZWN0ZWRNYWMpIHsKLSAgICAgICAgbXkgJHNpbXBsaWZpZWRfYWN0 dWFsOwotICAgICAgICAkc2ltcGxpZmllZF9hY3R1YWwgPSAkYWN0dWFsOwotICAgICAgICAkc2lt cGxpZmllZF9hY3R1YWwgPX4gcy9hdCBcKC0/WzAtOV0rLC0/WzAtOV0rXCkgKi8vZzsKLSAgICAg ICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvc2l6ZSAtP1swLTldK3gtP1swLTldKyAqLy9nOwot ICAgICAgICAkc2ltcGxpZmllZF9hY3R1YWwgPX4gcy90ZXh0IHJ1biB3aWR0aCAtP1swLTldKzog Ly9nOwotICAgICAgICAkc2ltcGxpZmllZF9hY3R1YWwgPX4gcy90ZXh0IHJ1biB3aWR0aCAtP1sw LTldKyBbYS16QS1aIF0rOiAvL2c7Ci0gICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9fiBzL1Jl bmRlckJ1dHRvbiB7QlVUVE9OfSAuKi9SZW5kZXJCdXR0b24ge0JVVFRPTn0vZzsKLSAgICAgICAg JHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvUmVuZGVySW1hZ2Uge0lOUFVUfSAuKi9SZW5kZXJJbWFn ZSB7SU5QVVR9L2c7Ci0gICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9fiBzL1JlbmRlckJsb2Nr IHtJTlBVVH0gLiovUmVuZGVyQmxvY2sge0lOUFVUfS9nOwotICAgICAgICAkc2ltcGxpZmllZF9h Y3R1YWwgPX4gcy9SZW5kZXJUZXh0Q29udHJvbCB7SU5QVVR9IC4qL1JlbmRlclRleHRDb250cm9s IHtJTlBVVH0vZzsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvXChbMC05XStweC9w eC9nOwotICAgICAgICAkc2ltcGxpZmllZF9hY3R1YWwgPX4gcy8gKiIgKlxuICsiICovIC9nOwot ICAgICAgICAkc2ltcGxpZmllZF9hY3R1YWwgPX4gcy8iICskLyIvZzsKLQotICAgICAgICAkc2lt cGxpZmllZF9hY3R1YWwgPX4gcy8tIC8tL2c7Ci0gICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9 fiBzL1xuKCAqKSJccysvXG4kMSIvZzsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMv XHMrIlxuLyJcbi9nOwotICAgICAgICAKLSAgICAgICAgJGV4cGVjdGVkTWFjID1+IHMvYXQgXCgt P1swLTldKywtP1swLTldK1wpICovL2c7Ci0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzL3NpemUg LT9bMC05XSt4LT9bMC05XSsgKi8vZzsKLSAgICAgICAgJGV4cGVjdGVkTWFjID1+IHMvdGV4dCBy dW4gd2lkdGggLT9bMC05XSs6IC8vZzsKLSAgICAgICAgJGV4cGVjdGVkTWFjID1+IHMvdGV4dCBy dW4gd2lkdGggLT9bMC05XSsgW2EtekEtWiBdKzogLy9nOwotICAgICAgICAkZXhwZWN0ZWRNYWMg PX4gcy9SZW5kZXJCdXR0b24ge0JVVFRPTn0gLiovUmVuZGVyQnV0dG9uIHtCVVRUT059L2c7Ci0g ICAgICAgICRleHBlY3RlZE1hYyA9fiBzL1JlbmRlckltYWdlIHtJTlBVVH0gLiovUmVuZGVySW1h Z2Uge0lOUFVUfS9nOwotICAgICAgICAkZXhwZWN0ZWRNYWMgPX4gcy9SZW5kZXJCbG9jayB7SU5Q VVR9IC4qL1JlbmRlckJsb2NrIHtJTlBVVH0vZzsKLSAgICAgICAgJGV4cGVjdGVkTWFjID1+IHMv UmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfSAuKi9SZW5kZXJUZXh0Q29udHJvbCB7SU5QVVR9L2c7 Ci0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzL1woWzAtOV0rcHgvcHgvZzsKLSAgICAgICAgJGV4 cGVjdGVkTWFjID1+IHMvICoiICpcbiArIiAqLyAvZzsKLSAgICAgICAgJGV4cGVjdGVkTWFjID1+ IHMvIiArJC8iL2c7Ci0KLSAgICAgICAgJGV4cGVjdGVkTWFjID1+IHMvLSAvLS9nOwotICAgICAg ICAkZXhwZWN0ZWRNYWMgPX4gcy9cbiggKikiXHMrL1xuJDEiL2c7Ci0gICAgICAgICRleHBlY3Rl ZE1hYyA9fiBzL1xzKyJcbi8iXG4vZzsKLSAgICAgICAgCi0gICAgICAgIGlmICgkc2ltcGxpZmll ZF9hY3R1YWwgbmUgJGV4cGVjdGVkTWFjKSB7Ci0gICAgICAgICAgd3JpdGVUb0ZpbGUoIi90bXAv YWN0dWFsLnR4dCIsICRzaW1wbGlmaWVkX2FjdHVhbCk7Ci0gICAgICAgICAgd3JpdGVUb0ZpbGUo Ii90bXAvZXhwZWN0ZWQudHh0IiwgJGV4cGVjdGVkTWFjKTsKLSAgICAgICAgICBzeXN0ZW0gImRp ZmYgLXUgXCIvdG1wL2V4cGVjdGVkLnR4dFwiIFwiL3RtcC9hY3R1YWwudHh0XCIgPiBcIi90bXAv c2ltcGxpZmllZC5kaWZmXCIiOwotCi0gICAgICAgICAgJGRpZmZSZXN1bHQgPSAiZmFpbGVkIjsK LSAgICAgICAgICBpZiAoJHZlcmJvc2UpIHsKLSAgICAgICAgICAgIHByaW50ICJcbiI7Ci0gICAg ICAgICAgICBzeXN0ZW0gImNhdCAvdG1wL3NpbXBsaWZpZWQuZGlmZiI7Ci0gICAgICAgICAgICBw cmludCAiZmFpbGVkISEhISEiOwotICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgfQotICAg IH0KLQogICAgIGlmIChkdW1wVG9vbERpZENyYXNoKCkpIHsKICAgICAgICAgJHJlc3VsdCA9ICJj cmFzaCI7CiAgICAgICAgIHRlc3RDcmFzaGVkT3JUaW1lZE91dCgkdGVzdCwgJGJhc2UsIDEsICRh Y3R1YWwsICRlcnJvcik7CkBAIC0xMDk5LDYgKzEwNDMsMTAgQEAgcHJpbnQgSFRNTCAiPHRpdGxl PkxheW91dCBUZXN0IFJlc3VsdHM8L3RpdGxlPlxuIjsKIHByaW50IEhUTUwgIjwvaGVhZD5cbiI7 CiBwcmludCBIVE1MICI8Ym9keT5cbiI7CiAKK2lmICgkaWdub3JlTWV0cmljcykgeworICAgIHBy aW50IEhUTUwgIjxoND5UZXN0ZWQgd2l0aCBtZXRyaWNzIGlnbm9yZWQuPC9oND4iOworfQorCiBw cmludCBIVE1MIGh0bWxGb3JSZXN1bHRzU2VjdGlvbihAeyR0ZXN0c3ttaXNtYXRjaH19LCAiVGVz dHMgd2hlcmUgcmVzdWx0cyBkaWQgbm90IG1hdGNoIGV4cGVjdGVkIHJlc3VsdHMiLCBcJmxpbmtz Rm9yTWlzbWF0Y2hUZXN0KTsKIHByaW50IEhUTUwgaHRtbEZvclJlc3VsdHNTZWN0aW9uKEB7JHRl c3Rze3RpbWVkb3V0fX0sICJUZXN0cyB0aGF0IHRpbWVkIG91dCIsIFwmbGlua3NGb3JFcnJvclRl c3QpOwogcHJpbnQgSFRNTCBodG1sRm9yUmVzdWx0c1NlY3Rpb24oQHskdGVzdHN7Y3Jhc2h9fSwg IlRlc3RzIHRoYXQgY2F1c2VkIHRoZSBEdW1wUmVuZGVyVHJlZSB0b29sIHRvIGNyYXNoIiwgXCZs aW5rc0ZvckVycm9yVGVzdCk7CkBAIC0yMDgzLDMgKzIwMzEsNDYgQEAgc3ViIHNhbXBsZUR1bXBU b29sKCkKICAgICBteSAkb3V0cHV0RmlsZSA9ICIkb3V0cHV0RGlyZWN0b3J5L0hhbmdSZXBvcnQu dHh0IjsKICAgICBzeXN0ZW0gIi91c3IvYmluL3NhbXBsZSIsICRkdW1wVG9vbFBJRCwgcXcoMTAg MTAgLWZpbGUpLCAkb3V0cHV0RmlsZTsKIH0KKworc3ViIHN0cmlwTWV0cmljcygkJCkKK3sKKyAg ICBteSAoJGFjdHVhbCwgJGV4cGVjdGVkKSA9IEBfOworCisgICAgJGFjdHVhbCA9fiBzL2F0IFwo LT9bMC05XSssLT9bMC05XStcKSAqLy9nOworICAgICRhY3R1YWwgPX4gcy9zaXplIC0/WzAtOV0r eC0/WzAtOV0rICovL2c7CisgICAgJGFjdHVhbCA9fiBzL3RleHQgcnVuIHdpZHRoIC0/WzAtOV0r OiAvL2c7CisgICAgJGFjdHVhbCA9fiBzL3RleHQgcnVuIHdpZHRoIC0/WzAtOV0rIFthLXpBLVog XSs6IC8vZzsKKyAgICAkYWN0dWFsID1+IHMvUmVuZGVyQnV0dG9uIHtCVVRUT059IC4qL1JlbmRl ckJ1dHRvbiB7QlVUVE9OfS9nOworICAgICRhY3R1YWwgPX4gcy9SZW5kZXJJbWFnZSB7SU5QVVR9 IC4qL1JlbmRlckltYWdlIHtJTlBVVH0vZzsKKyAgICAkYWN0dWFsID1+IHMvUmVuZGVyQmxvY2sg e0lOUFVUfSAuKi9SZW5kZXJCbG9jayB7SU5QVVR9L2c7CisgICAgJGFjdHVhbCA9fiBzL1JlbmRl clRleHRDb250cm9sIHtJTlBVVH0gLiovUmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfS9nOworICAg ICRhY3R1YWwgPX4gcy9cKFswLTldK3B4L3B4L2c7CisgICAgJGFjdHVhbCA9fiBzLyAqIiAqXG4g KyIgKi8gL2c7CisgICAgJGFjdHVhbCA9fiBzLyIgKyQvIi9nOworCisgICAgJGFjdHVhbCA9fiBz Ly0gLy0vZzsKKyAgICAkYWN0dWFsID1+IHMvXG4oICopIlxzKy9cbiQxIi9nOworICAgICRhY3R1 YWwgPX4gcy9ccysiXG4vIlxuL2c7CisgICAgJGFjdHVhbCA9fiBzL3Njcm9sbFdpZHRoIFswLTld Ky9zY3JvbGxXaWR0aC9nOworICAgICRhY3R1YWwgPX4gcy9zY3JvbGxIZWlnaHQgWzAtOV0rL3Nj cm9sbEhlaWdodC9nOworCisgICAgJGV4cGVjdGVkID1+IHMvYXQgXCgtP1swLTldKywtP1swLTld K1wpICovL2c7CisgICAgJGV4cGVjdGVkID1+IHMvc2l6ZSAtP1swLTldK3gtP1swLTldKyAqLy9n OworICAgICRleHBlY3RlZCA9fiBzL3RleHQgcnVuIHdpZHRoIC0/WzAtOV0rOiAvL2c7CisgICAg JGV4cGVjdGVkID1+IHMvdGV4dCBydW4gd2lkdGggLT9bMC05XSsgW2EtekEtWiBdKzogLy9nOwor ICAgICRleHBlY3RlZCA9fiBzL1JlbmRlckJ1dHRvbiB7QlVUVE9OfSAuKi9SZW5kZXJCdXR0b24g e0JVVFRPTn0vZzsKKyAgICAkZXhwZWN0ZWQgPX4gcy9SZW5kZXJJbWFnZSB7SU5QVVR9IC4qL1Jl bmRlckltYWdlIHtJTlBVVH0vZzsKKyAgICAkZXhwZWN0ZWQgPX4gcy9SZW5kZXJCbG9jayB7SU5Q VVR9IC4qL1JlbmRlckJsb2NrIHtJTlBVVH0vZzsKKyAgICAkZXhwZWN0ZWQgPX4gcy9SZW5kZXJU ZXh0Q29udHJvbCB7SU5QVVR9IC4qL1JlbmRlclRleHRDb250cm9sIHtJTlBVVH0vZzsKKyAgICAk ZXhwZWN0ZWQgPX4gcy9cKFswLTldK3B4L3B4L2c7CisgICAgJGV4cGVjdGVkID1+IHMvICoiICpc biArIiAqLyAvZzsKKyAgICAkZXhwZWN0ZWQgPX4gcy8iICskLyIvZzsKKworICAgICRleHBlY3Rl ZCA9fiBzLy0gLy0vZzsKKyAgICAkZXhwZWN0ZWQgPX4gcy9cbiggKikiXHMrL1xuJDEiL2c7Cisg ICAgJGV4cGVjdGVkID1+IHMvXHMrIlxuLyJcbi9nOworICAgICRleHBlY3RlZCA9fiBzL3Njcm9s bFdpZHRoIFswLTldKy9zY3JvbGxXaWR0aC9nOworICAgICRleHBlY3RlZCA9fiBzL3Njcm9sbEhl aWdodCBbMC05XSsvc2Nyb2xsSGVpZ2h0L2c7CisKKyAgICByZXR1cm4gKCRhY3R1YWwsICRleHBl Y3RlZCk7Cit9Cg== 39157 2009-09-07 10:42:47 -0700 2009-09-07 10:56:05 -0700 Fixed my previous patch which had an error. ignore.patch text/plain 9248 abecsi ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiZTEzM2ExLi5hNDJmZTFjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMDkt MDcgIEFuZHJhcyBCZWNzaSAgPGJlY3NpLmFuZHJhc0BzdHVkLnUtc3plZ2VkLmh1PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yIC0tc3Ry aWN0IHN3aXRjaCB0byAtLWlnbm9yZS1tZXRyaWNzIGFuZCBjb3JyZWN0IHRoZQorICAgICAgICBp bXBsZW1lbnRhdGlvbiB0byBtYWtlIHRoZSBmZWF0dXJlIHVzYWJsZSBvbiBhbGwgcGxhdGZvcm1z LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg5MDcK KworICAgICAgICBydW4td2Via2l0LXRlc3RzIC0taWdub3JlLW1ldHJpY3Mgc3RyaXBzIHRoZSBm b250IHJlbGF0ZWQgbWV0cmljcyBmcm9tCisgICAgICAgIHRoZSBhY3R1YWwgYW5kIGV4cGVjdGVk IGRhdGEgYmVmb3JlIGNvbXBhcmluZyB0aGVtLgorICAgICAgICBJbiB0aGlzIHdheSB0aGUgcmVu ZGVyIHRyZWVzIGNhbiBiZSBjaGVja2VkIGZvciBvYnZpb3VzIGRpZmZlcmVuY2VzIGJ1dAorICAg ICAgICBhIHN1Y2Nlc2Z1bGwgdGVzdCBpbXBsaWVzIGJ5IG5vIG1lYW5zIHRoYXQgdGhlIGxheW91 dCBpcyBhY3R1YWxseSBjb3JyZWN0LgorCisgICAgICAgICogU2NyaXB0cy9ydW4td2Via2l0LXRl c3RzOgorCiAyMDA5LTA5LTA0ICBLZXZpbiBPbGxpdmllciAgPGtldmlub0B0aGVvbGxpdmllcnMu Y29tPgogCiAgICAgICAgIHd4IGJ1aWxkIGZpeC4gU3dpdGNoIFVTRV8gZGVmaW5lcyBvdmVyIHRv IHRoZSBjb21waWxlciBzbyB0aGF0IHRoZXkgY2FuIGJlCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJr aXQtdGVzdHMKaW5kZXggNzM4MWM3ZS4uOTQ1YTQ2NiAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdl YmtpdC10ZXN0cwpAQCAtNSw2ICs1LDcgQEAKICMgQ29weXJpZ2h0IChDKSAyMDA3IE1hdHQgTGls ZWsgKHBld3Rlcm1vb3NlQGdtYWlsLmNvbSkKICMgQ29weXJpZ2h0IChDKSAyMDA3IEVyaWMgU2Vp ZGVsIDxlcmljQHdlYmtpdC5vcmc+CiAjIENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMDkgQW5kcmFzIEJlY3NpIChi ZWNzaS5hbmRyYXNAc3R1ZC51LXN6ZWdlZC5odSksIFVuaXZlcnNpdHkgb2YgU3plZ2VkCiAjCiAj IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTEwNSw2ICsxMDYsNyBAQCBzdWIgcGFyc2VMZWFr c2FuZFByaW50VW5pcXVlTGVha3MoKTsKIHN1YiByZWFkRnJvbUR1bXBUb29sV2l0aFRpbWVyKCoq KTsKIHN1YiBzZXRGaWxlSGFuZGxlTm9uQmxvY2tpbmcoKiQpOwogc3ViIHdyaXRlVG9GaWxlKCQk KTsKK3N1YiBzdHJpcE1ldHJpY3MoJCQpOwogCiAjIEFyZ3VtZW50IGhhbmRsaW5nCiBteSAkYWRk UGxhdGZvcm1FeGNlcHRpb25zID0gMDsKQEAgLTEzMSw3ICsxMzMsNyBAQCBteSAkdG9sZXJhbmNl ID0gMDsKIG15ICR0cmVhdFNraXBwZWQgPSAiZGVmYXVsdCI7CiBteSAkdmVyYm9zZSA9IDA7CiBt eSAkdXNlVmFsZ3JpbmQgPSAwOwotbXkgJHN0cmljdFRlc3RpbmcgPSAwOworbXkgJGlnbm9yZU1l dHJpY3MgPSAwOwogbXkgJGdlbmVyYXRlTmV3UmVzdWx0cyA9IGlzQXBwbGVNYWNXZWJLaXQoKSA/ IDEgOiAwOwogbXkgJHN0cmlwRWRpdGluZ0NhbGxiYWNrcyA9IGlzQ3lnd2luKCk7CiBteSAkcnVu U2FtcGxlID0gMTsKQEAgLTE5NSw3ICsxOTcsNiBAQCBteSAkbGF1bmNoU2FmYXJpRGVmYXVsdCA9 ICRsYXVuY2hTYWZhcmkgPyAibGF1bmNoIiA6ICJkbyBub3QgbGF1bmNoIjsKIG15ICRodHRwRGVm YXVsdCA9ICR0ZXN0SFRUUCA/ICJydW4iIDogImRvIG5vdCBydW4iOwogbXkgJHNhbXBsZURlZmF1 bHQgPSAkcnVuU2FtcGxlID8gInJ1biIgOiAiZG8gbm90IHJ1biI7CiAKLSMgRklYTUU6ICItLXN0 cmljdCIgc2hvdWxkIGJlIHJlbmFtZWQgdG8gcXQtbWFjLWNvbXBhcmlzb24sIG9yIHNvbWV0aGlu ZyBhbG9uZyB0aG9zZSBsaW5lcy4KIG15ICR1c2FnZSA9IDw8RU9GOwogVXNhZ2U6ICRwcm9ncmFt TmFtZSBbb3B0aW9uc10gW3Rlc3RkaXJ8dGVzdHBhdGggLi4uXQogICAtLWFkZC1wbGF0Zm9ybS1l eGNlcHRpb25zICAgICAgIFB1dCBuZXcgcmVzdWx0cyBmb3Igbm9uLXBsYXRmb3JtLXNwZWNpZmlj IGZhaWxpbmcgdGVzdHMgaW50byB0aGUgcGxhdGZvcm0tc3BlY2lmaWMgcmVzdWx0cyBkaXJlY3Rv cnkKQEAgLTIyNyw3ICsyMjgsNyBAQCBVc2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbdGVz dGRpcnx0ZXN0cGF0aCAuLi5dCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg aWdub3JlOiAgVGhlIFNraXBwZWQgZmlsZSBpcyBpZ25vcmVkCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgb25seTogICAgT25seSB0aG9zZSB0ZXN0cy9kaXJlY3RvcmllcyBs aXN0ZWQgaW4gdGhlIFNraXBwZWQgZmlsZSB3aWxsIGJlIHJ1bgogICAtLXNsb3dlc3QgICAgICAg ICAgICAgICAgICAgICAgIFJlcG9ydCB0aGUgMTAgc2xvd2VzdCB0ZXN0cwotICAtLXN0cmljdCAg ICAgICAgICAgICAgICAgICAgICAgIERvIGEgY29tcGFyaXNvbiB3aXRoIHRoZSBvdXRwdXQgb24g TWFjIChRdCBvbmx5KQorICAtLWlnbm9yZS1tZXRyaWNzICAgICAgICAgICAgICAgIElnbm9yZSBt ZXRyaWNzIGluIHRlc3RzCiAgIC0tW25vLV1zdHJpcC1lZGl0aW5nLWNhbGxiYWNrcyAgUmVtb3Zl IGVkaXRpbmcgY2FsbGJhY2tzIGZyb20gZXhwZWN0ZWQgcmVzdWx0cwogICAtdHwtLXRocmVhZGVk ICAgICAgICAgICAgICAgICAgIFJ1biBhIGNvbmN1cnJlbnQgSmF2YVNjcmlwdCB0aGVhZCB3aXRo IGVhY2ggdGVzdAogICAtLXRpbWVvdXQgdCAgICAgICAgICAgICAgICAgICAgIFNldHMgdGhlIG51 bWJlciBvZiBzZWNvbmRzIGJlZm9yZSBhIHRlc3QgdGltZXMgb3V0IChkZWZhdWx0OiAkdGltZW91 dFNlY29uZHMpCkBAIC0yNjQsNyArMjY1LDcgQEAgbXkgJGdldE9wdGlvbnNSZXN1bHQgPSBHZXRP cHRpb25zKAogICAgICd2ZXJib3NlfHYnID0+IFwkdmVyYm9zZSwKICAgICAndmFsZ3JpbmQnID0+ IFwkdXNlVmFsZ3JpbmQsCiAgICAgJ3NhbXBsZS1vbi10aW1lb3V0IScgPT4gXCRydW5TYW1wbGUs Ci0gICAgJ3N0cmljdCcgPT4gXCRzdHJpY3RUZXN0aW5nLAorICAgICdpZ25vcmUtbWV0cmljcyEn ID0+IFwkaWdub3JlTWV0cmljcywKICAgICAnc3RyaXAtZWRpdGluZy1jYWxsYmFja3MhJyA9PiBc JHN0cmlwRWRpdGluZ0NhbGxiYWNrcywKICAgICAncmFuZG9tJyA9PiBcJHJhbmRvbWl6ZVRlc3Rz LAogICAgICdyZXZlcnNlJyA9PiBcJHJldmVyc2VUZXN0cywKQEAgLTcxMCwxNSArNzExLDkgQEAg Zm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAgICAgICAgfQogICAgICAgICBjbG9zZSBFWFBFQ1RF RDsKICAgICB9Ci0gICAgbXkgJGV4cGVjdGVkTWFjOwotICAgIGlmICghaXNBcHBsZU1hY1dlYktp dCgpICYmICRzdHJpY3RUZXN0aW5nICYmICEkaXNUZXh0KSB7Ci0gICAgICBpZiAoISRyZXNldFJl c3VsdHMgJiYgb3BlbiBFWFBFQ1RFRCwgIjwiLCAiJHRlc3REaXJlY3RvcnkvcGxhdGZvcm0vbWFj LyRleHBlY3RlZEZpbGVOYW1lIikgewotICAgICAgICAkZXhwZWN0ZWRNYWMgPSAiIjsKLSAgICAg ICAgd2hpbGUgKDxFWFBFQ1RFRD4pIHsKLSAgICAgICAgICAkZXhwZWN0ZWRNYWMgLj0gJF87Ci0g ICAgICAgIH0KLSAgICAgICAgY2xvc2UgRVhQRUNURUQ7Ci0gICAgICB9CisKKyAgICBpZiAoJGln bm9yZU1ldHJpY3MgJiYgISRpc1RleHQpIHsKKyAgICAgICAgKCRhY3R1YWwsJGV4cGVjdGVkKSA9 IHN0cmlwTWV0cmljcygkYWN0dWFsLCAkZXhwZWN0ZWQpOwogICAgIH0KIAogICAgIGlmICgkc2hv dWxkQ2hlY2tMZWFrcyAmJiAkdGVzdHNQZXJEdW1wVG9vbCA9PSAxKSB7CkBAIC04MDQsNTcgKzc5 OSw2IEBAIGZvciBteSAkdGVzdCAoQHRlc3RzKSB7CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBp ZiAoIWlzQXBwbGVNYWNXZWJLaXQoKSAmJiAkc3RyaWN0VGVzdGluZyAmJiAhJGlzVGV4dCkgewot ICAgICAgaWYgKGRlZmluZWQgJGV4cGVjdGVkTWFjKSB7Ci0gICAgICAgIG15ICRzaW1wbGlmaWVk X2FjdHVhbDsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID0gJGFjdHVhbDsKLSAgICAgICAg JHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvYXQgXCgtP1swLTldKywtP1swLTldK1wpICovL2c7Ci0g ICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9fiBzL3NpemUgLT9bMC05XSt4LT9bMC05XSsgKi8v ZzsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvdGV4dCBydW4gd2lkdGggLT9bMC05 XSs6IC8vZzsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvdGV4dCBydW4gd2lkdGgg LT9bMC05XSsgW2EtekEtWiBdKzogLy9nOwotICAgICAgICAkc2ltcGxpZmllZF9hY3R1YWwgPX4g cy9SZW5kZXJCdXR0b24ge0JVVFRPTn0gLiovUmVuZGVyQnV0dG9uIHtCVVRUT059L2c7Ci0gICAg ICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9fiBzL1JlbmRlckltYWdlIHtJTlBVVH0gLiovUmVuZGVy SW1hZ2Uge0lOUFVUfS9nOwotICAgICAgICAkc2ltcGxpZmllZF9hY3R1YWwgPX4gcy9SZW5kZXJC bG9jayB7SU5QVVR9IC4qL1JlbmRlckJsb2NrIHtJTlBVVH0vZzsKLSAgICAgICAgJHNpbXBsaWZp ZWRfYWN0dWFsID1+IHMvUmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfSAuKi9SZW5kZXJUZXh0Q29u dHJvbCB7SU5QVVR9L2c7Ci0gICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9fiBzL1woWzAtOV0r cHgvcHgvZzsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvICoiICpcbiArIiAqLyAv ZzsKLSAgICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvIiArJC8iL2c7Ci0KLSAgICAgICAg JHNpbXBsaWZpZWRfYWN0dWFsID1+IHMvLSAvLS9nOwotICAgICAgICAkc2ltcGxpZmllZF9hY3R1 YWwgPX4gcy9cbiggKikiXHMrL1xuJDEiL2c7Ci0gICAgICAgICRzaW1wbGlmaWVkX2FjdHVhbCA9 fiBzL1xzKyJcbi8iXG4vZzsKLSAgICAgICAgCi0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzL2F0 IFwoLT9bMC05XSssLT9bMC05XStcKSAqLy9nOwotICAgICAgICAkZXhwZWN0ZWRNYWMgPX4gcy9z aXplIC0/WzAtOV0reC0/WzAtOV0rICovL2c7Ci0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzL3Rl eHQgcnVuIHdpZHRoIC0/WzAtOV0rOiAvL2c7Ci0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzL3Rl eHQgcnVuIHdpZHRoIC0/WzAtOV0rIFthLXpBLVogXSs6IC8vZzsKLSAgICAgICAgJGV4cGVjdGVk TWFjID1+IHMvUmVuZGVyQnV0dG9uIHtCVVRUT059IC4qL1JlbmRlckJ1dHRvbiB7QlVUVE9OfS9n OwotICAgICAgICAkZXhwZWN0ZWRNYWMgPX4gcy9SZW5kZXJJbWFnZSB7SU5QVVR9IC4qL1JlbmRl ckltYWdlIHtJTlBVVH0vZzsKLSAgICAgICAgJGV4cGVjdGVkTWFjID1+IHMvUmVuZGVyQmxvY2sg e0lOUFVUfSAuKi9SZW5kZXJCbG9jayB7SU5QVVR9L2c7Ci0gICAgICAgICRleHBlY3RlZE1hYyA9 fiBzL1JlbmRlclRleHRDb250cm9sIHtJTlBVVH0gLiovUmVuZGVyVGV4dENvbnRyb2wge0lOUFVU fS9nOwotICAgICAgICAkZXhwZWN0ZWRNYWMgPX4gcy9cKFswLTldK3B4L3B4L2c7Ci0gICAgICAg ICRleHBlY3RlZE1hYyA9fiBzLyAqIiAqXG4gKyIgKi8gL2c7Ci0gICAgICAgICRleHBlY3RlZE1h YyA9fiBzLyIgKyQvIi9nOwotCi0gICAgICAgICRleHBlY3RlZE1hYyA9fiBzLy0gLy0vZzsKLSAg ICAgICAgJGV4cGVjdGVkTWFjID1+IHMvXG4oICopIlxzKy9cbiQxIi9nOwotICAgICAgICAkZXhw ZWN0ZWRNYWMgPX4gcy9ccysiXG4vIlxuL2c7Ci0gICAgICAgIAotICAgICAgICBpZiAoJHNpbXBs aWZpZWRfYWN0dWFsIG5lICRleHBlY3RlZE1hYykgewotICAgICAgICAgIHdyaXRlVG9GaWxlKCIv dG1wL2FjdHVhbC50eHQiLCAkc2ltcGxpZmllZF9hY3R1YWwpOwotICAgICAgICAgIHdyaXRlVG9G aWxlKCIvdG1wL2V4cGVjdGVkLnR4dCIsICRleHBlY3RlZE1hYyk7Ci0gICAgICAgICAgc3lzdGVt ICJkaWZmIC11IFwiL3RtcC9leHBlY3RlZC50eHRcIiBcIi90bXAvYWN0dWFsLnR4dFwiID4gXCIv dG1wL3NpbXBsaWZpZWQuZGlmZlwiIjsKLQotICAgICAgICAgICRkaWZmUmVzdWx0ID0gImZhaWxl ZCI7Ci0gICAgICAgICAgaWYgKCR2ZXJib3NlKSB7Ci0gICAgICAgICAgICBwcmludCAiXG4iOwot ICAgICAgICAgICAgc3lzdGVtICJjYXQgL3RtcC9zaW1wbGlmaWVkLmRpZmYiOwotICAgICAgICAg ICAgcHJpbnQgImZhaWxlZCEhISEhIjsKLSAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgIH0K LSAgICB9Ci0KICAgICBpZiAoZHVtcFRvb2xEaWRDcmFzaCgpKSB7CiAgICAgICAgICRyZXN1bHQg PSAiY3Jhc2giOwogICAgICAgICB0ZXN0Q3Jhc2hlZE9yVGltZWRPdXQoJHRlc3QsICRiYXNlLCAx LCAkYWN0dWFsLCAkZXJyb3IpOwpAQCAtMTA5OSw2ICsxMDQzLDEwIEBAIHByaW50IEhUTUwgIjx0 aXRsZT5MYXlvdXQgVGVzdCBSZXN1bHRzPC90aXRsZT5cbiI7CiBwcmludCBIVE1MICI8L2hlYWQ+ XG4iOwogcHJpbnQgSFRNTCAiPGJvZHk+XG4iOwogCitpZiAoJGlnbm9yZU1ldHJpY3MpIHsKKyAg ICBwcmludCBIVE1MICI8aDQ+VGVzdGVkIHdpdGggbWV0cmljcyBpZ25vcmVkLjwvaDQ+IjsKK30K KwogcHJpbnQgSFRNTCBodG1sRm9yUmVzdWx0c1NlY3Rpb24oQHskdGVzdHN7bWlzbWF0Y2h9fSwg IlRlc3RzIHdoZXJlIHJlc3VsdHMgZGlkIG5vdCBtYXRjaCBleHBlY3RlZCByZXN1bHRzIiwgXCZs aW5rc0Zvck1pc21hdGNoVGVzdCk7CiBwcmludCBIVE1MIGh0bWxGb3JSZXN1bHRzU2VjdGlvbihA eyR0ZXN0c3t0aW1lZG91dH19LCAiVGVzdHMgdGhhdCB0aW1lZCBvdXQiLCBcJmxpbmtzRm9yRXJy b3JUZXN0KTsKIHByaW50IEhUTUwgaHRtbEZvclJlc3VsdHNTZWN0aW9uKEB7JHRlc3Rze2NyYXNo fX0sICJUZXN0cyB0aGF0IGNhdXNlZCB0aGUgRHVtcFJlbmRlclRyZWUgdG9vbCB0byBjcmFzaCIs IFwmbGlua3NGb3JFcnJvclRlc3QpOwpAQCAtMjA4MywzICsyMDMxLDQ2IEBAIHN1YiBzYW1wbGVE dW1wVG9vbCgpCiAgICAgbXkgJG91dHB1dEZpbGUgPSAiJG91dHB1dERpcmVjdG9yeS9IYW5nUmVw b3J0LnR4dCI7CiAgICAgc3lzdGVtICIvdXNyL2Jpbi9zYW1wbGUiLCAkZHVtcFRvb2xQSUQsIHF3 KDEwIDEwIC1maWxlKSwgJG91dHB1dEZpbGU7CiB9CisKK3N1YiBzdHJpcE1ldHJpY3MoJCQpCit7 CisgICAgbXkgKCRhY3R1YWwsICRleHBlY3RlZCkgPSBAXzsKKworICAgICRhY3R1YWwgPX4gcy9h dCBcKC0/WzAtOV0rLC0/WzAtOV0rXCkgKi8vZzsKKyAgICAkYWN0dWFsID1+IHMvc2l6ZSAtP1sw LTldK3gtP1swLTldKyAqLy9nOworICAgICRhY3R1YWwgPX4gcy90ZXh0IHJ1biB3aWR0aCAtP1sw LTldKzogLy9nOworICAgICRhY3R1YWwgPX4gcy90ZXh0IHJ1biB3aWR0aCAtP1swLTldKyBbYS16 QS1aIF0rOiAvL2c7CisgICAgJGFjdHVhbCA9fiBzL1JlbmRlckJ1dHRvbiB7QlVUVE9OfSAuKi9S ZW5kZXJCdXR0b24ge0JVVFRPTn0vZzsKKyAgICAkYWN0dWFsID1+IHMvUmVuZGVySW1hZ2Uge0lO UFVUfSAuKi9SZW5kZXJJbWFnZSB7SU5QVVR9L2c7CisgICAgJGFjdHVhbCA9fiBzL1JlbmRlckJs b2NrIHtJTlBVVH0gLiovUmVuZGVyQmxvY2sge0lOUFVUfS9nOworICAgICRhY3R1YWwgPX4gcy9S ZW5kZXJUZXh0Q29udHJvbCB7SU5QVVR9IC4qL1JlbmRlclRleHRDb250cm9sIHtJTlBVVH0vZzsK KyAgICAkYWN0dWFsID1+IHMvXChbMC05XStweC9weC9nOworICAgICRhY3R1YWwgPX4gcy8gKiIg KlxuICsiICovIC9nOworICAgICRhY3R1YWwgPX4gcy8iICskLyIvZzsKKworICAgICRhY3R1YWwg PX4gcy8tIC8tL2c7CisgICAgJGFjdHVhbCA9fiBzL1xuKCAqKSJccysvXG4kMSIvZzsKKyAgICAk YWN0dWFsID1+IHMvXHMrIlxuLyJcbi9nOworICAgICRhY3R1YWwgPX4gcy9zY3JvbGxXaWR0aCBb MC05XSsvc2Nyb2xsV2lkdGgvZzsKKyAgICAkYWN0dWFsID1+IHMvc2Nyb2xsSGVpZ2h0IFswLTld Ky9zY3JvbGxIZWlnaHQvZzsKKworICAgICRleHBlY3RlZCA9fiBzL2F0IFwoLT9bMC05XSssLT9b MC05XStcKSAqLy9nOworICAgICRleHBlY3RlZCA9fiBzL3NpemUgLT9bMC05XSt4LT9bMC05XSsg Ki8vZzsKKyAgICAkZXhwZWN0ZWQgPX4gcy90ZXh0IHJ1biB3aWR0aCAtP1swLTldKzogLy9nOwor ICAgICRleHBlY3RlZCA9fiBzL3RleHQgcnVuIHdpZHRoIC0/WzAtOV0rIFthLXpBLVogXSs6IC8v ZzsKKyAgICAkZXhwZWN0ZWQgPX4gcy9SZW5kZXJCdXR0b24ge0JVVFRPTn0gLiovUmVuZGVyQnV0 dG9uIHtCVVRUT059L2c7CisgICAgJGV4cGVjdGVkID1+IHMvUmVuZGVySW1hZ2Uge0lOUFVUfSAu Ki9SZW5kZXJJbWFnZSB7SU5QVVR9L2c7CisgICAgJGV4cGVjdGVkID1+IHMvUmVuZGVyQmxvY2sg e0lOUFVUfSAuKi9SZW5kZXJCbG9jayB7SU5QVVR9L2c7CisgICAgJGV4cGVjdGVkID1+IHMvUmVu ZGVyVGV4dENvbnRyb2wge0lOUFVUfSAuKi9SZW5kZXJUZXh0Q29udHJvbCB7SU5QVVR9L2c7Cisg ICAgJGV4cGVjdGVkID1+IHMvXChbMC05XStweC9weC9nOworICAgICRleHBlY3RlZCA9fiBzLyAq IiAqXG4gKyIgKi8gL2c7CisgICAgJGV4cGVjdGVkID1+IHMvIiArJC8iL2c7CisKKyAgICAkZXhw ZWN0ZWQgPX4gcy8tIC8tL2c7CisgICAgJGV4cGVjdGVkID1+IHMvXG4oICopIlxzKy9cbiQxIi9n OworICAgICRleHBlY3RlZCA9fiBzL1xzKyJcbi8iXG4vZzsKKyAgICAkZXhwZWN0ZWQgPX4gcy9z Y3JvbGxXaWR0aCBbMC05XSsvc2Nyb2xsV2lkdGgvZzsKKyAgICAkZXhwZWN0ZWQgPX4gcy9zY3Jv bGxIZWlnaHQgWzAtOV0rL3Njcm9sbEhlaWdodC9nOworCisgICAgcmV0dXJuICgkYWN0dWFsLCAk ZXhwZWN0ZWQpOworfQo=