28060 2009-08-06 20:56:11 -0700 bugzilla-tool needs a --quiet option 2009-08-08 09:02:03 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned ddkilzer eric oldest_to_newest 137776 0 abarth 2009-08-06 20:56:11 -0700 When running bugzilla-tool in --commit-queue mode, it produces a ton of output, most of which is not helpful for understanding what's going on. It would be useful to have a --quiet option for land-patches that suppressed most of the noise. In order of importance: 1) I don't need to see the build spew. It fine just to see "Building...". 2) I don't need to see the test spew. "Testing..." is fine. 3) If the tests fail it would be useful to see which ones. For example, grep the ouput for "fail" and "crash". 4) If a build fails, it would be useful to see which file failed to compile. This would make commit-queue about a 100x easy to run. 137777 1 eric 2009-08-06 20:59:30 -0700 I think some of this should be added to the sub-tools. maybe a --failures only mode for both run-webkit-tests and build-webkit. run-webkit-tests would be easy to add that for. build-webkit might be a little harder, but certainly doable! 137778 2 eric 2009-08-06 20:59:45 -0700 --failures-only is what I meant. 138025 3 34310 abarth 2009-08-07 12:00:30 -0700 Created attachment 34310 An 80% solution. 138152 4 34310 eric 2009-08-07 14:31:19 -0700 Comment on attachment 34310 An 80% solution. I'm not sure this is the best way to ignore output. Not I've used .communicate() and ginored the results in other places. Python has a ternary operator. You better sit down before you read it though: child_stdout = open(os.devnull, "w") if quiet else None Why not just print before every subcommand? print "build-webkit..." I don't really like the "..." 138257 5 34354 abarth 2009-08-07 18:50:07 -0700 Created attachment 34354 Patch v1 138258 6 abarth 2009-08-07 18:51:55 -0700 (In reply to comment #4) > (From update of attachment 34310 [details]) > I'm not sure this is the best way to ignore output. Not I've used > .communicate() and ginored the results in other places. I've changed to the communicate() way. That wastes memory because the output ends up in memory, but (1) I don't think it matters here and (2) we'll probably wan the contents in memory to report errors later. > Python has a ternary operator. You better sit down before you read it though: > > child_stdout = open(os.devnull, "w") if quiet else None Whatever. Fixed. > Why not just print before every subcommand? > print "build-webkit..." > I don't really like the "..." Done. Well, run-webkit-tests doesn't get a print, but it makes enough noise on its own even with --quiet. 138335 7 34354 eric 2009-08-08 08:53:06 -0700 Comment on attachment 34354 Patch v1 /dev/null is a fine solution. I just wanted you to be aware of the other version. I still think we should eventually log these to files in --commit-queue mode instead of just silencing them. But this is fine for now. :) 138340 8 34354 abarth 2009-08-08 09:01:58 -0700 Comment on attachment 34354 Patch v1 Clearing review flag on attachment: 34354 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/bugzilla-tool Committed r46954 M WebKitTools/ChangeLog M WebKitTools/Scripts/bugzilla-tool r46954 = 591e054feb134601f8ebf2784475b55e8f82f3ff (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46954 138341 9 abarth 2009-08-08 09:02:03 -0700 All reviewed patches have been landed. Closing bug. 34310 2009-08-07 12:00:30 -0700 2009-08-07 18:49:34 -0700 An 80% solution. bug-28060-20090807120029.patch text/plain 4908 abarth SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ2OTA0KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDgtMDcgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBidWd6aWxsYS10b29sIG5lZWRzIGEgLS1xdWlldCBvcHRpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4MDYwCisKKyAgICAgICAgQSBm aXJzdCBwYXNzIGF0IGEgLS1xdWlldCBvcHRpb24uICBUaGlzIGRvZXNuJ3QgZG8gYWxsIHRoZSBl eGN0aW5nCisgICAgICAgIHRoaW5ncyB3ZSBtaWdodCB3YW50LCBidXQgaXQgYWRkcmVzc2VzIDgw JSBvZiB0aGUgdXNlIGNhc2UuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1Z3ppbGxhLXRvb2w6CisK IDIwMDktMDgtMDcgIFBpZXJyZSBkJ0hlcmJlbW9udCAgPHBkaGVyYmVtb250QGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYktpdFRvb2xzL1Nj cmlwdHMvYnVnemlsbGEtdG9vbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL2J1 Z3ppbGxhLXRvb2wJKHJldmlzaW9uIDQ2ODk0KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6 aWxsYS10b29sCSh3b3JraW5nIGNvcHkpCkBAIC0yMTYsNiArMjE2LDcgQEAgY2xhc3MgTGFuZEFu ZFVwZGF0ZUJ1ZyhDb21tYW5kKToKICAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLW5vLWNsb3Nl IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImNsb3NlX2J1ZyIsIGRlZmF1bHQ9VHJ1ZSwg aGVscD0iTGVhdmUgYnVnIG9wZW4gYWZ0ZXIgbGFuZGluZy4iKSwKICAgICAgICAgICAgIG1ha2Vf b3B0aW9uKCItLW5vLWJ1aWxkIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImJ1aWxkIiwg ZGVmYXVsdD1UcnVlLCBoZWxwPSJDb21taXQgd2l0aG91dCBidWlsZGluZyBmaXJzdCwgaW1wbGll cyAtLW5vLXRlc3QuIiksCiAgICAgICAgICAgICBtYWtlX29wdGlvbigiLS1uby10ZXN0IiwgYWN0 aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InRlc3QiLCBkZWZhdWx0PVRydWUsIGhlbHA9IkNvbW1p dCB3aXRob3V0IHJ1bm5pbmcgcnVuLXdlYmtpdC10ZXN0cy4iKSwKKyAgICAgICAgICAgIG1ha2Vf b3B0aW9uKCItLXF1aWV0IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0icXVpZXQiLCBkZWZh dWx0PUZhbHNlLCBoZWxwPSJQcm9kdWNlIGxlc3MgY29uc29sZSBvdXRwdXQuIiksCiAgICAgICAg ICAgICBtYWtlX29wdGlvbigiLS1jb21taXQtcXVldWUiLCBhY3Rpb249InN0b3JlX3RydWUiLCBk ZXN0PSJjb21taXRfcXVldWUiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJSdW4gaW4gY29tbWl0IHF1 ZXVlIG1vZGUgKG5vIHVzZXIgaW50ZXJhY3Rpb24pLiIpLAogICAgICAgICBdCiAgICAgICAgIENv bW1hbmQuX19pbml0X18oc2VsZiwgJ0xhbmRzIHRoZSBjdXJyZW50IHdvcmtpbmcgZGlyZWN0b3J5 IGRpZmYgYW5kIHVwZGF0ZXMgdGhlIGJ1ZyBpZiBwcm92aWRlZC4nLCAnW0JVR0lEXScsIG9wdGlv bnM9b3B0aW9ucykKQEAgLTI3MywxNCArMjc0LDE5IEBAIGNsYXNzIExhbmRQYXRjaGVzRnJvbUJ1 Z3MoQ29tbWFuZCk6CiAgICAgICAgICAgICBtYWtlX29wdGlvbigiLS1uby1jbG9zZSIsIGFjdGlv bj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJjbG9zZV9idWciLCBkZWZhdWx0PVRydWUsIGhlbHA9Ikxl YXZlIGJ1ZyBvcGVuIGFmdGVyIGxhbmRpbmcuIiksCiAgICAgICAgICAgICBtYWtlX29wdGlvbigi LS1uby1idWlsZCIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJidWlsZCIsIGRlZmF1bHQ9 VHJ1ZSwgaGVscD0iQ29tbWl0IHdpdGhvdXQgYnVpbGRpbmcgZmlyc3QsIGltcGxpZXMgLS1uby10 ZXN0LiIpLAogICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tdGVzdCIsIGFjdGlvbj0ic3Rv cmVfZmFsc2UiLCBkZXN0PSJ0ZXN0IiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJDb21taXQgd2l0aG91 dCBydW5uaW5nIHJ1bi13ZWJraXQtdGVzdHMuIiksCisgICAgICAgICAgICBtYWtlX29wdGlvbigi LS1xdWlldCIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9InF1aWV0IiwgZGVmYXVsdD1GYWxz ZSwgaGVscD0iUHJvZHVjZSBsZXNzIGNvbnNvbGUgb3V0cHV0LiIpLAogICAgICAgICAgICAgbWFr ZV9vcHRpb24oIi0tY29tbWl0LXF1ZXVlIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0iY29t bWl0X3F1ZXVlIiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iUnVuIGluIGNvbW1pdCBxdWV1ZSBtb2Rl IChubyB1c2VyIGludGVyYWN0aW9uKS4iKSwKICAgICAgICAgXQogICAgICAgICBDb21tYW5kLl9f aW5pdF9fKHNlbGYsICdMYW5kcyBhbGwgcGF0Y2hlcyBvbiBhIGJ1ZyBvcHRpb25hbGx5IHRlc3Rp bmcgdGhlbSBmaXJzdCcsICdCVUdJRCcsIG9wdGlvbnM9b3B0aW9ucykKIAogICAgIEBzdGF0aWNt ZXRob2QKLSAgICBkZWYgcnVuX2FuZF90aHJvd19pZl9mYWlsKGFyZ3MpOgotICAgICAgICBidWls ZF93ZWJraXRfcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oYXJncykKLSAgICAgICAgcmV0dXJu X2NvZGUgPSBidWlsZF93ZWJraXRfcHJvY2Vzcy53YWl0KCkKKyAgICBkZWYgcnVuX2FuZF90aHJv d19pZl9mYWlsKGFyZ3MsIHF1aWV0PUZhbHNlKToKKyAgICAgICAgaWYgcXVpZXQ6CisgICAgICAg ICAgICBjaGlsZF9zdGRvdXQgPSBvcGVuKG9zLmRldm51bGwsICJ3IikKKyAgICAgICAgZWxzZToK KyAgICAgICAgICAgIGNoaWxkX3N0ZG91dCA9IE5vbmUKKyAgICAgICAgY2hpbGRfcHJvY2VzcyA9 IHN1YnByb2Nlc3MuUG9wZW4oYXJncywgc3Rkb3V0PWNoaWxkX3N0ZG91dCkKKyAgICAgICAgcmV0 dXJuX2NvZGUgPSBjaGlsZF9wcm9jZXNzLndhaXQoKQogICAgICAgICBpZiByZXR1cm5fY29kZToK ICAgICAgICAgICAgIHJhaXNlIFNjcmlwdEVycm9yKCIlcyBmYWlsZWQgd2l0aCBleGl0IGNvZGUg JWQiICUgKCIgIi5qb2luKGFyZ3MpLCByZXR1cm5fY29kZSkpCiAKQEAgLTI5MCwxOCArMjk2LDIy IEBAIGNsYXNzIExhbmRQYXRjaGVzRnJvbUJ1Z3MoQ29tbWFuZCk6CiAgICAgICAgIHJldHVybiBv cy5wYXRoLmpvaW4oIldlYktpdFRvb2xzIiwgIlNjcmlwdHMiLCBzY3JpcHRfbmFtZSkKIAogICAg IEBjbGFzc21ldGhvZAotICAgIGRlZiBydW5fd2Via2l0X3NjcmlwdChjbHMsIHNjcmlwdF9uYW1l KToKLSAgICAgICAgY2xzLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbChjbHMud2Via2l0X3NjcmlwdF9w YXRoKHNjcmlwdF9uYW1lKSkKKyAgICBkZWYgcnVuX3dlYmtpdF9zY3JpcHQoY2xzLCBzY3JpcHRf bmFtZSwgcXVpZXQ9RmFsc2UpOgorICAgICAgICBjbHMucnVuX2FuZF90aHJvd19pZl9mYWlsKGNs cy53ZWJraXRfc2NyaXB0X3BhdGgoc2NyaXB0X25hbWUpLCBxdWlldCkKIAogICAgIEBjbGFzc21l dGhvZAotICAgIGRlZiBidWlsZF93ZWJraXQoY2xzKToKLSAgICAgICAgY2xzLnJ1bl93ZWJraXRf c2NyaXB0KCJidWlsZC13ZWJraXQiKQorICAgIGRlZiBidWlsZF93ZWJraXQoY2xzLCBxdWlldD1G YWxzZSk6CisgICAgICAgIHByaW50ICJidWlsZC13ZWJraXQuLi4iCisgICAgICAgIGNscy5ydW5f d2Via2l0X3NjcmlwdCgiYnVpbGQtd2Via2l0IiwgcXVpZXQpCiAKICAgICBAY2xhc3NtZXRob2QK LSAgICBkZWYgcnVuX3dlYmtpdF90ZXN0cyhjbHMsIGxhdW5jaF9zYWZhcmkpOgorICAgIGRlZiBy dW5fd2Via2l0X3Rlc3RzKGNscywgbGF1bmNoX3NhZmFyaSwgcXVpZXQ9RmFsc2UpOgorICAgICAg ICBwcmludCAicnVuLXdlYmtpdC10ZXN0cy4uLiIKICAgICAgICAgYXJncyA9IFtjbHMud2Via2l0 X3NjcmlwdF9wYXRoKCJydW4td2Via2l0LXRlc3RzIildCiAgICAgICAgIGlmIG5vdCBsYXVuY2hf c2FmYXJpOgogICAgICAgICAgICAgYXJncy5hcHBlbmQoIi0tbm8tbGF1bmNoLXNhZmFyaSIpCisg ICAgICAgIGlmIHF1aWV0OgorICAgICAgICAgICAgYXJncy5hcHBlbmQoIi0tcXVpZXQiKQogICAg ICAgICBjbHMucnVuX2FuZF90aHJvd19pZl9mYWlsKGFyZ3MpCiAKICAgICBAc3RhdGljbWV0aG9k CkBAIC0zMTQsOSArMzI0LDkgQEAgY2xhc3MgTGFuZFBhdGNoZXNGcm9tQnVncyhDb21tYW5kKToK ICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgYnVpbGRfYW5kX2NvbW1pdChjbHMsIHNjbSwgb3B0 aW9ucyk6CiAgICAgICAgIGlmIG9wdGlvbnMuYnVpbGQ6Ci0gICAgICAgICAgICBjbHMuYnVpbGRf d2Via2l0KCkKKyAgICAgICAgICAgIGNscy5idWlsZF93ZWJraXQocXVpZXQ9b3B0aW9ucy5xdWll dCkKICAgICAgICAgICAgIGlmIG9wdGlvbnMudGVzdDoKLSAgICAgICAgICAgICAgICBjbHMucnVu X3dlYmtpdF90ZXN0cyhsYXVuY2hfc2FmYXJpPW5vdCBvcHRpb25zLmNvbW1pdF9xdWV1ZSkKKyAg ICAgICAgICAgICAgICBjbHMucnVuX3dlYmtpdF90ZXN0cyhsYXVuY2hfc2FmYXJpPW5vdCBvcHRp b25zLmNvbW1pdF9xdWV1ZSwgcXVpZXQ9b3B0aW9ucy5xdWlldCkKICAgICAgICAgY29tbWl0X21l c3NhZ2UgPSBjb21taXRfbWVzc2FnZV9mb3JfdGhpc19jb21taXQoc2NtKQogICAgICAgICBjb21t aXRfbG9nID0gc2NtLmNvbW1pdF93aXRoX21lc3NhZ2UoY29tbWl0X21lc3NhZ2UubWVzc2FnZSgp KQogICAgICAgICByZXR1cm4gYnVnX2NvbW1lbnRfZnJvbV9jb21taXRfdGV4dChzY20sIGNvbW1p dF9sb2cp 34354 2009-08-07 18:50:07 -0700 2009-08-08 09:01:57 -0700 Patch v1 bug-28060-20090807185006.patch text/plain 4909 abarth SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ2OTA0KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDgtMDcgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBidWd6aWxsYS10b29sIG5lZWRzIGEgLS1xdWlldCBvcHRpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4MDYwCisKKyAgICAgICAgQSBm aXJzdCBwYXNzIGF0IGEgLS1xdWlldCBvcHRpb24uICBUaGlzIGRvZXNuJ3QgZG8gYWxsIHRoZSBl eGN0aW5nCisgICAgICAgIHRoaW5ncyB3ZSBtaWdodCB3YW50LCBidXQgaXQgYWRkcmVzc2VzIDgw JSBvZiB0aGUgdXNlIGNhc2UuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1Z3ppbGxhLXRvb2w6CisK IDIwMDktMDgtMDcgIFBpZXJyZSBkJ0hlcmJlbW9udCAgPHBkaGVyYmVtb250QGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYktpdFRvb2xzL1Nj cmlwdHMvYnVnemlsbGEtdG9vbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL2J1 Z3ppbGxhLXRvb2wJKHJldmlzaW9uIDQ2ODk0KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6 aWxsYS10b29sCSh3b3JraW5nIGNvcHkpCkBAIC0yMTYsNiArMjE2LDcgQEAgY2xhc3MgTGFuZEFu ZFVwZGF0ZUJ1ZyhDb21tYW5kKToKICAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLW5vLWNsb3Nl IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImNsb3NlX2J1ZyIsIGRlZmF1bHQ9VHJ1ZSwg aGVscD0iTGVhdmUgYnVnIG9wZW4gYWZ0ZXIgbGFuZGluZy4iKSwKICAgICAgICAgICAgIG1ha2Vf b3B0aW9uKCItLW5vLWJ1aWxkIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImJ1aWxkIiwg ZGVmYXVsdD1UcnVlLCBoZWxwPSJDb21taXQgd2l0aG91dCBidWlsZGluZyBmaXJzdCwgaW1wbGll cyAtLW5vLXRlc3QuIiksCiAgICAgICAgICAgICBtYWtlX29wdGlvbigiLS1uby10ZXN0IiwgYWN0 aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InRlc3QiLCBkZWZhdWx0PVRydWUsIGhlbHA9IkNvbW1p dCB3aXRob3V0IHJ1bm5pbmcgcnVuLXdlYmtpdC10ZXN0cy4iKSwKKyAgICAgICAgICAgIG1ha2Vf b3B0aW9uKCItLXF1aWV0IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0icXVpZXQiLCBkZWZh dWx0PUZhbHNlLCBoZWxwPSJQcm9kdWNlIGxlc3MgY29uc29sZSBvdXRwdXQuIiksCiAgICAgICAg ICAgICBtYWtlX29wdGlvbigiLS1jb21taXQtcXVldWUiLCBhY3Rpb249InN0b3JlX3RydWUiLCBk ZXN0PSJjb21taXRfcXVldWUiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJSdW4gaW4gY29tbWl0IHF1 ZXVlIG1vZGUgKG5vIHVzZXIgaW50ZXJhY3Rpb24pLiIpLAogICAgICAgICBdCiAgICAgICAgIENv bW1hbmQuX19pbml0X18oc2VsZiwgJ0xhbmRzIHRoZSBjdXJyZW50IHdvcmtpbmcgZGlyZWN0b3J5 IGRpZmYgYW5kIHVwZGF0ZXMgdGhlIGJ1ZyBpZiBwcm92aWRlZC4nLCAnW0JVR0lEXScsIG9wdGlv bnM9b3B0aW9ucykKQEAgLTI3MywxNCArMjc0LDE4IEBAIGNsYXNzIExhbmRQYXRjaGVzRnJvbUJ1 Z3MoQ29tbWFuZCk6CiAgICAgICAgICAgICBtYWtlX29wdGlvbigiLS1uby1jbG9zZSIsIGFjdGlv bj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJjbG9zZV9idWciLCBkZWZhdWx0PVRydWUsIGhlbHA9Ikxl YXZlIGJ1ZyBvcGVuIGFmdGVyIGxhbmRpbmcuIiksCiAgICAgICAgICAgICBtYWtlX29wdGlvbigi LS1uby1idWlsZCIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJidWlsZCIsIGRlZmF1bHQ9 VHJ1ZSwgaGVscD0iQ29tbWl0IHdpdGhvdXQgYnVpbGRpbmcgZmlyc3QsIGltcGxpZXMgLS1uby10 ZXN0LiIpLAogICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tdGVzdCIsIGFjdGlvbj0ic3Rv cmVfZmFsc2UiLCBkZXN0PSJ0ZXN0IiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJDb21taXQgd2l0aG91 dCBydW5uaW5nIHJ1bi13ZWJraXQtdGVzdHMuIiksCisgICAgICAgICAgICBtYWtlX29wdGlvbigi LS1xdWlldCIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9InF1aWV0IiwgZGVmYXVsdD1GYWxz ZSwgaGVscD0iUHJvZHVjZSBsZXNzIGNvbnNvbGUgb3V0cHV0LiIpLAogICAgICAgICAgICAgbWFr ZV9vcHRpb24oIi0tY29tbWl0LXF1ZXVlIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0iY29t bWl0X3F1ZXVlIiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iUnVuIGluIGNvbW1pdCBxdWV1ZSBtb2Rl IChubyB1c2VyIGludGVyYWN0aW9uKS4iKSwKICAgICAgICAgXQogICAgICAgICBDb21tYW5kLl9f aW5pdF9fKHNlbGYsICdMYW5kcyBhbGwgcGF0Y2hlcyBvbiBhIGJ1ZyBvcHRpb25hbGx5IHRlc3Rp bmcgdGhlbSBmaXJzdCcsICdCVUdJRCcsIG9wdGlvbnM9b3B0aW9ucykKIAogICAgIEBzdGF0aWNt ZXRob2QKLSAgICBkZWYgcnVuX2FuZF90aHJvd19pZl9mYWlsKGFyZ3MpOgotICAgICAgICBidWls ZF93ZWJraXRfcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oYXJncykKLSAgICAgICAgcmV0dXJu X2NvZGUgPSBidWlsZF93ZWJraXRfcHJvY2Vzcy53YWl0KCkKKyAgICBkZWYgcnVuX2FuZF90aHJv d19pZl9mYWlsKGFyZ3MsIHF1aWV0PUZhbHNlKToKKyAgICAgICAgY2hpbGRfc3Rkb3V0ID0gc3Vi cHJvY2Vzcy5QSVBFIGlmIHF1aWV0IGVsc2UgTm9uZQorICAgICAgICBjaGlsZF9wcm9jZXNzID0g c3VicHJvY2Vzcy5Qb3BlbihhcmdzLCBzdGRvdXQ9Y2hpbGRfc3Rkb3V0KQorICAgICAgICBpZiBj aGlsZF9wcm9jZXNzLnN0ZG91dDoKKyAgICAgICAgICAgIGNoaWxkX3Byb2Nlc3MuY29tbXVuaWNh dGUoKQorICAgICAgICByZXR1cm5fY29kZSA9IGNoaWxkX3Byb2Nlc3Mud2FpdCgpCiAgICAgICAg IGlmIHJldHVybl9jb2RlOgogICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJyb3IoIiVzIGZhaWxl ZCB3aXRoIGV4aXQgY29kZSAlZCIgJSAoIiAiLmpvaW4oYXJncyksIHJldHVybl9jb2RlKSkKIApA QCAtMjkwLDE4ICsyOTUsMjEgQEAgY2xhc3MgTGFuZFBhdGNoZXNGcm9tQnVncyhDb21tYW5kKToK ICAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbigiV2ViS2l0VG9vbHMiLCAiU2NyaXB0cyIsIHNj cmlwdF9uYW1lKQogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIHJ1bl93ZWJraXRfc2NyaXB0 KGNscywgc2NyaXB0X25hbWUpOgotICAgICAgICBjbHMucnVuX2FuZF90aHJvd19pZl9mYWlsKGNs cy53ZWJraXRfc2NyaXB0X3BhdGgoc2NyaXB0X25hbWUpKQorICAgIGRlZiBydW5fd2Via2l0X3Nj cmlwdChjbHMsIHNjcmlwdF9uYW1lLCBxdWlldD1GYWxzZSk6CisgICAgICAgIHByaW50ICJSdW5u aW5nIFdlYktpdCBTY3JpcHQgIiArIHNjcmlwdF9uYW1lCisgICAgICAgIGNscy5ydW5fYW5kX3Ro cm93X2lmX2ZhaWwoY2xzLndlYmtpdF9zY3JpcHRfcGF0aChzY3JpcHRfbmFtZSksIHF1aWV0KQog CiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIGJ1aWxkX3dlYmtpdChjbHMpOgotICAgICAgICBj bHMucnVuX3dlYmtpdF9zY3JpcHQoImJ1aWxkLXdlYmtpdCIpCisgICAgZGVmIGJ1aWxkX3dlYmtp dChjbHMsIHF1aWV0PUZhbHNlKToKKyAgICAgICAgY2xzLnJ1bl93ZWJraXRfc2NyaXB0KCJidWls ZC13ZWJraXQiLCBxdWlldCkKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBydW5fd2Via2l0 X3Rlc3RzKGNscywgbGF1bmNoX3NhZmFyaSk6CisgICAgZGVmIHJ1bl93ZWJraXRfdGVzdHMoY2xz LCBsYXVuY2hfc2FmYXJpLCBxdWlldD1GYWxzZSk6CiAgICAgICAgIGFyZ3MgPSBbY2xzLndlYmtp dF9zY3JpcHRfcGF0aCgicnVuLXdlYmtpdC10ZXN0cyIpXQogICAgICAgICBpZiBub3QgbGF1bmNo X3NhZmFyaToKICAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCItLW5vLWxhdW5jaC1zYWZhcmkiKQor ICAgICAgICBpZiBxdWlldDoKKyAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCItLXF1aWV0IikKICAg ICAgICAgY2xzLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbChhcmdzKQogCiAgICAgQHN0YXRpY21ldGhv ZApAQCAtMzE0LDkgKzMyMiw5IEBAIGNsYXNzIExhbmRQYXRjaGVzRnJvbUJ1Z3MoQ29tbWFuZCk6 CiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGJ1aWxkX2FuZF9jb21taXQoY2xzLCBzY20sIG9w dGlvbnMpOgogICAgICAgICBpZiBvcHRpb25zLmJ1aWxkOgotICAgICAgICAgICAgY2xzLmJ1aWxk X3dlYmtpdCgpCisgICAgICAgICAgICBjbHMuYnVpbGRfd2Via2l0KHF1aWV0PW9wdGlvbnMucXVp ZXQpCiAgICAgICAgICAgICBpZiBvcHRpb25zLnRlc3Q6Ci0gICAgICAgICAgICAgICAgY2xzLnJ1 bl93ZWJraXRfdGVzdHMobGF1bmNoX3NhZmFyaT1ub3Qgb3B0aW9ucy5jb21taXRfcXVldWUpCisg ICAgICAgICAgICAgICAgY2xzLnJ1bl93ZWJraXRfdGVzdHMobGF1bmNoX3NhZmFyaT1ub3Qgb3B0 aW9ucy5jb21taXRfcXVldWUsIHF1aWV0PW9wdGlvbnMucXVpZXQpCiAgICAgICAgIGNvbW1pdF9t ZXNzYWdlID0gY29tbWl0X21lc3NhZ2VfZm9yX3RoaXNfY29tbWl0KHNjbSkKICAgICAgICAgY29t bWl0X2xvZyA9IHNjbS5jb21taXRfd2l0aF9tZXNzYWdlKGNvbW1pdF9tZXNzYWdlLm1lc3NhZ2Uo KSkKICAgICAgICAgcmV0dXJuIGJ1Z19jb21tZW50X2Zyb21fY29tbWl0X3RleHQoc2NtLCBjb21t aXRfbG9nKQ==