31799 2009-11-23 02:07:11 -0800 run-webkit-tests doesn't accept directories/files with --skipped=only parameter 2009-11-25 14:26:43 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 ossy webkit-unassigned aroben darin ddkilzer kenneth mrowe oldest_to_newest 165810 0 ossy 2009-11-23 02:07:11 -0800 If you call run-webkit-tests script with --skipped=only parameter, you can't add directories as constraint, but script runs all of the skipped tests. It can take a long time on Qt and GTK port, because there are scores of skipped tests. Or it can go into an infinite loop because of a bug. 165811 1 ossy 2009-11-23 02:22:14 -0800 @@ -2106,7 +2116,13 @@ sub readSkippedFiles if ($skipped && $skipped !~ /^#/) { if ($skippedOnly) { if (!&fileShouldBeIgnored($skipped)) { - push(@ARGV, $skipped); + if (!$path) { + push(@ARGV, $skipped); + } elsif ($skipped =~/^($path)/) { + push(@ARGV, $skipped); + } elsif ($path =~/^($skipped)/) { + push(@ARGV, $path); + } } elsif ($verbose) { print " $skipped\n"; } 1st case: Original case, if you simple call "run-webkit-tests --skipped-only" 2nd case: If you call "run-webkit-tests --skipped=only SKIPPED_DIR" and there is a SKIPPED_DIR/skipped_file on skiplist, then SKIPPED_DIR/skipped_file will be pushed. 3rd case: If you call "run-webkit-tests --skippes=only dir1/dir2/dir3" and dir1 is on skiplist, then dir1/dir2/dir3 will be pushed. + # Remove duplicated tests + @testsToRun = keys %{{ map { $_ => 1 } @testsToRun }}; It is necessary if there are duplicated entries on skiplist. (eg. dir1/dir2/dir3 and dir1/dir2) It won't affect --iterations and --repeat-each parameters. 165812 2 43700 ossy 2009-11-23 02:23:24 -0800 Created attachment 43700 proposed patch 165916 3 43700 ddkilzer 2009-11-23 13:34:26 -0800 Comment on attachment 43700 proposed patch > diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests > index 1e37286..f339a76 100755 > --- a/WebKitTools/Scripts/run-webkit-tests > +++ b/WebKitTools/Scripts/run-webkit-tests > @@ -455,7 +454,16 @@ if (!checkWebCoreWCSSSupport(0)) { > } > > processIgnoreTests($ignoreTests, "ignore-tests") if $ignoreTests; > -readSkippedFiles() unless $ignoreSkipped; > +unless ($ignoreSkipped) > +{ I think this reads better: if (!$ignoreSkipped) { I'm not a big fan of 'unless', and I find it harder to read when used in place of an 'if' block. The curly brace should be on the same line as the unless/if statement as well. > + if (!$skippedOnly || $#ARGV == -1) { I think it's clearer to check the scalar value of @ARGV to see if it contains elements: if (!$skippedOnly || @ARGV == 0) { > + readSkippedFiles(""); > + } else { > + foreach my $argnum (0 .. $#ARGV) { > + readSkippedFiles(shift); > + } The foreach statement needs a comment about how it's preventing an infinite loop by only iterating over the original @ARGV list (since readSkippedFiles() appends to @ARGV). Maybe: # Since readSkippedFiles() appends to @ARGV, we must use a foreach # loop so that we only iterate over the original argument list. Using the implicit form of 'shift' on @ARGV was also confusing. (I expected shift to operate on @_, but I didn't realize it would fall back to @ARGV in this case since there was no @_ in this context.) I think this would read better: readSkippedFiles(shift @ARGV); > @@ -2089,8 +2097,10 @@ sub fileShouldBeIgnored > return 0; > } > > -sub readSkippedFiles > +sub readSkippedFiles($) > { > + my ($path) = @_; A better name might be $constraintPath since we're using it to constrain the skipped list entries. > + > foreach my $level (@platformTestHierarchy) { > if (open SKIPPED, "<", "$level/Skipped") { > if ($verbose) { > @@ -2106,7 +2116,13 @@ sub readSkippedFiles > if ($skipped && $skipped !~ /^#/) { > if ($skippedOnly) { > if (!&fileShouldBeIgnored($skipped)) { Bonus points for removing the unneeded '&' in the 'if' statement above. Not necessary though. > - push(@ARGV, $skipped); Overall, it would be nice to add a comment in each if/elsif/elsif block below that describes what's happening. > + if (!$path) { Perhaps: # Always add $skipped since no constraint path was specified on the command line. > + push(@ARGV, $skipped); > + } elsif ($skipped =~/^($path)/) { Perhaps: # Add $skipped only if it matches the current path constraint, e.g., # "--skipped=only dir1" with "dir1/file1.html" on the skipped list. Please add a space after the "=~" operator. > + push(@ARGV, $skipped); > + } elsif ($path =~/^($skipped)/) { Perhaps: # Add current path constraint if it is more specific than the skip list entry, # e.g., "--skipped=only dir1/dir2/dir3" with "dir1" on the skipped list. Please add a space after the "=~" operator. > + push(@ARGV, $path); > + } > } elsif ($verbose) { > print " $skipped\n"; > } > @@ -2177,6 +2193,9 @@ sub findTestsToRun > } > } > > + # Remove duplicated tests > + @testsToRun = keys %{{ map { $_ => 1 } @testsToRun }}; Typo: use "duplicate" instead of "duplicated" r- to address minor issues. 166533 4 ossy 2009-11-25 12:52:41 -0800 (In reply to comment #3) Thanks for your reflections and advices. The modified patch is submitted. Sorry for coding style violations. I will regard lots better next time. > > foreach my $level (@platformTestHierarchy) { > > if (open SKIPPED, "<", "$level/Skipped") { > > if ($verbose) { > > @@ -2106,7 +2116,13 @@ sub readSkippedFiles > > if ($skipped && $skipped !~ /^#/) { > > if ($skippedOnly) { > > if (!&fileShouldBeIgnored($skipped)) { > > Bonus points for removing the unneeded '&' in the 'if' statement above. Not > necessary though. I didn't find unneeded if. Which do you mean? 166537 5 ddkilzer 2009-11-25 12:59:59 -0800 (In reply to comment #4) > (In reply to comment #3) > > Thanks for your reflections and advices. The modified patch is submitted. > Sorry for coding style violations. I will regard lots better next time. Some of it is personal preference, too. I'm not sure all of this is codified in our style documentation (since that mostly reflects C++ code). > > > if (!&fileShouldBeIgnored($skipped)) { > > > > Bonus points for removing the unneeded '&' in the 'if' statement above. Not > > necessary though. > > I didn't find unneeded if. Which do you mean? I meant changing this: - if (!&fileShouldBeIgnored($skipped)) { + if (!fileShouldBeIgnored($skipped)) { The '&' operator is unnecessary in this case (and is a remnant of an earlier Perl style). 166540 6 43865 ossy 2009-11-25 13:11:18 -0800 Created attachment 43865 updated patch 166541 7 ossy 2009-11-25 13:13:45 -0800 (In reply to comment #6) > The '&' operator is unnecessary in this case (and is a remnant of an earlier > Perl style). OK, I removed it. And submitted the updated patch that I forgot previously. :) 166553 8 43865 ddkilzer 2009-11-25 14:11:13 -0800 Comment on attachment 43865 updated patch r=me Thanks! 166557 9 ossy 2009-11-25 14:26:43 -0800 (In reply to comment #8) > (From update of attachment 43865 [details]) > r=me Thanks! Sending WebKitTools/ChangeLog Sending WebKitTools/Scripts/run-webkit-tests Transmitting file data .. Committed revision 51395. 43700 2009-11-23 02:23:24 -0800 2009-11-25 13:11:18 -0800 proposed patch skippedonly_proposed.patch text/plain 3008 ossy ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzOTg1YTJiLi4wODNlYmJmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMTEt MjMgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIGRvZXNu J3QgYWNjZXB0IGRpcmVjdG9yaWVzL2ZpbGVzIHdpdGggLS1za2lwcGVkPW9ubHkgcGFyYW1ldGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTc5OQor CisgICAgICAgICogU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzOiBGaXhlZC4KKwogMjAwOS0xMS0y MCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0 LXRlc3RzIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCmluZGV4IDFlMzcy ODYuLmYzMzlhNzYgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10 ZXN0cworKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMKQEAgLTk3LDYg Kzk3LDcgQEAgc3ViIHBhdGhjbXAoJCQpOwogc3ViIHByaW50RmFpbHVyZU1lc3NhZ2VGb3JUZXN0 KCQkKTsKIHN1YiBwcm9jZXNzSWdub3JlVGVzdHMoJCQpOwogc3ViIHJlYWRGcm9tRHVtcFRvb2xX aXRoVGltZXIoKiopOworc3ViIHJlYWRTa2lwcGVkRmlsZXMoJCk7CiBzdWIgcmVjb3JkQWN0dWFs UmVzdWx0c0FuZERpZmYoJCQpOwogc3ViIHNhbXBsZUR1bXBUb29sKCk7CiBzdWIgc2V0RmlsZUhh bmRsZU5vbkJsb2NraW5nKCokKTsKQEAgLTI5Nyw4ICsyOTgsNiBAQCBpZiAoISRnZXRPcHRpb25z UmVzdWx0IHx8ICRzaG93SGVscCkgewogbXkgJGlnbm9yZVNraXBwZWQgPSAkdHJlYXRTa2lwcGVk IGVxICJpZ25vcmUiOwogbXkgJHNraXBwZWRPbmx5ID0gJHRyZWF0U2tpcHBlZCBlcSAib25seSI7 CiAKLSEkc2tpcHBlZE9ubHkgfHwgQEFSR1YgPT0gMCBvciBkaWUgIi0tc2tpcHBlZD1vbmx5IGNh bm5vdCBiZSB1c2VkIHdoZW4gdGVzdHMgYXJlIHNwZWNpZmllZCBvbiB0aGUgY29tbWFuZCBsaW5l LiI7Ci0KIG15ICRjb25maWd1cmF0aW9uID0gY29uZmlndXJhdGlvbigpOwogCiAkdmVyYm9zZSA9 IDEgaWYgJHRlc3RzUGVyRHVtcFRvb2wgPT0gMTsKQEAgLTQ1NSw3ICs0NTQsMTYgQEAgaWYgKCFj aGVja1dlYkNvcmVXQ1NTU3VwcG9ydCgwKSkgewogfQogCiBwcm9jZXNzSWdub3JlVGVzdHMoJGln bm9yZVRlc3RzLCAiaWdub3JlLXRlc3RzIikgaWYgJGlnbm9yZVRlc3RzOwotcmVhZFNraXBwZWRG aWxlcygpIHVubGVzcyAkaWdub3JlU2tpcHBlZDsKK3VubGVzcyAoJGlnbm9yZVNraXBwZWQpCit7 CisgICAgaWYgKCEkc2tpcHBlZE9ubHkgfHwgJCNBUkdWID09IC0xKSB7CisgICAgICAgIHJlYWRT a2lwcGVkRmlsZXMoIiIpOworICAgIH0gZWxzZSB7CisgICAgICAgIGZvcmVhY2ggbXkgJGFyZ251 bSAoMCAuLiAkI0FSR1YpIHsKKyAgICAgICAgICAgIHJlYWRTa2lwcGVkRmlsZXMoc2hpZnQpOwor ICAgICAgICB9CisgICAgfQorfQogCiBteSBAdGVzdHMgPSBmaW5kVGVzdHNUb1J1bigpOwogCkBA IC0yMDg5LDggKzIwOTcsMTAgQEAgc3ViIGZpbGVTaG91bGRCZUlnbm9yZWQKICAgICByZXR1cm4g MDsKIH0KIAotc3ViIHJlYWRTa2lwcGVkRmlsZXMKK3N1YiByZWFkU2tpcHBlZEZpbGVzKCQpCiB7 CisgICAgbXkgKCRwYXRoKSA9IEBfOworCiAgICAgZm9yZWFjaCBteSAkbGV2ZWwgKEBwbGF0Zm9y bVRlc3RIaWVyYXJjaHkpIHsKICAgICAgICAgaWYgKG9wZW4gU0tJUFBFRCwgIjwiLCAiJGxldmVs L1NraXBwZWQiKSB7CiAgICAgICAgICAgICBpZiAoJHZlcmJvc2UpIHsKQEAgLTIxMDYsNyArMjEx NiwxMyBAQCBzdWIgcmVhZFNraXBwZWRGaWxlcwogICAgICAgICAgICAgICAgIGlmICgkc2tpcHBl ZCAmJiAkc2tpcHBlZCAhfiAvXiMvKSB7CiAgICAgICAgICAgICAgICAgICAgIGlmICgkc2tpcHBl ZE9ubHkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmICghJmZpbGVTaG91bGRCZUlnbm9y ZWQoJHNraXBwZWQpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAQVJHViwg JHNraXBwZWQpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICghJHBhdGgpIHsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAQVJHViwgJHNraXBwZWQpOworICAg ICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzaWYgKCRza2lwcGVkID1+L14oJHBhdGgpLykg eworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBBUkdWLCAkc2tpcHBlZCk7 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNpZiAoJHBhdGggPX4vXigkc2tpcHBl ZCkvKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQEFSR1YsICRwYXRo KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgICAg ICB9IGVsc2lmICgkdmVyYm9zZSkgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByaW50 ICIgICAgJHNraXBwZWRcbiI7CiAgICAgICAgICAgICAgICAgICAgICAgICB9CkBAIC0yMTc3LDYg KzIxOTMsOSBAQCBzdWIgZmluZFRlc3RzVG9SdW4KICAgICAgICAgfQogICAgIH0KIAorICAgICMg UmVtb3ZlIGR1cGxpY2F0ZWQgdGVzdHMKKyAgICBAdGVzdHNUb1J1biA9IGtleXMgJXt7IG1hcCB7 ICRfID0+IDEgfSBAdGVzdHNUb1J1biB9fTsKKwogICAgIEB0ZXN0c1RvUnVuID0gc29ydCBwYXRo Y21wIEB0ZXN0c1RvUnVuOwogCiAgICAgIyBSZXZlcnNlIHRoZSB0ZXN0cwo= 43865 2009-11-25 13:11:18 -0800 2009-11-25 14:11:13 -0800 updated patch skippedonly_proposed2.patch text/plain 3849 ossy ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlMTQwZjIwLi40MzJmY2VhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMTEt MjUgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIGRvZXNu J3QgYWNjZXB0IGRpcmVjdG9yaWVzL2ZpbGVzIHdpdGggLS1za2lwcGVkPW9ubHkgcGFyYW1ldGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTc5OQor CisgICAgICAgICogU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzOiBGaXhlZC4KKwogMjAwOS0xMS0y NSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg QWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10 ZXN0cyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwppbmRleCAxZTM3Mjg2 Li5jMjcxNTZlIDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVz dHMKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCkBAIC05Nyw2ICs5 Nyw3IEBAIHN1YiBwYXRoY21wKCQkKTsKIHN1YiBwcmludEZhaWx1cmVNZXNzYWdlRm9yVGVzdCgk JCk7CiBzdWIgcHJvY2Vzc0lnbm9yZVRlc3RzKCQkKTsKIHN1YiByZWFkRnJvbUR1bXBUb29sV2l0 aFRpbWVyKCoqKTsKK3N1YiByZWFkU2tpcHBlZEZpbGVzKCQpOwogc3ViIHJlY29yZEFjdHVhbFJl c3VsdHNBbmREaWZmKCQkKTsKIHN1YiBzYW1wbGVEdW1wVG9vbCgpOwogc3ViIHNldEZpbGVIYW5k bGVOb25CbG9ja2luZygqJCk7CkBAIC0yOTcsOCArMjk4LDYgQEAgaWYgKCEkZ2V0T3B0aW9uc1Jl c3VsdCB8fCAkc2hvd0hlbHApIHsKIG15ICRpZ25vcmVTa2lwcGVkID0gJHRyZWF0U2tpcHBlZCBl cSAiaWdub3JlIjsKIG15ICRza2lwcGVkT25seSA9ICR0cmVhdFNraXBwZWQgZXEgIm9ubHkiOwog Ci0hJHNraXBwZWRPbmx5IHx8IEBBUkdWID09IDAgb3IgZGllICItLXNraXBwZWQ9b25seSBjYW5u b3QgYmUgdXNlZCB3aGVuIHRlc3RzIGFyZSBzcGVjaWZpZWQgb24gdGhlIGNvbW1hbmQgbGluZS4i OwotCiBteSAkY29uZmlndXJhdGlvbiA9IGNvbmZpZ3VyYXRpb24oKTsKIAogJHZlcmJvc2UgPSAx IGlmICR0ZXN0c1BlckR1bXBUb29sID09IDE7CkBAIC00NTUsNyArNDU0LDE3IEBAIGlmICghY2hl Y2tXZWJDb3JlV0NTU1N1cHBvcnQoMCkpIHsKIH0KIAogcHJvY2Vzc0lnbm9yZVRlc3RzKCRpZ25v cmVUZXN0cywgImlnbm9yZS10ZXN0cyIpIGlmICRpZ25vcmVUZXN0czsKLXJlYWRTa2lwcGVkRmls ZXMoKSB1bmxlc3MgJGlnbm9yZVNraXBwZWQ7CitpZiAoISRpZ25vcmVTa2lwcGVkKSB7CisgICAg aWYgKCEkc2tpcHBlZE9ubHkgfHwgQEFSR1YgPT0gMCkgeworICAgICAgICByZWFkU2tpcHBlZEZp bGVzKCIiKTsKKyAgICB9IGVsc2UgeworICAgICAgICAjIFNpbmNlIHJlYWRTa2lwcGVkRmlsZXMo KSBhcHBlbmRzIHRvIEBBUkdWLCB3ZSBtdXN0IHVzZSBhIGZvcmVhY2gKKyAgICAgICAgIyBsb29w IHNvIHRoYXQgd2Ugb25seSBpdGVyYXRlIG92ZXIgdGhlIG9yaWdpbmFsIGFyZ3VtZW50IGxpc3Qu CisgICAgICAgIGZvcmVhY2ggbXkgJGFyZ251bSAoMCAuLiAkI0FSR1YpIHsKKyAgICAgICAgICAg IHJlYWRTa2lwcGVkRmlsZXMoc2hpZnQgQEFSR1YpOworICAgICAgICB9CisgICAgfQorfQogCiBt eSBAdGVzdHMgPSBmaW5kVGVzdHNUb1J1bigpOwogCkBAIC0yMDg5LDggKzIwOTgsMTAgQEAgc3Vi IGZpbGVTaG91bGRCZUlnbm9yZWQKICAgICByZXR1cm4gMDsKIH0KIAotc3ViIHJlYWRTa2lwcGVk RmlsZXMKK3N1YiByZWFkU2tpcHBlZEZpbGVzKCQpCiB7CisgICAgbXkgKCRjb25zdHJhaW50UGF0 aCkgPSBAXzsKKwogICAgIGZvcmVhY2ggbXkgJGxldmVsIChAcGxhdGZvcm1UZXN0SGllcmFyY2h5 KSB7CiAgICAgICAgIGlmIChvcGVuIFNLSVBQRUQsICI8IiwgIiRsZXZlbC9Ta2lwcGVkIikgewog ICAgICAgICAgICAgaWYgKCR2ZXJib3NlKSB7CkBAIC0yMTA1LDggKzIxMTYsMTkgQEAgc3ViIHJl YWRTa2lwcGVkRmlsZXMKICAgICAgICAgICAgICAgICAkc2tpcHBlZCA9fiBzL1sgXG5ccl0rJC8v OwogICAgICAgICAgICAgICAgIGlmICgkc2tpcHBlZCAmJiAkc2tpcHBlZCAhfiAvXiMvKSB7CiAg ICAgICAgICAgICAgICAgICAgIGlmICgkc2tpcHBlZE9ubHkpIHsKLSAgICAgICAgICAgICAgICAg ICAgICAgIGlmICghJmZpbGVTaG91bGRCZUlnbm9yZWQoJHNraXBwZWQpKSB7Ci0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgcHVzaChAQVJHViwgJHNraXBwZWQpOworICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKCFmaWxlU2hvdWxkQmVJZ25vcmVkKCRza2lwcGVkKSkgeworICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGlmICghJGNvbnN0cmFpbnRQYXRoKSB7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICMgQWx3YXlzIGFkZCAkc2tpcHBlZCBzaW5jZSBubyBjb25zdHJh aW50IHBhdGggd2FzIHNwZWNpZmllZCBvbiB0aGUgY29tbWFuZCBsaW5lLgorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBwdXNoKEBBUkdWLCAkc2tpcHBlZCk7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfSBlbHNpZiAoJHNraXBwZWQgPX4gL14oJGNvbnN0cmFpbnRQYXRoKS8p IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBBZGQgJHNraXBwZWQgb25seSBp ZiBpdCBtYXRjaGVzIHRoZSBjdXJyZW50IHBhdGggY29uc3RyYWludCwgZS5nLiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIyAiLS1za2lwcGVkPW9ubHkgZGlyMSIgd2l0aCAiZGly MS9maWxlMS5odG1sIiBvbiB0aGUgc2tpcHBlZCBsaXN0LgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBwdXNoKEBBUkdWLCAkc2tpcHBlZCk7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfSBlbHNpZiAoJGNvbnN0cmFpbnRQYXRoID1+IC9eKCRza2lwcGVkKS8pIHsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBBZGQgY3VycmVudCBwYXRoIGNvbnN0cmFpbnQg aWYgaXQgaXMgbW9yZSBzcGVjaWZpYyB0aGFuIHRoZSBza2lwIGxpc3QgZW50cnksCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICMgZS5nLiwgIi0tc2tpcHBlZD1vbmx5IGRpcjEvZGly Mi9kaXIzIiB3aXRoICJkaXIxIiBvbiB0aGUgc2tpcHBlZCBsaXN0LgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBwdXNoKEBBUkdWLCAkY29uc3RyYWludFBhdGgpOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzaWYgKCR2 ZXJib3NlKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnQgIiAgICAkc2tpcHBl ZFxuIjsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KQEAgLTIxNzcsNiArMjE5OSw5IEBAIHN1 YiBmaW5kVGVzdHNUb1J1bgogICAgICAgICB9CiAgICAgfQogCisgICAgIyBSZW1vdmUgZHVwbGlj YXRlIHRlc3RzCisgICAgQHRlc3RzVG9SdW4gPSBrZXlzICV7eyBtYXAgeyAkXyA9PiAxIH0gQHRl c3RzVG9SdW4gfX07CisKICAgICBAdGVzdHNUb1J1biA9IHNvcnQgcGF0aGNtcCBAdGVzdHNUb1J1 bjsKIAogICAgICMgUmV2ZXJzZSB0aGUgdGVzdHMK