139264 2014-12-04 12:10:42 -0800 Don't lock perf tests in run-webkit-tests 2014-12-04 13:49:23 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=136722 P2 Normal --- 1 ap ap commit-queue glenn ossy rniwa oldest_to_newest 1052533 0 ap 2014-12-04 12:10:42 -0800 We have some code that "locks" tests in LayoutTests/perf, because they are timing sensitive, and would like to run on a separate thread. But this code is broken in several ways: 1. It doesn't do anything, because LayoutTests/perf is a leaf directory, and all these tests run sequentially even without locking. 2. It doesn't prevent other tests from running at the same time, so we have the timing problems that we were trying to avoid. 3. The locking code is tangled with code that starts and stops httpd, which is just incorrect, and very confusing. As a result, perf tests are skipped on Mac entirely. I'd like to remove the code, and if someone wants to revive the tests, a new correct solution should be found. Ossy suggested running these tests as a separate step, which makes sense to me, but would complicate error reporting on buildbot and EWS. 1052534 1 242580 ap 2014-12-04 12:15:40 -0800 Created attachment 242580 proposed patch 1052552 2 242580 dbates 2014-12-04 13:45:00 -0800 Comment on attachment 242580 proposed patch rs=me 1052555 3 ap 2014-12-04 13:49:23 -0800 Committed <http://trac.webkit.org/r176814>. 242580 2014-12-04 12:15:40 -0800 2014-12-04 13:45:00 -0800 proposed patch PerfTests.txt text/plain 12696 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NjgxMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE0LTEyLTA0ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIERvbid0IGxvY2sgcGVyZiB0ZXN0cyBpbiBydW4td2Via2l0LXRlc3RzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkyNjQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90ZXN0X3J1bm5lci5weToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlv dXRfdGVzdF9ydW5uZXJfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9pbnB1dC5weToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVz dC5weToKKwogMjAxNC0xMi0wMyAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4K IAogICAgICAgICBodHRwL3Rlc3RzL3NlY3VyaXR5L21peGVkQ29udGVudC9hYm91dC1ibGFuay1p ZnJhbWUtaW4tbWFpbi1mcmFtZS5odG1sIGZhaWxzIHVubGVzcyBjZXJ0YWluIG90aGVyIHRlc3Rz IHJ1biBiZWZvcmUgaXQKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRp b250ZXN0LnB5CShyZXZpc2lvbiAxNzY3MjUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQkod29ya2luZyBj b3B5KQpAQCAtMzM5LDkgKzMzOSw5IEBAIGNsYXNzIFJ1blRlc3QodW5pdHRlc3QuVGVzdENhc2Us IFN0cmVhbVQKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh0ZXN0c190b19ydW4sIHRlc3RzX3J1 bikKIAogICAgIGRlZiB0ZXN0X25vX29yZGVyX3dpdGhfZGlyZWN0b3J5X2VudHJpZXNfaW5fbmF0 dXJhbF9vcmRlcihzZWxmKToKLSAgICAgICAgdGVzdHNfdG9fcnVuID0gWydodHRwL3Rlc3RzL3Nz bCcsICdwZXJmL2ZvbycsICdodHRwL3Rlc3RzL3Bhc3NlcyddCisgICAgICAgIHRlc3RzX3RvX3J1 biA9IFsnaHR0cC90ZXN0cy9zc2wnLCAnaHR0cC90ZXN0cy9wYXNzZXMnXQogICAgICAgICB0ZXN0 c19ydW4gPSBnZXRfdGVzdHNfcnVuKFsnLS1vcmRlcj1ub25lJ10gKyB0ZXN0c190b19ydW4pCi0g ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodGVzdHNfcnVuLCBbJ2h0dHAvdGVzdHMvc3NsL3RleHQu aHRtbCcsICdwZXJmL2Zvby90ZXN0Lmh0bWwnLCAnaHR0cC90ZXN0cy9wYXNzZXMvaW1hZ2UuaHRt bCcsICdodHRwL3Rlc3RzL3Bhc3Nlcy90ZXh0Lmh0bWwnXSkKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbCh0ZXN0c19ydW4sIFsnaHR0cC90ZXN0cy9zc2wvdGV4dC5odG1sJywgJ2h0dHAvdGVzdHMv cGFzc2VzL2ltYWdlLmh0bWwnLCAnaHR0cC90ZXN0cy9wYXNzZXMvdGV4dC5odG1sJ10pCiAKICAg ICBkZWYgdGVzdF9nY19iZXR3ZWVuX3Rlc3RzKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydFRy dWUocGFzc2luZ19ydW4oWyctLWdjLWJldHdlZW4tdGVzdHMnXSkpCkluZGV4OiBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5CShyZXZpc2lvbiAxNzY3MjUpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9y dW5uZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ0MiwxMCArNDQyLDEwIEBAIGNsYXNzIFRlc3RT aGFyZChvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCB0ZXN0X2lucHV0cyk6 CiAgICAgICAgIHNlbGYubmFtZSA9IG5hbWUKICAgICAgICAgc2VsZi50ZXN0X2lucHV0cyA9IHRl c3RfaW5wdXRzCi0gICAgICAgIHNlbGYucmVxdWlyZXNfbG9jayA9IHRlc3RfaW5wdXRzWzBdLnJl cXVpcmVzX2xvY2sKKyAgICAgICAgc2VsZi5uZWVkc19zZXJ2ZXJzID0gdGVzdF9pbnB1dHNbMF0u bmVlZHNfc2VydmVycwogCiAgICAgZGVmIF9fcmVwcl9fKHNlbGYpOgotICAgICAgICByZXR1cm4g IlRlc3RTaGFyZChuYW1lPSclcycsIHRlc3RfaW5wdXRzPSVzLCByZXF1aXJlc19sb2NrPSVzJyIg JSAoc2VsZi5uYW1lLCBzZWxmLnRlc3RfaW5wdXRzLCBzZWxmLnJlcXVpcmVzX2xvY2spCisgICAg ICAgIHJldHVybiAiVGVzdFNoYXJkKG5hbWU9JyVzJywgdGVzdF9pbnB1dHM9JXMsIG5lZWRzX3Nl cnZlcnM9JXMnIiAlIChzZWxmLm5hbWUsIHNlbGYudGVzdF9pbnB1dHMsIHNlbGYubmVlZHNfc2Vy dmVycykKIAogICAgIGRlZiBfX2VxX18oc2VsZiwgb3RoZXIpOgogICAgICAgICByZXR1cm4gc2Vs Zi5uYW1lID09IG90aGVyLm5hbWUgYW5kIHNlbGYudGVzdF9pbnB1dHMgPT0gb3RoZXIudGVzdF9p bnB1dHMKQEAgLTQ4Miw3ICs0ODIsNyBAQCBjbGFzcyBTaGFyZGVyKG9iamVjdCk6CiAgICAgICAg IGxvY2tlZF9pbnB1dHMgPSBbXQogICAgICAgICB1bmxvY2tlZF9pbnB1dHMgPSBbXQogICAgICAg ICBmb3IgdGVzdF9pbnB1dCBpbiB0ZXN0X2lucHV0czoKLSAgICAgICAgICAgIGlmIHRlc3RfaW5w dXQucmVxdWlyZXNfbG9jazoKKyAgICAgICAgICAgIGlmIHRlc3RfaW5wdXQubmVlZHNfc2VydmVy czoKICAgICAgICAgICAgICAgICBsb2NrZWRfaW5wdXRzLmFwcGVuZCh0ZXN0X2lucHV0KQogICAg ICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICB1bmxvY2tlZF9pbnB1dHMuYXBwZW5kKHRl c3RfaW5wdXQpCkBAIC01MDYsNyArNTA2LDcgQEAgY2xhc3MgU2hhcmRlcihvYmplY3QpOgogICAg ICAgICAgICAgIyBOb3RlIHRoYXQgd2UgdXNlIGEgJy4nIGZvciB0aGUgc2hhcmQgbmFtZTsgdGhl IG5hbWUgZG9lc24ndCByZWFsbHkKICAgICAgICAgICAgICMgbWF0dGVyLCBhbmQgdGhlIG9ubHkg b3RoZXIgbWVhbmluZ2Z1bCB2YWx1ZSB3b3VsZCBiZSB0aGUgZmlsZW5hbWUsCiAgICAgICAgICAg ICAjIHdoaWNoIHdvdWxkIGJlIHJlYWxseSByZWR1bmRhbnQuCi0gICAgICAgICAgICBpZiB0ZXN0 X2lucHV0LnJlcXVpcmVzX2xvY2s6CisgICAgICAgICAgICBpZiB0ZXN0X2lucHV0Lm5lZWRzX3Nl cnZlcnM6CiAgICAgICAgICAgICAgICAgbG9ja2VkX3NoYXJkcy5hcHBlbmQoVGVzdFNoYXJkKCcu JywgW3Rlc3RfaW5wdXRdKSkKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgdW5s b2NrZWRfc2hhcmRzLmFwcGVuZChUZXN0U2hhcmQoJy4nLCBbdGVzdF9pbnB1dF0pKQpAQCAtNTMw LDcgKzUzMCw3IEBAIGNsYXNzIFNoYXJkZXIob2JqZWN0KToKIAogICAgICAgICBmb3IgZGlyZWN0 b3J5LCB0ZXN0X2lucHV0cyBpbiB0ZXN0c19ieV9kaXIuaXRlcml0ZW1zKCk6CiAgICAgICAgICAg ICBzaGFyZCA9IFRlc3RTaGFyZChkaXJlY3RvcnksIHRlc3RfaW5wdXRzKQotICAgICAgICAgICAg aWYgdGVzdF9pbnB1dHNbMF0ucmVxdWlyZXNfbG9jazoKKyAgICAgICAgICAgIGlmIHRlc3RfaW5w dXRzWzBdLm5lZWRzX3NlcnZlcnM6CiAgICAgICAgICAgICAgICAgbG9ja2VkX3NoYXJkcy5hcHBl bmQoc2hhcmQpCiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIHVubG9ja2VkX3No YXJkcy5hcHBlbmQoc2hhcmQpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXJfdW5pdHRlc3QucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5 b3V0X3Rlc3RfcnVubmVyX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAxNzY3MjUpCisrKyBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5u ZXJfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTExMiwxMCArMTEyLDYgQEAgY2xhc3Mg TGF5b3V0VGVzdFJ1bm5lclRlc3RzKHVuaXR0ZXN0LlRlcwogICAgICAgICBydW5uZXIgPSBzZWxm Ll9ydW5uZXIoKQogICAgICAgICBzZWxmLl9ydW5fdGVzdHMocnVubmVyLCBbJ2h0dHAvdGVzdHMv cGFzc2VzL3RleHQuaHRtbCcsICdwYXNzZXMvdGV4dC5odG1sJ10pCiAKLSAgICBkZWYgdGVzdF9w ZXJmX2xvY2tpbmcoc2VsZik6Ci0gICAgICAgIHJ1bm5lciA9IHNlbGYuX3J1bm5lcigpCi0gICAg ICAgIHNlbGYuX3J1bl90ZXN0cyhydW5uZXIsIFsnaHR0cC90ZXN0cy9wYXNzZXMvdGV4dC5odG1s JywgJ3BlcmYvZm9vL3Rlc3QuaHRtbCddKQotCiAgICAgZGVmIHRlc3RfaW50ZXJydXB0X2lmX2F0 X2ZhaWx1cmVfbGltaXRzKHNlbGYpOgogICAgICAgICBydW5uZXIgPSBzZWxmLl9ydW5uZXIoKQog ICAgICAgICBydW5uZXIuX29wdGlvbnMuZXhpdF9hZnRlcl9uX2ZhaWx1cmVzID0gTm9uZQpAQCAt MjMzLDExICsyMjksMTAgQEAgY2xhc3MgU2hhcmRlclRlc3RzKHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICAgICAgImRvbS9odG1sL2xldmVsMi9odG1sL0hUTUxBbmNob3JFbGVtZW50MDMuaHRtbCIs CiAgICAgICAgICJpZXRlc3RjZW50ZXIvSmF2YXNjcmlwdC8xMS4xLjVfNC00LWMtMS5odG1sIiwK ICAgICAgICAgImRvbS9odG1sL2xldmVsMi9odG1sL0hUTUxBbmNob3JFbGVtZW50MDYuaHRtbCIs Ci0gICAgICAgICJwZXJmL29iamVjdC1rZXlzLmh0bWwiLAogICAgIF0KIAogICAgIGRlZiBnZXRf dGVzdF9pbnB1dChzZWxmLCB0ZXN0X2ZpbGUpOgotICAgICAgICByZXR1cm4gVGVzdElucHV0KHRl c3RfZmlsZSwgcmVxdWlyZXNfbG9jaz0odGVzdF9maWxlLnN0YXJ0c3dpdGgoJ2h0dHAnKSBvciB0 ZXN0X2ZpbGUuc3RhcnRzd2l0aCgncGVyZicpKSkKKyAgICAgICAgcmV0dXJuIFRlc3RJbnB1dCh0 ZXN0X2ZpbGUsIG5lZWRzX3NlcnZlcnM9KHRlc3RfZmlsZS5zdGFydHN3aXRoKCdodHRwJykpKQog CiAgICAgZGVmIGdldF9zaGFyZHMoc2VsZiwgbnVtX3dvcmtlcnMsIGZ1bGx5X3BhcmFsbGVsLCB0 ZXN0X2xpc3Q9Tm9uZSwgbWF4X2xvY2tlZF9zaGFyZHM9MSk6CiAgICAgICAgIHBvcnQgPSBUZXN0 UG9ydChNb2NrU3lzdGVtSG9zdCgpKQpAQCAtMjY0LDggKzI1OSw3IEBAIGNsYXNzIFNoYXJkZXJU ZXN0cyh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICBbJ2h0dHAvdGVzdHMvc2Vj dXJpdHkvdmlldy1zb3VyY2Utbm8tcmVmcmVzaC5odG1sJywKICAgICAgICAgICAgICAgICAnaHR0 cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvdW5pY29kZS5odG0nLAogICAgICAgICAgICAgICAgICdo dHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy93ZWJzb2NrZXQtcHJvdG9jb2wtaWdub3JlZC5odG1s JywKLSAgICAgICAgICAgICAgICAnaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9zdXBwb3J0ZWQt eG1sLWNvbnRlbnQtdHlwZXMuaHRtbCcsCi0gICAgICAgICAgICAgICAgJ3BlcmYvb2JqZWN0LWtl eXMuaHRtbCddKV0pCisgICAgICAgICAgICAgICAgJ2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qv c3VwcG9ydGVkLXhtbC1jb250ZW50LXR5cGVzLmh0bWwnXSldKQogICAgICAgICBzZWxmLmFzc2Vy dF9zaGFyZHModW5sb2NrZWQsCiAgICAgICAgICAgICBbKCdhbmltYXRpb25zJywgWydhbmltYXRp b25zL2tleWZyYW1lcy5odG1sJ10pLAogICAgICAgICAgICAgICgnZG9tL2h0bWwvbGV2ZWwyL2h0 bWwnLCBbJ2RvbS9odG1sL2xldmVsMi9odG1sL0hUTUxBbmNob3JFbGVtZW50MDMuaHRtbCcsCkBA IC0yNzksOCArMjczLDcgQEAgY2xhc3MgU2hhcmRlclRlc3RzKHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICAgICAgICAgIFsoJy4nLCBbJ2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL3VuaWNvZGUu aHRtJ10pLAogICAgICAgICAgICAgICgnLicsIFsnaHR0cC90ZXN0cy9zZWN1cml0eS92aWV3LXNv dXJjZS1uby1yZWZyZXNoLmh0bWwnXSksCiAgICAgICAgICAgICAgKCcuJywgWydodHRwL3Rlc3Rz L3dlYnNvY2tldC90ZXN0cy93ZWJzb2NrZXQtcHJvdG9jb2wtaWdub3JlZC5odG1sJ10pLAotICAg ICAgICAgICAgICgnLicsIFsnaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9zdXBwb3J0ZWQteG1s LWNvbnRlbnQtdHlwZXMuaHRtbCddKSwKLSAgICAgICAgICAgICAoJy4nLCBbJ3BlcmYvb2JqZWN0 LWtleXMuaHRtbCddKV0pLAorICAgICAgICAgICAgICgnLicsIFsnaHR0cC90ZXN0cy94bWxodHRw cmVxdWVzdC9zdXBwb3J0ZWQteG1sLWNvbnRlbnQtdHlwZXMuaHRtbCddKV0pLAogICAgICAgICBz ZWxmLmFzc2VydF9zaGFyZHModW5sb2NrZWQsCiAgICAgICAgICAgICBbKCcuJywgWydhbmltYXRp b25zL2tleWZyYW1lcy5odG1sJ10pLAogICAgICAgICAgICAgICgnLicsIFsnZmFzdC9jc3MvZGlz cGxheS1ub25lLWlubGluZS1zdHlsZS1jaGFuZ2UtY3Jhc2guaHRtbCddKSwKQEAgLTI5NSw4ICsy ODgsNyBAQCBjbGFzcyBTaGFyZGVyVGVzdHModW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAg ICAgICBbJ2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL3VuaWNvZGUuaHRtJywKICAgICAgICAg ICAgICAgICdodHRwL3Rlc3RzL3NlY3VyaXR5L3ZpZXctc291cmNlLW5vLXJlZnJlc2guaHRtbCcs CiAgICAgICAgICAgICAgICAnaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvd2Vic29ja2V0LXBy b3RvY29sLWlnbm9yZWQuaHRtbCcsCi0gICAgICAgICAgICAgICAnaHR0cC90ZXN0cy94bWxodHRw cmVxdWVzdC9zdXBwb3J0ZWQteG1sLWNvbnRlbnQtdHlwZXMuaHRtbCcsCi0gICAgICAgICAgICAg ICAncGVyZi9vYmplY3Qta2V5cy5odG1sJ10pXSkKKyAgICAgICAgICAgICAgICdodHRwL3Rlc3Rz L3htbGh0dHByZXF1ZXN0L3N1cHBvcnRlZC14bWwtY29udGVudC10eXBlcy5odG1sJ10pXSkKICAg ICAgICAgc2VsZi5hc3NlcnRfc2hhcmRzKHVubG9ja2VkLAogICAgICAgICAgICAgWygndW5sb2Nr ZWRfdGVzdHMnLAogICAgICAgICAgICAgICBbJ2FuaW1hdGlvbnMva2V5ZnJhbWVzLmh0bWwnLApA QCAtMzI1LDggKzMxNyw3IEBAIGNsYXNzIFNoYXJkZXJUZXN0cyh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgICAgICAgICAgICAnaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvdW5pY29kZS5odG0n LAogICAgICAgICAgICAgICAgJ2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL3dlYnNvY2tldC1w cm90b2NvbC1pZ25vcmVkLmh0bWwnXSksCiAgICAgICAgICAgICAgKCdsb2NrZWRfc2hhcmRfMics Ci0gICAgICAgICAgICAgIFsnaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9zdXBwb3J0ZWQteG1s LWNvbnRlbnQtdHlwZXMuaHRtbCcsCi0gICAgICAgICAgICAgICAncGVyZi9vYmplY3Qta2V5cy5o dG1sJ10pXSkKKyAgICAgICAgICAgICAgWydodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3N1cHBv cnRlZC14bWwtY29udGVudC10eXBlcy5odG1sJ10pXSkKIAogICAgICAgICBsb2NrZWQsIHVubG9j a2VkID0gc2VsZi5nZXRfc2hhcmRzKG51bV93b3JrZXJzPTQsIGZ1bGx5X3BhcmFsbGVsPUZhbHNl KQogICAgICAgICBzZWxmLmFzc2VydF9zaGFyZHMobG9ja2VkLApAQCAtMzM0LDUgKzMyNSw0IEBA IGNsYXNzIFNoYXJkZXJUZXN0cyh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAgIFsn aHR0cC90ZXN0cy9zZWN1cml0eS92aWV3LXNvdXJjZS1uby1yZWZyZXNoLmh0bWwnLAogICAgICAg ICAgICAgICAgJ2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL3VuaWNvZGUuaHRtJywKICAgICAg ICAgICAgICAgICdodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy93ZWJzb2NrZXQtcHJvdG9jb2wt aWdub3JlZC5odG1sJywKLSAgICAgICAgICAgICAgICdodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0 L3N1cHBvcnRlZC14bWwtY29udGVudC10eXBlcy5odG1sJywKLSAgICAgICAgICAgICAgICdwZXJm L29iamVjdC1rZXlzLmh0bWwnXSldKQorICAgICAgICAgICAgICAgJ2h0dHAvdGVzdHMveG1saHR0 cHJlcXVlc3Qvc3VwcG9ydGVkLXhtbC1jb250ZW50LXR5cGVzLmh0bWwnXSldKQpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9s bGVycy9tYW5hZ2VyLnB5CShyZXZpc2lvbiAxNzY3MjUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CSh3b3JraW5nIGNvcHkpCkBA IC03OCw3ICs3OCw2IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fZXhw ZWN0YXRpb25zID0gTm9uZQogCiAgICAgICAgIHNlbGYuSFRUUF9TVUJESVIgPSAnaHR0cCcgKyBw b3J0LlRFU1RfUEFUSF9TRVBBUkFUT1IKLSAgICAgICAgc2VsZi5QRVJGX1NVQkRJUiA9ICdwZXJm JwogICAgICAgICBzZWxmLldFQlNPQ0tFVF9TVUJESVIgPSAnd2Vic29ja2V0JyArIHBvcnQuVEVT VF9QQVRIX1NFUEFSQVRPUgogICAgICAgICBzZWxmLkxBWU9VVF9URVNUU19ESVJFQ1RPUlkgPSAn TGF5b3V0VGVzdHMnCiAKQEAgLTEwMiw5ICsxMDEsNiBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6 CiAgICAgZGVmIF9odHRwX3Rlc3RzKHNlbGYsIHRlc3RfbmFtZXMpOgogICAgICAgICByZXR1cm4g c2V0KHRlc3QgZm9yIHRlc3QgaW4gdGVzdF9uYW1lcyBpZiBzZWxmLl9pc19odHRwX3Rlc3QodGVz dCkpCiAKLSAgICBkZWYgX2lzX3BlcmZfdGVzdChzZWxmLCB0ZXN0KToKLSAgICAgICAgcmV0dXJu IHNlbGYuUEVSRl9TVUJESVIgPT0gdGVzdCBvciAoc2VsZi5QRVJGX1NVQkRJUiArIHNlbGYuX3Bv cnQuVEVTVF9QQVRIX1NFUEFSQVRPUikgaW4gdGVzdAotCiAgICAgZGVmIF9wcmVwYXJlX2xpc3Rz KHNlbGYsIHBhdGhzLCB0ZXN0X25hbWVzKToKICAgICAgICAgdGVzdHNfdG9fc2tpcCA9IHNlbGYu X2ZpbmRlci5za2lwX3Rlc3RzKHBhdGhzLCB0ZXN0X25hbWVzLCBzZWxmLl9leHBlY3RhdGlvbnMs IHNlbGYuX2h0dHBfdGVzdHModGVzdF9uYW1lcykpCiAgICAgICAgIHRlc3RzX3RvX3J1biA9IFt0 ZXN0IGZvciB0ZXN0IGluIHRlc3RfbmFtZXMgaWYgdGVzdCBub3QgaW4gdGVzdHNfdG9fc2tpcF0K QEAgLTEyNSwyMCArMTIxLDEzIEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICBkZWYgX3Rl c3RfaW5wdXRfZm9yX2ZpbGUoc2VsZiwgdGVzdF9maWxlKToKICAgICAgICAgcmV0dXJuIFRlc3RJ bnB1dCh0ZXN0X2ZpbGUsCiAgICAgICAgICAgICBzZWxmLl9vcHRpb25zLnNsb3dfdGltZV9vdXRf bXMgaWYgc2VsZi5fdGVzdF9pc19zbG93KHRlc3RfZmlsZSkgZWxzZSBzZWxmLl9vcHRpb25zLnRp bWVfb3V0X21zLAotICAgICAgICAgICAgc2VsZi5fdGVzdF9yZXF1aXJlc19sb2NrKHRlc3RfZmls ZSkpCi0KLSAgICBkZWYgX3Rlc3RfcmVxdWlyZXNfbG9jayhzZWxmLCB0ZXN0X2ZpbGUpOgotICAg ICAgICAiIiJSZXR1cm4gVHJ1ZSBpZiB0aGUgdGVzdCBuZWVkcyB0byBiZSBsb2NrZWQgd2hlbgot ICAgICAgICBydW5uaW5nIG11bHRpcGxlIGNvcGllcyBvZiBOUldUcy4gUGVyZiB0ZXN0cyBhcmUg bG9ja2VkCi0gICAgICAgIGJlY2F1c2UgaGVhdnkgbG9hZCBjYXVzZWQgYnkgcnVubmluZyBvdGhl ciB0ZXN0cyBpbiBwYXJhbGxlbAotICAgICAgICBtaWdodCBjYXVzZSBzb21lIG9mIHRoZW0gdG8g dGltZW91dC4iIiIKLSAgICAgICAgcmV0dXJuIHNlbGYuX2lzX2h0dHBfdGVzdCh0ZXN0X2ZpbGUp IG9yIHNlbGYuX2lzX3BlcmZfdGVzdCh0ZXN0X2ZpbGUpCisgICAgICAgICAgICBzZWxmLl9pc19o dHRwX3Rlc3QodGVzdF9maWxlKSkKIAogICAgIGRlZiBfdGVzdF9pc19zbG93KHNlbGYsIHRlc3Rf ZmlsZSk6CiAgICAgICAgIHJldHVybiBzZWxmLl9leHBlY3RhdGlvbnMubW9kZWwoKS5oYXNfbW9k aWZpZXIodGVzdF9maWxlLCB0ZXN0X2V4cGVjdGF0aW9ucy5TTE9XKQogCiAgICAgZGVmIG5lZWRz X3NlcnZlcnMoc2VsZiwgdGVzdF9uYW1lcyk6Ci0gICAgICAgIHJldHVybiBhbnkoc2VsZi5fdGVz dF9yZXF1aXJlc19sb2NrKHRlc3RfbmFtZSkgZm9yIHRlc3RfbmFtZSBpbiB0ZXN0X25hbWVzKSBh bmQgc2VsZi5fb3B0aW9ucy5odHRwCisgICAgICAgIHJldHVybiBhbnkoc2VsZi5faXNfaHR0cF90 ZXN0KHRlc3RfbmFtZSkgZm9yIHRlc3RfbmFtZSBpbiB0ZXN0X25hbWVzKSBhbmQgc2VsZi5fb3B0 aW9ucy5odHRwCiAKICAgICBkZWYgX3NldF91cF9ydW4oc2VsZiwgdGVzdF9uYW1lcyk6CiAgICAg ICAgIHNlbGYuX3ByaW50ZXIud3JpdGVfdXBkYXRlKCJDaGVja2luZyBidWlsZCAuLi4iKQpJbmRl eDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfaW5wdXQu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9k ZWxzL3Rlc3RfaW5wdXQucHkJKHJldmlzaW9uIDE3NjcyNSkKKysrIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2lucHV0LnB5CSh3b3JraW5nIGNvcHkpCkBA IC0zMSwxNSArMzEsMTUgQEAKIGNsYXNzIFRlc3RJbnB1dChvYmplY3QpOgogICAgICIiIkdyb3Vw cyBpbmZvcm1hdGlvbiBhYm91dCBhIHRlc3QgZm9yIGVhc3kgcGFzc2luZyBvZiBkYXRhLiIiIgog Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHRlc3RfbmFtZSwgdGltZW91dD1Ob25lLCByZXF1aXJl c19sb2NrPU5vbmUsIHJlZmVyZW5jZV9maWxlcz1Ob25lLCBzaG91bGRfcnVuX3BpeGVsX3Rlc3Rz PU5vbmUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0ZXN0X25hbWUsIHRpbWVvdXQ9Tm9uZSwg bmVlZHNfc2VydmVycz1Ob25lLCByZWZlcmVuY2VfZmlsZXM9Tm9uZSwgc2hvdWxkX3J1bl9waXhl bF90ZXN0cz1Ob25lKToKICAgICAgICAgIyBUZXN0SW5wdXQgb2JqZWN0cyBhcmUgbm9ybWFsbHkg Y29uc3RydWN0ZWQgYnkgdGhlIG1hbmFnZXIgYW5kIHBhc3NlZAogICAgICAgICAjIHRvIHRoZSB3 b3JrZXJzLCBidXQgdGhlc2Ugc29tZSBmaWVsZHMgYXJlIHNldCBsYXppbHkgaW4gdGhlIHdvcmtl cnMgd2hlcmUgcG9zc2libGUKICAgICAgICAgIyBiZWNhdXNlIHRoZXkgcmVxdWlyZSB1cyB0byBs b29rIGF0IHRoZSBmaWxlc3lzdGVtIGFuZCB3ZSB3YW50IHRvIGJlIGFibGUgdG8gZG8gdGhhdCBp biBwYXJhbGxlbC4KICAgICAgICAgc2VsZi50ZXN0X25hbWUgPSB0ZXN0X25hbWUKICAgICAgICAg c2VsZi50aW1lb3V0ID0gdGltZW91dCAgIyBpbiBtc2Vjczsgc2hvdWxkIHJlbmFtZSB0aGlzIGZv ciBjb25zaXN0ZW5jeQotICAgICAgICBzZWxmLnJlcXVpcmVzX2xvY2sgPSByZXF1aXJlc19sb2Nr CisgICAgICAgIHNlbGYubmVlZHNfc2VydmVycyA9IG5lZWRzX3NlcnZlcnMKICAgICAgICAgc2Vs Zi5yZWZlcmVuY2VfZmlsZXMgPSByZWZlcmVuY2VfZmlsZXMKICAgICAgICAgc2VsZi5zaG91bGRf cnVuX3BpeGVsX3Rlc3RzID0gc2hvdWxkX3J1bl9waXhlbF90ZXN0cwogCiAgICAgZGVmIF9fcmVw cl9fKHNlbGYpOgotICAgICAgICByZXR1cm4gIlRlc3RJbnB1dCgnJXMnLCB0aW1lb3V0PSVzLCBy ZXF1aXJlc19sb2NrPSVzLCByZWZlcmVuY2VfZmlsZXM9JXMsIHNob3VsZF9ydW5fcGl4ZWxfdGVz dHM9JXMpIiAlIChzZWxmLnRlc3RfbmFtZSwgc2VsZi50aW1lb3V0LCBzZWxmLnJlcXVpcmVzX2xv Y2ssIHNlbGYucmVmZXJlbmNlX2ZpbGVzLCBzZWxmLnNob3VsZF9ydW5fcGl4ZWxfdGVzdHMpCisg ICAgICAgIHJldHVybiAiVGVzdElucHV0KCclcycsIHRpbWVvdXQ9JXMsIG5lZWRzX3NlcnZlcnM9 JXMsIHJlZmVyZW5jZV9maWxlcz0lcywgc2hvdWxkX3J1bl9waXhlbF90ZXN0cz0lcykiICUgKHNl bGYudGVzdF9uYW1lLCBzZWxmLnRpbWVvdXQsIHNlbGYubmVlZHNfc2VydmVycywgc2VsZi5yZWZl cmVuY2VfZmlsZXMsIHNlbGYuc2hvdWxkX3J1bl9waXhlbF90ZXN0cykK