74389 2011-12-13 01:01:03 -0800 [Refactoring] Remove several global variables from prepare-ChangeLog 2011-12-13 21:13:27 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73531 1 haraken haraken aroben ddkilzer rniwa webkit.review.bot oldest_to_newest 519937 0 haraken 2011-12-13 01:01:03 -0800 We are planning to write unit-tests for prepare-ChangeLog in a run-leaks_unittest manner. This bug is one of the incremental refactorings to remove all top-level code and global variables from prepare-ChangeLog. Global variables in prepare-ChangeLog can be categorized as follows: [A: Constant variables] $changeLogTimeZone $SVN $GIT %supportedTestExtensions [B: Arguments] $bugDescription $bugNumber $name $emailAddress $mergeBase $gitCommit $gitIndex $gitReviewer $openChangeLogs $writeChangeLogs $showHelp $spewDiff $updateChangeLogs $parseOptionsResult [C: Global variables that are used many times here and there] $isSVN $isGit [D: Global variables that are used only a few times] %paths $changedFiles $conflictFiles $functionLists $addedRegressionTests $bugURL $filesInChangeLog $prefixes $changeLogs In this bug, we remove all global variables in [D]. More accurately, we make all variables in [D] being used only through parameter passing. 519949 1 118974 haraken 2011-12-13 01:21:51 -0800 Created attachment 118974 Patch 520629 2 118974 ddkilzer 2011-12-13 20:22:40 -0800 Comment on attachment 118974 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=118974&action=review r=me > Tools/Scripts/prepare-ChangeLog:176 > -my $addedRegressionTests = generateFileList(@changedFiles, @conflictFiles, %functionLists); > +my ($changedFiles, $conflictFiles, $functionLists, $addedRegressionTests) = generateFileList(%paths); In the future, it seems like we should try to come up with a data structure to hold this data instead of passing a list of variables back. This is okay for now, though. 520662 3 118974 webkit.review.bot 2011-12-13 21:13:23 -0800 Comment on attachment 118974 Patch Clearing flags on attachment: 118974 Committed r102736: <http://trac.webkit.org/changeset/102736> 520663 4 webkit.review.bot 2011-12-13 21:13:27 -0800 All reviewed patches have been landed. Closing bug. 118974 2011-12-13 01:21:51 -0800 2011-12-13 21:13:23 -0800 Patch bug-74389-20111213182150.patch text/plain 9368 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjMwNWZiMmYyZTJlMDc2MjdhOTFlYWVhYTQwYTZjMWMy MjhkYjBjMS4uOTU0MDlkMTM0YjAzMTViZTZmNThiOTU0NjA0ODdmMzdlZDU1ZWMxZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDExLTEyLTEzICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbUmVmYWN0b3JpbmddIFJlbW92ZSBzZXZlcmFsIGdsb2JhbCB2YXJpYWJsZXMgZnJv bSBwcmVwYXJlLUNoYW5nZUxvZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzQzODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXZSBhcmUgcGxhbm5pbmcgdG8gd3JpdGUgdW5pdC10ZXN0cyBmb3IgcHJlcGFy ZS1DaGFuZ2VMb2cgaW4gYSBydW4tbGVha3NfdW5pdHRlc3QKKyAgICAgICAgbWFubmVyLiBUaGlz IGJ1ZyBpcyBvbmUgb2YgdGhlIGluY3JlbWVudGFsIHJlZmFjdG9yaW5ncyB0byByZW1vdmUgYWxs IHRvcC1sZXZlbAorICAgICAgICBjb2RlIGFuZCBnbG9iYWwgdmFyaWFibGVzIGZyb20gcHJlcGFy ZS1DaGFuZ2VMb2cuIEluIHRoaXMgcGF0Y2gsCisgICAgICAgIHdlIG1ha2UgdGhlIGZvbGxvd2lu ZyBnbG9iYWwgdmFyaWFibGVzIGJlaW5nIHVzZWQgb25seSB0aHJvdWdoIHBhcmFtZXRlciBwYXNz aW5nLgorICAgICAgICAgICAgLSAlcGF0aHMKKyAgICAgICAgICAgIC0gJGNoYW5nZWRGaWxlcwor ICAgICAgICAgICAgLSAkY29uZmxpY3RGaWxlcworICAgICAgICAgICAgLSAkZnVuY3Rpb25MaXN0 cworICAgICAgICAgICAgLSAkYnVnVVJMCisKKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUtQ2hh bmdlTG9nOgorICAgICAgICAoZmluZENoYW5nZUxvZ3MpOgorICAgICAgICAoZ2VuZXJhdGVOZXdD aGFuZ2VMb2dzKToKKyAgICAgICAgKHByb2Nlc3NQYXRocyk6CisgICAgICAgIChnZW5lcmF0ZUZp bGVMaXN0KToKKyAgICAgICAgKGZpcnN0RGlyZWN0b3J5T3JDd2QpOgorCiAyMDExLTEyLTEyICDD gWTDoW0gS2FsbGFpICA8S2FsbGFpLkFkYW1Ac3R1ZC51LXN6ZWdlZC5odT4KIAogICAgICAgICBb UXRdIEZpeCBza2lwIGxpc3Qgc2VhcmNoIHBhdGggYW5kIGV4cGVjdGVkIGZpbGUgc2VhcmNoIHBh dGggaW4gT1JXVApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZyBi L1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKaW5kZXggNzVlODUwZWIxZTg1YmRiZTA0 MTg2MDY1ZWM3NjI4NGY1MmRlYjRiYy4uOTRjNTZiZDc4NTE3YTczYjkxZmE1M2IxZGJmYTE5NmYx MDM2YzZkNSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZworKysg Yi9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCkBAIC02OCwxMyArNjgsMTMgQEAgc3Vi IGNoYW5nZUxvZ0RhdGUoJCk7CiBzdWIgY2hhbmdlTG9nRW1haWxBZGRyZXNzRnJvbUFyZ3MoJCk7 CiBzdWIgY2hhbmdlTG9nTmFtZUZyb21BcmdzKCQpOwogc3ViIGZldGNoQnVnRGVzY3JpcHRpb25G cm9tVVJMKCQpOwotc3ViIGZpbmRDaGFuZ2VMb2dzKFwlKTsKK3N1YiBmaW5kQ2hhbmdlTG9ncygk KTsKIHN1YiBnZXRMYXRlc3RDaGFuZ2VMb2dzKCQpOwogc3ViIHJlc29sdmVDb25mbGljdGVkQ2hh bmdlTG9ncygkKTsKLXN1YiBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJCQkXCUpOwotc3ViIHByaW50 RGlmZihcQCk7CitzdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJCQkKTsKK3N1YiBwcmludERp ZmYoJCk7CiBzdWIgb3BlbkNoYW5nZUxvZ3MoJCk7Ci1zdWIgZmlyc3REaXJlY3RvcnlPckN3ZCgp Oworc3ViIGZpcnN0RGlyZWN0b3J5T3JDd2QoXCUpOwogc3ViIGRpZmZGcm9tVG9TdHJpbmcoKTsK IHN1YiBkaWZmQ29tbWFuZChAKTsKIHN1YiBzdGF0dXNDb21tYW5kKEApOwpAQCAtODMsOCArODMs OCBAQCBzdWIgZGlmZkhlYWRlckZvcm1hdCgpOwogc3ViIGZpbmRPcmlnaW5hbEZpbGVGcm9tU3Zu KCQpOwogc3ViIGRldGVybWluZVByb3BlcnR5Q2hhbmdlcygkJCQpOwogc3ViIHBsdXJhbGl6ZUFu ZExpc3QoJCRAKTsKLXN1YiBnZW5lcmF0ZUZpbGVMaXN0KFxAXEBcJSk7Ci1zdWIgZ2VuZXJhdGVG dW5jdGlvbkxpc3RzKFxAXCUpOworc3ViIGdlbmVyYXRlRmlsZUxpc3QoXCUpOworc3ViIGdlbmVy YXRlRnVuY3Rpb25MaXN0cygkJCk7CiBzdWIgaXNVbm1vZGlmaWVkU3RhdHVzKCQpOwogc3ViIGlz TW9kaWZpZWRTdGF0dXMoJCk7CiBzdWIgaXNBZGRlZFN0YXR1cygkKTsKQEAgLTEwNSw5ICsxMDUs MTggQEAgc3ViIHJldmlld2VyQW5kRGVzY3JpcHRpb25Gb3JHaXRDb21taXQoJCk7CiBzdWIgbm9y bWFsaXplTGluZUVuZGluZ3MoJCQpOwogc3ViIGRlY29kZUVudGl0aWVzKCQpOwogCisKKyMjIyBD b25zdGFudCB2YXJpYWJsZXMuCiAjIFByb2plY3QgdGltZSB6b25lIGZvciBDdXBlcnRpbm8sIENB LCBVUwogbXkgJGNoYW5nZUxvZ1RpbWVab25lID0gIlBTVDhQRFQiOwogCitteSAkU1ZOID0gInN2 biI7CitteSAkR0lUID0gImdpdCI7CisKK215ICVzdXBwb3J0ZWRUZXN0RXh0ZW5zaW9ucyA9IG1h cCB7ICRfID0+IDEgfSBxdyhodG1sIHNodG1sIHN2ZyB4bWwgeGh0bWwgcGwgcGhwKTsKKworCisj IyMgR2xvYmFsIHZhcmlhYmxlcyBmb3IgYXJndW1lbnRzLgogbXkgJGJ1Z0Rlc2NyaXB0aW9uOwog bXkgJGJ1Z051bWJlcjsKIG15ICRuYW1lOwpAQCAtMTU1LDQwICsxNjQsMzEgQEAgaWYgKCEkcGFy c2VPcHRpb25zUmVzdWx0IHx8ICRzaG93SGVscCkgewogCiBkaWUgIi0tZ2l0LWNvbW1pdCBhbmQg LS1naXQtaW5kZXggYXJlIGluY29tcGF0aWJsZS4iIGlmICgkZ2l0SW5kZXggJiYgJGdpdENvbW1p dCk7CiAKLW15ICVwYXRocyA9IHByb2Nlc3NQYXRocyhAQVJHVik7CiAKLW15ICRpc0dpdCA9IGlz R2l0RGlyZWN0b3J5KGZpcnN0RGlyZWN0b3J5T3JDd2QoKSk7Ci1teSAkaXNTVk4gPSBpc1NWTkRp cmVjdG9yeShmaXJzdERpcmVjdG9yeU9yQ3dkKCkpOworIyMjIE1haW4gcm91dGluZS4KK215ICVw YXRocyA9IHByb2Nlc3NQYXRocyhAQVJHVik7CiAKK215ICRpc0dpdCA9IGlzR2l0RGlyZWN0b3J5 KGZpcnN0RGlyZWN0b3J5T3JDd2QoJXBhdGhzKSk7CitteSAkaXNTVk4gPSBpc1NWTkRpcmVjdG9y eShmaXJzdERpcmVjdG9yeU9yQ3dkKCVwYXRocykpOwogJGlzU1ZOIHx8ICRpc0dpdCB8fCBkaWUg IkNvdWxkbid0IGRldGVybWluZSB5b3VyIHZlcnNpb24gY29udHJvbCBzeXN0ZW0uIjsKIAotbXkg JFNWTiA9ICJzdm4iOwotbXkgJEdJVCA9ICJnaXQiOwotCiAjIEZpbmQgdGhlIGxpc3Qgb2YgbW9k aWZpZWQgZmlsZXMKLW15IEBjaGFuZ2VkRmlsZXM7Ci1teSAlZnVuY3Rpb25MaXN0czsKLW15IEBj b25mbGljdEZpbGVzOwotCi1teSAlc3VwcG9ydGVkVGVzdEV4dGVuc2lvbnMgPSBtYXAgeyAkXyA9 PiAxIH0gcXcoaHRtbCBzaHRtbCBzdmcgeG1sIHhodG1sIHBsIHBocCk7Ci0KLW15ICRhZGRlZFJl Z3Jlc3Npb25UZXN0cyA9IGdlbmVyYXRlRmlsZUxpc3QoQGNoYW5nZWRGaWxlcywgQGNvbmZsaWN0 RmlsZXMsICVmdW5jdGlvbkxpc3RzKTsKK215ICgkY2hhbmdlZEZpbGVzLCAkY29uZmxpY3RGaWxl cywgJGZ1bmN0aW9uTGlzdHMsICRhZGRlZFJlZ3Jlc3Npb25UZXN0cykgPSBnZW5lcmF0ZUZpbGVM aXN0KCVwYXRocyk7CiAKLWlmICghQGNoYW5nZWRGaWxlcyAmJiAhQGNvbmZsaWN0RmlsZXMgJiYg IWtleXMgJWZ1bmN0aW9uTGlzdHMpIHsKK2lmICghQCRjaGFuZ2VkRmlsZXMgJiYgIUAkY29uZmxp Y3RGaWxlcyAmJiAha2V5cyAlJGZ1bmN0aW9uTGlzdHMpIHsKICAgICBwcmludCBTVERFUlIgIiAg Tm8gY2hhbmdlcyBmb3VuZC5cbiI7CiAgICAgZXhpdCAxOwogfQogCi1pZiAoQGNvbmZsaWN0Rmls ZXMpIHsKK2lmIChAJGNvbmZsaWN0RmlsZXMpIHsKICAgICBwcmludCBTVERFUlIgIiAgVGhlIGZv bGxvd2luZyBmaWxlcyBoYXZlIGNvbmZsaWN0cy4gUnVuIHByZXBhcmUtQ2hhbmdlTG9nIGFnYWlu IGFmdGVyIGZpeGluZyB0aGUgY29uZmxpY3RzOlxuIjsKLSAgICBwcmludCBTVERFUlIgam9pbigi XG4iLCBAY29uZmxpY3RGaWxlcyksICJcbiI7CisgICAgcHJpbnQgU1RERVJSIGpvaW4oIlxuIiwg QCRjb25mbGljdEZpbGVzKSwgIlxuIjsKICAgICBleGl0IDE7CiB9CiAKLWdlbmVyYXRlRnVuY3Rp b25MaXN0cyhAY2hhbmdlZEZpbGVzLCAlZnVuY3Rpb25MaXN0cyk7CitnZW5lcmF0ZUZ1bmN0aW9u TGlzdHMoJGNoYW5nZWRGaWxlcywgJGZ1bmN0aW9uTGlzdHMpOwogCiAjIEdldCBzb21lIHBhcmFt ZXRlcnMgZm9yIHRoZSBDaGFuZ2VMb2cgd2UgYXJlIGFib3V0IHRvIHdyaXRlLgotbXkgJGRhdGUg PSBjaGFuZ2VMb2dEYXRlKCRjaGFuZ2VMb2dUaW1lWm9uZSk7CiAkbmFtZSA9IGNoYW5nZUxvZ05h bWVGcm9tQXJncygkbmFtZSk7CiAkZW1haWxBZGRyZXNzID0gY2hhbmdlTG9nRW1haWxBZGRyZXNz RnJvbUFyZ3MoJGVtYWlsQWRkcmVzcyk7CiAKQEAgLTIwNiw3ICsyMDYsNyBAQCBpZiAoJGJ1Z051 bWJlciAmJiAhJGJ1Z0Rlc2NyaXB0aW9uKSB7CiAgICAgJGJ1Z0Rlc2NyaXB0aW9uID0gZmV0Y2hC dWdEZXNjcmlwdGlvbkZyb21VUkwoJGJ1Z1VSTCk7CiB9CiAKLW15ICgkZmlsZXNJbkNoYW5nZUxv ZywgJHByZWZpeGVzKSA9IGZpbmRDaGFuZ2VMb2dzKCVmdW5jdGlvbkxpc3RzKTsKK215ICgkZmls ZXNJbkNoYW5nZUxvZywgJHByZWZpeGVzKSA9IGZpbmRDaGFuZ2VMb2dzKCRmdW5jdGlvbkxpc3Rz KTsKIAogIyBHZXQgdGhlIGxhdGVzdCBDaGFuZ2VMb2cgZmlsZXMgZnJvbSBzdm4uCiBteSAkY2hh bmdlTG9ncyA9IGdldExhdGVzdENoYW5nZUxvZ3MoJHByZWZpeGVzKTsKQEAgLTIxNSwxNSArMjE1 LDE1IEBAIGlmIChAJGNoYW5nZUxvZ3MgJiYgJHVwZGF0ZUNoYW5nZUxvZ3MgJiYgJGlzU1ZOKSB7 CiAgICAgcmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCRjaGFuZ2VMb2dzKTsKIH0KIAotZ2Vu ZXJhdGVOZXdDaGFuZ2VMb2dzKCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJl Z3Jlc3Npb25UZXN0cywgJWZ1bmN0aW9uTGlzdHMpOworZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCRw cmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jlc3Npb25UZXN0cywgJGZ1bmN0 aW9uTGlzdHMsICRidWdVUkwpOwogCiBpZiAoJHdyaXRlQ2hhbmdlTG9ncykgewogICAgIHByaW50 IFNUREVSUiAiLS0gUGxlYXNlIHJlbWVtYmVyIHRvIGluY2x1ZGUgYSBkZXRhaWxlZCBkZXNjcmlw dGlvbiBpbiB5b3VyIENoYW5nZUxvZyBlbnRyeS4gLS1cbi0tIFNlZSA8aHR0cDovL3dlYmtpdC5v cmcvY29kaW5nL2NvbnRyaWJ1dGluZy5odG1sPiBmb3IgbW9yZSBpbmZvIC0tXG4iOwogfQogCiAj IFdyaXRlIG91dCBhbm90aGVyIGRpZmYuCi1pZiAoJHNwZXdEaWZmICYmIEBjaGFuZ2VkRmlsZXMp IHsKLSAgICBwcmludERpZmYoQGNoYW5nZWRGaWxlcyk7CitpZiAoJHNwZXdEaWZmICYmIEAkY2hh bmdlZEZpbGVzKSB7CisgICAgcHJpbnREaWZmKCRjaGFuZ2VkRmlsZXMpOwogfQogCiAjIE9wZW4g Q2hhbmdlTG9ncy4KQEAgLTIzNSw3ICsyMzUsNyBAQCBpZiAoJG9wZW5DaGFuZ2VMb2dzICYmIEAk Y2hhbmdlTG9ncykgewogZXhpdDsKIAogCi1zdWIgZ2VuZXJhdGVGdW5jdGlvbkxpc3RzKFxAXCUp CitzdWIgZ2VuZXJhdGVGdW5jdGlvbkxpc3RzKCQkKQogewogICAgIG15ICgkY2hhbmdlZEZpbGVz LCAkZnVuY3Rpb25MaXN0cykgPSBAXzsKIApAQCAtMzY1LDEyICszNjUsMTQgQEAgc3ViIGZldGNo QnVnRGVzY3JpcHRpb25Gcm9tVVJMKCQpCiAgICAgcmV0dXJuICRidWdEZXNjcmlwdGlvbjsKIH0K IAotc3ViIGZpbmRDaGFuZ2VMb2dzKFwlKQorc3ViIGZpbmRDaGFuZ2VMb2dzKCQpCiB7CisgICAg bXkgKCRmdW5jdGlvbkxpc3RzKSA9IEBfOworCiAgICAgIyBGaW5kIHRoZSBjaGFuZ2UgbG9ncy4K ICAgICBteSAlaGFzX2xvZzsKICAgICBteSAlZmlsZXNJbkNoYW5nZUxvZzsKLSAgICBmb3JlYWNo IG15ICRmaWxlIChzb3J0IGtleXMgJWZ1bmN0aW9uTGlzdHMpIHsKKyAgICBmb3JlYWNoIG15ICRm aWxlIChzb3J0IGtleXMgJSRmdW5jdGlvbkxpc3RzKSB7CiAgICAgICAgIG15ICRwcmVmaXggPSAk ZmlsZTsKICAgICAgICAgbXkgJGhhc19sb2cgPSAwOwogICAgICAgICB3aGlsZSAoJHByZWZpeCkg ewpAQCAtNDUyLDkgKzQ1NCw5IEBAIHN1YiByZXNvbHZlQ29uZmxpY3RlZENoYW5nZUxvZ3MoJCkK ICAgICBjbG9zZSBSRVNPTFZFOwogfQogCi1zdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJFwl KQorc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCQkJCkKIHsKLSAgICBteSAoJHByZWZpeGVz LCAkZmlsZXNJbkNoYW5nZUxvZywgJGFkZGVkUmVncmVzc2lvblRlc3RzLCAkZnVuY3Rpb25MaXN0 cykgPSBAXzsKKyAgICBteSAoJHByZWZpeGVzLCAkZmlsZXNJbkNoYW5nZUxvZywgJGFkZGVkUmVn cmVzc2lvblRlc3RzLCAkZnVuY3Rpb25MaXN0cywgJGJ1Z1VSTCkgPSBAXzsKIAogICAgICMgR2Vu ZXJhdGUgbmV3IENoYW5nZUxvZyBlbnRyaWVzIGFuZCAob3B0aW9uYWxseSkgd3JpdGUgb3V0IG5l dyBDaGFuZ2VMb2cgZmlsZXMuCiAgICAgZm9yZWFjaCBteSAkcHJlZml4IChAJHByZWZpeGVzKSB7 CkBAIC00ODAsNiArNDgyLDcgQEAgc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCRcJSkKICAg ICAgICAgICAgIHByaW50IHN1YnN0cigkcHJlZml4LCAwLCBsZW5ndGgoJHByZWZpeCkgLSAxKSAu ICI6XG5cbiIgdW5sZXNzIChzY2FsYXIgQCRwcmVmaXhlcykgPT0gMTsKICAgICAgICAgfQogCisg ICAgICAgIG15ICRkYXRlID0gY2hhbmdlTG9nRGF0ZSgkY2hhbmdlTG9nVGltZVpvbmUpOwogICAg ICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIkZGF0ZSAgJG5hbWUg IDwkZW1haWxBZGRyZXNzPlxuXG4iLCAkZW5kbCk7CiAKICAgICAgICAgbXkgKCRyZXZpZXdlciwg JGRlc2NyaXB0aW9uKSA9IHJldmlld2VyQW5kRGVzY3JpcHRpb25Gb3JHaXRDb21taXQoJGdpdENv bW1pdCkgaWYgJGdpdENvbW1pdDsKQEAgLTUxNyw3ICs1MjAsNyBAQCBzdWIgZ2VuZXJhdGVOZXdD aGFuZ2VMb2dzKCQkJFwlKQogICAgIH0KIH0KIAotc3ViIHByaW50RGlmZihcQCkKK3N1YiBwcmlu dERpZmYoJCkKIHsKICAgICBteSAoJGNoYW5nZWRGaWxlcykgPSBAXzsKIApAQCAtMTU4NywxMyAr MTU5MCwxNiBAQCBzdWIgcGx1cmFsaXplQW5kTGlzdCgkJEApCiAgICAgcmV0dXJuICIkcGx1cmFs ICIgLiBqb2luKCIsICIsIEBpdGVtc1swIC4uICQjaXRlbXMgLSAxXSkgLiAiIGFuZCAiIC4gJGl0 ZW1zWy0xXTsKIH0KIAotc3ViIGdlbmVyYXRlRmlsZUxpc3QoXEBcQFwlKQorc3ViIGdlbmVyYXRl RmlsZUxpc3QoXCUpCiB7Ci0gICAgbXkgKCRjaGFuZ2VkRmlsZXMsICRjb25mbGljdEZpbGVzLCAk ZnVuY3Rpb25MaXN0cykgPSBAXzsKKyAgICBteSAoJHBhdGhzKSA9IEBfOwogCisgICAgbXkgQGNo YW5nZWRGaWxlczsKKyAgICBteSBAY29uZmxpY3RGaWxlczsKKyAgICBteSAlZnVuY3Rpb25MaXN0 czsKICAgICBteSBAYWRkZWRSZWdyZXNzaW9uVGVzdHM7CiAgICAgcHJpbnQgU1RERVJSICIgIFJ1 bm5pbmcgc3RhdHVzIHRvIGZpbmQgY2hhbmdlZCwgYWRkZWQsIG9yIHJlbW92ZWQgZmlsZXMuXG4i OwotICAgIG9wZW4gU1RBVCwgIi18Iiwgc3RhdHVzQ29tbWFuZChrZXlzICVwYXRocykgb3IgZGll ICJUaGUgc3RhdHVzIGZhaWxlZDogJCEuXG4iOworICAgIG9wZW4gU1RBVCwgIi18Iiwgc3RhdHVz Q29tbWFuZChrZXlzICUkcGF0aHMpIG9yIGRpZSAiVGhlIHN0YXR1cyBmYWlsZWQ6ICQhLlxuIjsK ICAgICB3aGlsZSAoPFNUQVQ+KSB7CiAgICAgICAgIG15ICRzdGF0dXM7CiAgICAgICAgIG15ICRw cm9wZXJ0eVN0YXR1czsKQEAgLTE2NTEsMTcgKzE2NTcsMTcgQEAgc3ViIGdlbmVyYXRlRmlsZUxp c3QoXEBcQFwlKQogICAgICAgICAgICAgICAgICAgICAgICAmJiAhc2NhbGFyKGdyZXAoL15yZXNv dXJjZXMkL2ksIEBjb21wb25lbnRzKSkKICAgICAgICAgICAgICAgICAgICAgICAgJiYgIXNjYWxh cihncmVwKC9ec2NyaXB0LXRlc3RzJC9pLCBAY29tcG9uZW50cykpOwogICAgICAgICAgICAgfQot ICAgICAgICAgICAgcHVzaCBAeyRjaGFuZ2VkRmlsZXN9LCAkZmlsZSBpZiAkY29tcG9uZW50c1sk I2NvbXBvbmVudHNdIG5lICJDaGFuZ2VMb2ciOworICAgICAgICAgICAgcHVzaCBAY2hhbmdlZEZp bGVzLCAkZmlsZSBpZiAkY29tcG9uZW50c1skI2NvbXBvbmVudHNdIG5lICJDaGFuZ2VMb2ciOwog ICAgICAgICB9IGVsc2lmIChpc0NvbmZsaWN0U3RhdHVzKCRzdGF0dXMpIHx8IGlzQ29uZmxpY3RT dGF0dXMoJHByb3BlcnR5U3RhdHVzKSkgewotICAgICAgICAgICAgcHVzaCBAeyRjb25mbGljdEZp bGVzfSwgJGZpbGU7CisgICAgICAgICAgICBwdXNoIEBjb25mbGljdEZpbGVzLCAkZmlsZTsKICAg ICAgICAgfQogICAgICAgICBpZiAoYmFzZW5hbWUoJGZpbGUpIG5lICJDaGFuZ2VMb2ciKSB7CiAg ICAgICAgICAgICBteSAkZGVzY3JpcHRpb24gPSBzdGF0dXNEZXNjcmlwdGlvbigkc3RhdHVzLCAk cHJvcGVydHlTdGF0dXMsICRvcmlnaW5hbCwgJHByb3BlcnR5Q2hhbmdlcyk7Ci0gICAgICAgICAg ICAkZnVuY3Rpb25MaXN0cy0+eyRmaWxlfSA9ICRkZXNjcmlwdGlvbiBpZiBkZWZpbmVkICRkZXNj cmlwdGlvbjsKKyAgICAgICAgICAgICRmdW5jdGlvbkxpc3RzeyRmaWxlfSA9ICRkZXNjcmlwdGlv biBpZiBkZWZpbmVkICRkZXNjcmlwdGlvbjsKICAgICAgICAgfQogICAgIH0KICAgICBjbG9zZSBT VEFUOwotICAgIHJldHVybiBcQGFkZGVkUmVncmVzc2lvblRlc3RzOworICAgIHJldHVybiAoXEBj aGFuZ2VkRmlsZXMsIFxAY29uZmxpY3RGaWxlcywgXCVmdW5jdGlvbkxpc3RzLCBcQGFkZGVkUmVn cmVzc2lvblRlc3RzKTsKIH0KIAogc3ViIGlzVW5tb2RpZmllZFN0YXR1cygkKQpAQCAtMTc4MSwx MCArMTc4NywxMiBAQCBzdWIgZXh0cmFjdExpbmVSYW5nZSgkKQogICAgIHJldHVybiAoJHN0YXJ0 LCAkZW5kKTsKIH0KIAotc3ViIGZpcnN0RGlyZWN0b3J5T3JDd2QoKQorc3ViIGZpcnN0RGlyZWN0 b3J5T3JDd2QoXCUpCiB7CisgICAgbXkgKCRwYXRocykgPSBAXzsKKwogICAgIG15ICRkaXIgPSAi LiI7Ci0gICAgbXkgQGRpcnMgPSBrZXlzKCVwYXRocyk7CisgICAgbXkgQGRpcnMgPSBrZXlzKCUk cGF0aHMpOwogCiAgICAgJGRpciA9IC1kICRkaXJzWzBdID8gJGRpcnNbMF0gOiBkaXJuYW1lKCRk aXJzWzBdKSBpZiBAZGlyczsKIAo=