83677 2012-04-11 00:46:07 -0700 Refactor PerfTestRunner to include file extensions in test names 2012-04-11 01:55:20 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 83674 1 rniwa rniwa abarth dpranke morrita ojan webkit.review.bot oldest_to_newest 600101 0 rniwa 2012-04-11 00:46:07 -0700 Right now PerfTestRunner doesn't include the file extension (e.g. .html, .svg, etc...) in test names. We should include them so that perf-o-matic can figure out the corresponding trac page. 600112 1 136640 rniwa 2012-04-11 00:53:23 -0700 Created attachment 136640 Cleanup 600117 2 rniwa 2012-04-11 00:59:41 -0700 Note this patch doesn't change the behavior at all. The behavior change will happen in the bug 83674. 600141 3 136640 webkit.review.bot 2012-04-11 01:55:15 -0700 Comment on attachment 136640 Cleanup Clearing flags on attachment: 136640 Committed r113839: <http://trac.webkit.org/changeset/113839> 600142 4 webkit.review.bot 2012-04-11 01:55:20 -0700 All reviewed patches have been landed. Closing bug. 136640 2012-04-11 00:53:23 -0700 2012-04-11 01:55:15 -0700 Cleanup bug-83677-20120411005322.patch text/plain 11573 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDExMzgyNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDEyLTA0LTExICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFJlZmFjdG9yIFBlcmZUZXN0UnVubmVyIHRvIGluY2x1ZGUgZmlsZSBleHRlbnNp b25zIGluIHRlc3QgbmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTgzNjc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTW92ZSB0aGUgbG9naWMgdGhhdCBleHRyYWN0cyB0aGUgdGVzdCBuYW1lIGZyb20g X3Byb2Nlc3NfcGFyc2VyX3Rlc3RfcmVzdWx0IHRvIF9jb2xsZWN0X3Rlc3RzLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHk6 CisgICAgICAgIChQZXJmVGVzdHNSdW5uZXIuX2NvbGxlY3RfdGVzdHMpOgorICAgICAgICAoUGVy ZlRlc3RzUnVubmVyLl9ydW5fdGVzdHNfc2V0KToKKyAgICAgICAgKFBlcmZUZXN0c1J1bm5lci5f cHJvY2Vzc19wYXJzZXJfdGVzdF9yZXN1bHQpOiBTdGlsbCByZXBsYWNlICIvIiBieSAiOiAiIHRv IGtlZXAgdGhlIG91dHB1dCBmb3JtYXQuCisgICAgICAgIFdlIGNhbiBtYWtlIHRoZSBzYWlkIGJl aGF2aW9yIGNoYW5nZSBieSBzaW1wbHkgcmVtb3ZpbmcgInRlc3RfbmFtZSA9IHJlLnN1YihyJ1wu XHcrJCcsICcnLCB0ZXN0X25hbWUpIiBoZXJlLgorICAgICAgICAoUGVyZlRlc3RzUnVubmVyLl9y dW5fc2luZ2xlX3Rlc3QpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2Vf dGVzdHMvcGVyZnRlc3RzcnVubmVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAocnVuX3Rlc3QpOgor ICAgICAgICAoX3Rlc3RzX2Zvcl9ydW5uZXIpOgorICAgICAgICAodGVzdF9ydW5fdGVzdF9zZXQp OgorICAgICAgICAodGVzdF9ydW5fdGVzdF9zZXRfa2lsbHNfZHJ0X3Blcl9ydW4pOgorICAgICAg ICAodGVzdF9ydW5fdGVzdF9wYXVzZV9iZWZvcmVfdGVzdGluZyk6CisgICAgICAgICh0ZXN0X3J1 bl90ZXN0X3NldF9mb3JfcGFyc2VyX3Rlc3RzKToKKyAgICAgICAgKHRlc3RfY29sbGVjdF90ZXN0 cyk6CisgICAgICAgICh0ZXN0X2NvbGxlY3RfdGVzdHNfd2l0aF9za2lwcGVkX2xpc3QpOgorCiAy MDEyLTA0LTEwICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IElmIE5SV1QgZ2V0cyBraWxsZWQgaGFsZndheSB0aHJvdWdoIGEgcnVuLCBpdCBpbmNvcnJlY3Rs eSByZXBvcnRzIHRlc3RzIHRoYXQgd2VyZW4ndCBydW4gYXMgcGFzc2VzCkluZGV4OiBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0 ZXN0c3J1bm5lci5weQkocmV2aXNpb24gMTEzODI0KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkJKHdvcmtpbmcgY29weSkKQEAg LTEyMCw4ICsxMjAsMTQgQEAgY2xhc3MgUGVyZlRlc3RzUnVubmVyKG9iamVjdCk6CiAgICAgICAg ICAgICAgICAgcGF0aHMuYXBwZW5kKHJlbHBhdGgpCiAKICAgICAgICAgc2tpcHBlZF9kaXJlY3Rv cmllcyA9IHNldChbJy5zdm4nLCAncmVzb3VyY2VzJ10pCi0gICAgICAgIHRlc3RzID0gZmluZF9m aWxlcy5maW5kKHNlbGYuX2hvc3QuZmlsZXN5c3RlbSwgc2VsZi5fYmFzZV9wYXRoLCBwYXRocywg c2tpcHBlZF9kaXJlY3RvcmllcywgX2lzX3Rlc3RfZmlsZSkKLSAgICAgICAgcmV0dXJuIFt0ZXN0 IGZvciB0ZXN0IGluIHRlc3RzIGlmIG5vdCBzZWxmLl9wb3J0LnNraXBzX3BlcmZfdGVzdChzZWxm Ll9wb3J0LnJlbGF0aXZlX3BlcmZfdGVzdF9maWxlbmFtZSh0ZXN0KSldCisgICAgICAgIHRlc3Rf ZmlsZXMgPSBmaW5kX2ZpbGVzLmZpbmQoc2VsZi5faG9zdC5maWxlc3lzdGVtLCBzZWxmLl9iYXNl X3BhdGgsIHBhdGhzLCBza2lwcGVkX2RpcmVjdG9yaWVzLCBfaXNfdGVzdF9maWxlKQorICAgICAg ICB0ZXN0cyA9IFtdCisgICAgICAgIGZvciBwYXRoIGluIHRlc3RfZmlsZXM6CisgICAgICAgICAg ICB0ZXN0X25hbWUgPSBzZWxmLl9wb3J0LnJlbGF0aXZlX3BlcmZfdGVzdF9maWxlbmFtZShwYXRo KQorICAgICAgICAgICAgaWYgc2VsZi5fcG9ydC5za2lwc19wZXJmX3Rlc3QodGVzdF9uYW1lKToK KyAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgdGVzdHMuYXBwZW5kKCh0ZXN0 X25hbWUucmVwbGFjZSgnXFwnLCAnLycpLCBwYXRoKSkKKyAgICAgICAgcmV0dXJuIHRlc3RzCiAK ICAgICBkZWYgcnVuKHNlbGYpOgogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLmhlbHBfcHJpbnRp bmc6CkBAIC0yMTgsNyArMjI0LDcgQEAgY2xhc3MgUGVyZlRlc3RzUnVubmVyKG9iamVjdCk6CiAg ICAgICAgIHVuZXhwZWN0ZWQgPSAwCiAgICAgICAgIGRyaXZlciA9IE5vbmUKIAotICAgICAgICBm b3IgdGVzdCBpbiB0ZXN0czoKKyAgICAgICAgZm9yICh0ZXN0X25hbWUsIHRlc3RfcGF0aCkgaW4g dGVzdHM6CiAgICAgICAgICAgICBkcml2ZXIgPSBwb3J0LmNyZWF0ZV9kcml2ZXIod29ya2VyX251 bWJlcj0xLCBub190aW1lb3V0PVRydWUpCiAKICAgICAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMu cGF1c2VfYmVmb3JlX3Rlc3Rpbmc6CkBAIC0yMjcsMTEgKzIzMywxMCBAQCBjbGFzcyBQZXJmVGVz dHNSdW5uZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgZHJpdmVyLnN0b3AoKQogICAg ICAgICAgICAgICAgICAgICByZXR1cm4gdW5leHBlY3RlZAogCi0gICAgICAgICAgICByZWxhdGl2 ZV90ZXN0X3BhdGggPSBzZWxmLl9ob3N0LmZpbGVzeXN0ZW0ucmVscGF0aCh0ZXN0LCBzZWxmLl9i YXNlX3BhdGgpCi0gICAgICAgICAgICBzZWxmLl9wcmludGVyLndyaXRlKCdSdW5uaW5nICVzICgl ZCBvZiAlZCknICUgKHJlbGF0aXZlX3Rlc3RfcGF0aCwgZXhwZWN0ZWQgKyB1bmV4cGVjdGVkICsg MSwgbGVuKHRlc3RzKSkpCisgICAgICAgICAgICBzZWxmLl9wcmludGVyLndyaXRlKCdSdW5uaW5n ICVzICglZCBvZiAlZCknICUgKHRlc3RfbmFtZSwgZXhwZWN0ZWQgKyB1bmV4cGVjdGVkICsgMSwg bGVuKHRlc3RzKSkpCiAKLSAgICAgICAgICAgIGlzX2Nocm9taXVtX3N0eWxlID0gc2VsZi5faG9z dC5maWxlc3lzdGVtLnNwbGl0KHJlbGF0aXZlX3Rlc3RfcGF0aClbMF0gaW4gc2VsZi5fdGVzdF9k aXJlY3Rvcmllc19mb3JfY2hyb21pdW1fc3R5bGVfdGVzdHMKLSAgICAgICAgICAgIGlmIHNlbGYu X3J1bl9zaW5nbGVfdGVzdCh0ZXN0LCBkcml2ZXIsIGlzX2Nocm9taXVtX3N0eWxlKToKKyAgICAg ICAgICAgIGlzX2Nocm9taXVtX3N0eWxlID0gc2VsZi5faG9zdC5maWxlc3lzdGVtLmRpcm5hbWUo dGVzdF9uYW1lKSBpbiBzZWxmLl90ZXN0X2RpcmVjdG9yaWVzX2Zvcl9jaHJvbWl1bV9zdHlsZV90 ZXN0cworICAgICAgICAgICAgaWYgc2VsZi5fcnVuX3NpbmdsZV90ZXN0KHRlc3RfbmFtZSwgdGVz dF9wYXRoLCBkcml2ZXIsIGlzX2Nocm9taXVtX3N0eWxlKToKICAgICAgICAgICAgICAgICBleHBl Y3RlZCA9IGV4cGVjdGVkICsgMQogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICB1 bmV4cGVjdGVkID0gdW5leHBlY3RlZCArIDEKQEAgLTI3NywxMiArMjgyLDEwIEBAIGNsYXNzIFBl cmZUZXN0c1J1bm5lcihvYmplY3QpOgogICAgICAgICAgICAgICAgIHJldHVybiBUcnVlCiAgICAg ICAgIHJldHVybiBGYWxzZQogCi0gICAgZGVmIF9wcm9jZXNzX3BhcnNlcl90ZXN0X3Jlc3VsdChz ZWxmLCB0ZXN0LCBvdXRwdXQpOgorICAgIGRlZiBfcHJvY2Vzc19wYXJzZXJfdGVzdF9yZXN1bHQo c2VsZiwgdGVzdF9uYW1lLCBvdXRwdXQpOgogICAgICAgICBnb3RfYV9yZXN1bHQgPSBGYWxzZQog ICAgICAgICB0ZXN0X2ZhaWxlZCA9IEZhbHNlCiAgICAgICAgIGZpbGVzeXN0ZW0gPSBzZWxmLl9o b3N0LmZpbGVzeXN0ZW0KLSAgICAgICAgY2F0ZWdvcnksIHRlc3RfbmFtZSA9IGZpbGVzeXN0ZW0u c3BsaXQoZmlsZXN5c3RlbS5yZWxwYXRoKHRlc3QsIHNlbGYuX2Jhc2VfcGF0aCkpCi0gICAgICAg IHRlc3RfbmFtZSA9IGZpbGVzeXN0ZW0uc3BsaXRleHQodGVzdF9uYW1lKVswXQogICAgICAgICBy ZXN1bHRzID0ge30KICAgICAgICAga2V5cyA9IFsnYXZnJywgJ21lZGlhbicsICdzdGRldicsICdt aW4nLCAnbWF4J10KICAgICAgICAgc2NvcmVfcmVnZXggPSByZS5jb21waWxlKHInXig/UDxrZXk+ JyArIHInfCcuam9pbihrZXlzKSArIHInKVxzKyg/UDx2YWx1ZT5bMC05XC5dKylccyooP1A8dW5p dD4uKiknKQpAQCAtMzA1LDMwICszMDgsMzEgQEAgY2xhc3MgUGVyZlRlc3RzUnVubmVyKG9iamVj dCk6CiAKICAgICAgICAgcmVzdWx0c1sndW5pdCddID0gdW5pdAogCi0gICAgICAgIHNlbGYuX3Jl c3VsdHNbZmlsZXN5c3RlbS5qb2luKGNhdGVnb3J5LCB0ZXN0X25hbWUpLnJlcGxhY2UoJ1xcJywg Jy8nKV0gPSByZXN1bHRzCi0gICAgICAgIHNlbGYuX2J1aWxkYm90X291dHB1dC53cml0ZSgnUkVT VUxUICVzOiAlcz0gJXMgJXNcbicgJSAoY2F0ZWdvcnksIHRlc3RfbmFtZSwgcmVzdWx0c1snYXZn J10sIHVuaXQpKQorICAgICAgICB0ZXN0X25hbWUgPSByZS5zdWIocidcLlx3KyQnLCAnJywgdGVz dF9uYW1lKQorICAgICAgICBzZWxmLl9yZXN1bHRzW3Rlc3RfbmFtZV0gPSByZXN1bHRzCisgICAg ICAgIHNlbGYuX2J1aWxkYm90X291dHB1dC53cml0ZSgnUkVTVUxUICVzPSAlcyAlc1xuJyAlICh0 ZXN0X25hbWUucmVwbGFjZSgnLycsICc6ICcpLCByZXN1bHRzWydhdmcnXSwgdW5pdCkpCiAgICAg ICAgIHNlbGYuX2J1aWxkYm90X291dHB1dC53cml0ZSgnLCAnLmpvaW4oWyclcz0gJXMgJXMnICUg KGtleSwgcmVzdWx0c1trZXldLCB1bml0KSBmb3Iga2V5IGluIGtleXNbMTpdXSkgKyAnXG4nKQog ICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgIGRlZiBfcnVuX3NpbmdsZV90ZXN0KHNlbGYsIHRl c3QsIGRyaXZlciwgaXNfY2hyb21pdW1fc3R5bGUpOgorICAgIGRlZiBfcnVuX3NpbmdsZV90ZXN0 KHNlbGYsIHRlc3RfbmFtZSwgdGVzdF9wYXRoLCBkcml2ZXIsIGlzX2Nocm9taXVtX3N0eWxlKToK ICAgICAgICAgdGVzdF9mYWlsZWQgPSBGYWxzZQogICAgICAgICBzdGFydF90aW1lID0gdGltZS50 aW1lKCkKIAotICAgICAgICBvdXRwdXQgPSBkcml2ZXIucnVuX3Rlc3QoRHJpdmVySW5wdXQodGVz dCwgc2VsZi5fb3B0aW9ucy50aW1lX291dF9tcywgTm9uZSwgRmFsc2UpKQorICAgICAgICBvdXRw dXQgPSBkcml2ZXIucnVuX3Rlc3QoRHJpdmVySW5wdXQodGVzdF9wYXRoLCBzZWxmLl9vcHRpb25z LnRpbWVfb3V0X21zLCBOb25lLCBGYWxzZSkpCiAKICAgICAgICAgaWYgb3V0cHV0LnRleHQgPT0g Tm9uZToKICAgICAgICAgICAgIHRlc3RfZmFpbGVkID0gVHJ1ZQogICAgICAgICBlbGlmIG91dHB1 dC50aW1lb3V0OgotICAgICAgICAgICAgc2VsZi5fcHJpbnRlci53cml0ZSgndGltZW91dDogJXMn ICUgdGVzdFtzZWxmLl93ZWJraXRfYmFzZV9kaXJfbGVuICsgMTpdKQorICAgICAgICAgICAgc2Vs Zi5fcHJpbnRlci53cml0ZSgndGltZW91dDogJXMnICUgdGVzdF9uYW1lKQogICAgICAgICAgICAg dGVzdF9mYWlsZWQgPSBUcnVlCiAgICAgICAgIGVsaWYgb3V0cHV0LmNyYXNoOgotICAgICAgICAg ICAgc2VsZi5fcHJpbnRlci53cml0ZSgnY3Jhc2g6ICVzJyAlIHRlc3Rbc2VsZi5fd2Via2l0X2Jh c2VfZGlyX2xlbiArIDE6XSkKKyAgICAgICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGUoJ2NyYXNo OiAlcycgJSB0ZXN0X25hbWUpCiAgICAgICAgICAgICB0ZXN0X2ZhaWxlZCA9IFRydWUKICAgICAg ICAgZWxzZToKICAgICAgICAgICAgIGlmIGlzX2Nocm9taXVtX3N0eWxlOgotICAgICAgICAgICAg ICAgIHRlc3RfZmFpbGVkID0gc2VsZi5fcHJvY2Vzc19jaHJvbWl1bV9zdHlsZV90ZXN0X3Jlc3Vs dCh0ZXN0LCBvdXRwdXQpCisgICAgICAgICAgICAgICAgdGVzdF9mYWlsZWQgPSBzZWxmLl9wcm9j ZXNzX2Nocm9taXVtX3N0eWxlX3Rlc3RfcmVzdWx0KHRlc3RfbmFtZSwgb3V0cHV0KQogICAgICAg ICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICB0ZXN0X2ZhaWxlZCA9IHNlbGYuX3Byb2Nlc3Nf cGFyc2VyX3Rlc3RfcmVzdWx0KHRlc3QsIG91dHB1dCkKKyAgICAgICAgICAgICAgICB0ZXN0X2Zh aWxlZCA9IHNlbGYuX3Byb2Nlc3NfcGFyc2VyX3Rlc3RfcmVzdWx0KHRlc3RfbmFtZSwgb3V0cHV0 KQogCiAgICAgICAgIGlmIGxlbihvdXRwdXQuZXJyb3IpOgogICAgICAgICAgICAgc2VsZi5fcHJp bnRlci53cml0ZSgnZXJyb3I6XG4lcycgJSBvdXRwdXQuZXJyb3IpCkluZGV4OiBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lcl91bml0dGVzdC5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3Rz L3BlcmZ0ZXN0c3J1bm5lcl91bml0dGVzdC5weQkocmV2aXNpb24gMTEzODI0KQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXJfdW5pdHRl c3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTEyNiw3ICsxMjYsNyBAQCBtYXggMTEyMAogICAgIGRl ZiBydW5fdGVzdChzZWxmLCB0ZXN0X25hbWUpOgogICAgICAgICBydW5uZXIgPSBzZWxmLmNyZWF0 ZV9ydW5uZXIoKQogICAgICAgICBkcml2ZXIgPSBNYWluVGVzdC5UZXN0RHJpdmVyKCkKLSAgICAg ICAgcmV0dXJuIHJ1bm5lci5fcnVuX3NpbmdsZV90ZXN0KHRlc3RfbmFtZSwgZHJpdmVyLCBpc19j aHJvbWl1bV9zdHlsZT1UcnVlKQorICAgICAgICByZXR1cm4gcnVubmVyLl9ydW5fc2luZ2xlX3Rl c3QodGVzdF9uYW1lLCB0ZXN0X25hbWUsIGRyaXZlciwgaXNfY2hyb21pdW1fc3R5bGU9VHJ1ZSkK IAogICAgIGRlZiB0ZXN0X3J1bl9wYXNzaW5nX3Rlc3Qoc2VsZik6CiAgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZShzZWxmLnJ1bl90ZXN0KCdwYXNzLmh0bWwnKSkKQEAgLTE0NiwxMiArMTQ2LDE0IEBA IG1heCAxMTIwCiAgICAgZGVmIHRlc3RfcnVuX2NyYXNoX3Rlc3Qoc2VsZik6CiAgICAgICAgIHNl bGYuYXNzZXJ0RmFsc2Uoc2VsZi5ydW5fdGVzdCgnY3Jhc2guaHRtbCcpKQogCisgICAgZGVmIF90 ZXN0c19mb3JfcnVubmVyKHNlbGYsIHJ1bm5lciwgdGVzdHMpOgorICAgICAgICByZXR1cm4gWyh0 ZXN0LCBydW5uZXIuX2Jhc2VfcGF0aCArICcvJyArIHRlc3QpIGZvciB0ZXN0IGluIHRlc3RzXQor CiAgICAgZGVmIHRlc3RfcnVuX3Rlc3Rfc2V0KHNlbGYpOgogICAgICAgICBidWlsZGJvdF9vdXRw dXQgPSBTdHJpbmdJTy5TdHJpbmdJTygpCiAgICAgICAgIHJ1bm5lciA9IHNlbGYuY3JlYXRlX3J1 bm5lcihidWlsZGJvdF9vdXRwdXQpCi0gICAgICAgIGRpcm5hbWUgPSBydW5uZXIuX2Jhc2VfcGF0 aCArICcvaW5zcGVjdG9yLycKLSAgICAgICAgdGVzdHMgPSBbZGlybmFtZSArICdwYXNzLmh0bWwn LCBkaXJuYW1lICsgJ3NpbGVudC5odG1sJywgZGlybmFtZSArICdmYWlsZWQuaHRtbCcsCi0gICAg ICAgICAgICBkaXJuYW1lICsgJ3Rvbmd1ZXkuaHRtbCcsIGRpcm5hbWUgKyAndGltZW91dC5odG1s JywgZGlybmFtZSArICdjcmFzaC5odG1sJ10KKyAgICAgICAgdGVzdHMgPSBzZWxmLl90ZXN0c19m b3JfcnVubmVyKHJ1bm5lciwgWydpbnNwZWN0b3IvcGFzcy5odG1sJywgJ2luc3BlY3Rvci9zaWxl bnQuaHRtbCcsICdpbnNwZWN0b3IvZmFpbGVkLmh0bWwnLAorICAgICAgICAgICAgJ2luc3BlY3Rv ci90b25ndWV5Lmh0bWwnLCAnaW5zcGVjdG9yL3RpbWVvdXQuaHRtbCcsICdpbnNwZWN0b3IvY3Jh c2guaHRtbCddKQogICAgICAgICB1bmV4cGVjdGVkX3Jlc3VsdF9jb3VudCA9IHJ1bm5lci5fcnVu X3Rlc3RzX3NldCh0ZXN0cywgcnVubmVyLl9wb3J0KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHVuZXhwZWN0ZWRfcmVzdWx0X2NvdW50LCBsZW4odGVzdHMpIC0gMSkKICAgICAgICAgc2VsZi5h c3NlcnRXcml0dGVuKGJ1aWxkYm90X291dHB1dCwgWydSRVNVTFQgZ3JvdXBfbmFtZTogdGVzdF9u YW1lPSA0MiBtc1xuJ10pCkBAIC0xNjYsMTAgKzE2OCw4IEBAIG1heCAxMTIwCiAKICAgICAgICAg YnVpbGRib3Rfb3V0cHV0ID0gU3RyaW5nSU8uU3RyaW5nSU8oKQogICAgICAgICBydW5uZXIgPSBz ZWxmLmNyZWF0ZV9ydW5uZXIoYnVpbGRib3Rfb3V0cHV0LCBkcml2ZXJfY2xhc3M9VGVzdERyaXZl cldpdGhTdG9wQ291bnQpCi0KLSAgICAgICAgZGlybmFtZSA9IHJ1bm5lci5fYmFzZV9wYXRoICsg Jy9pbnNwZWN0b3IvJwotICAgICAgICB0ZXN0cyA9IFtkaXJuYW1lICsgJ3Bhc3MuaHRtbCcsIGRp cm5hbWUgKyAnc2lsZW50Lmh0bWwnLCBkaXJuYW1lICsgJ2ZhaWxlZC5odG1sJywKLSAgICAgICAg ICAgIGRpcm5hbWUgKyAndG9uZ3VleS5odG1sJywgZGlybmFtZSArICd0aW1lb3V0Lmh0bWwnLCBk aXJuYW1lICsgJ2NyYXNoLmh0bWwnXQorICAgICAgICB0ZXN0cyA9IHNlbGYuX3Rlc3RzX2Zvcl9y dW5uZXIocnVubmVyLCBbJ2luc3BlY3Rvci9wYXNzLmh0bWwnLCAnaW5zcGVjdG9yL3NpbGVudC5o dG1sJywgJ2luc3BlY3Rvci9mYWlsZWQuaHRtbCcsCisgICAgICAgICAgICAnaW5zcGVjdG9yL3Rv bmd1ZXkuaHRtbCcsICdpbnNwZWN0b3IvdGltZW91dC5odG1sJywgJ2luc3BlY3Rvci9jcmFzaC5o dG1sJ10pCiAKICAgICAgICAgdW5leHBlY3RlZF9yZXN1bHRfY291bnQgPSBydW5uZXIuX3J1bl90 ZXN0c19zZXQodGVzdHMsIHJ1bm5lci5fcG9ydCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChU ZXN0RHJpdmVyV2l0aFN0b3BDb3VudC5zdG9wX2NvdW50LCA2KQpAQCAtMTg0LDkgKzE4NCw3IEBA IG1heCAxMTIwCiAgICAgICAgIGJ1aWxkYm90X291dHB1dCA9IFN0cmluZ0lPLlN0cmluZ0lPKCkK ICAgICAgICAgcmVndWxhcl9vdXRwdXQgPSBTdHJpbmdJTy5TdHJpbmdJTygpCiAgICAgICAgIHJ1 bm5lciA9IHNlbGYuY3JlYXRlX3J1bm5lcihidWlsZGJvdF9vdXRwdXQsIGFyZ3M9WyItLXBhdXNl LWJlZm9yZS10ZXN0aW5nIl0sIHJlZ3VsYXJfb3V0cHV0PXJlZ3VsYXJfb3V0cHV0LCBkcml2ZXJf Y2xhc3M9VGVzdERyaXZlcldpdGhTdGFydENvdW50KQotCi0gICAgICAgIGRpcm5hbWUgPSBydW5u ZXIuX2Jhc2VfcGF0aCArICcvaW5zcGVjdG9yLycKLSAgICAgICAgdGVzdHMgPSBbZGlybmFtZSAr ICdwYXNzLmh0bWwnXQorICAgICAgICB0ZXN0cyA9IHNlbGYuX3Rlc3RzX2Zvcl9ydW5uZXIocnVu bmVyLCBbJ2luc3BlY3Rvci9wYXNzLmh0bWwnXSkKIAogICAgICAgICB0cnk6CiAgICAgICAgICAg ICBvdXRwdXQgPSBPdXRwdXRDYXB0dXJlKCkKQEAgLTIwMSw3ICsxOTksNyBAQCBtYXggMTEyMAog ICAgIGRlZiB0ZXN0X3J1bl90ZXN0X3NldF9mb3JfcGFyc2VyX3Rlc3RzKHNlbGYpOgogICAgICAg ICBidWlsZGJvdF9vdXRwdXQgPSBTdHJpbmdJTy5TdHJpbmdJTygpCiAgICAgICAgIHJ1bm5lciA9 IHNlbGYuY3JlYXRlX3J1bm5lcihidWlsZGJvdF9vdXRwdXQpCi0gICAgICAgIHRlc3RzID0gW3J1 bm5lci5fYmFzZV9wYXRoICsgJy9CaW5kaW5ncy9ldmVudC10YXJnZXQtd3JhcHBlci5odG1sJywg cnVubmVyLl9iYXNlX3BhdGggKyAnL1BhcnNlci9zb21lLXBhcnNlci5odG1sJ10KKyAgICAgICAg dGVzdHMgPSBzZWxmLl90ZXN0c19mb3JfcnVubmVyKHJ1bm5lciwgWydCaW5kaW5ncy9ldmVudC10 YXJnZXQtd3JhcHBlci5odG1sJywgJ1BhcnNlci9zb21lLXBhcnNlci5odG1sJ10pCiAgICAgICAg IHVuZXhwZWN0ZWRfcmVzdWx0X2NvdW50ID0gcnVubmVyLl9ydW5fdGVzdHNfc2V0KHRlc3RzLCBy dW5uZXIuX3BvcnQpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodW5leHBlY3RlZF9yZXN1bHRf Y291bnQsIDApCiAgICAgICAgIHNlbGYuYXNzZXJ0V3JpdHRlbihidWlsZGJvdF9vdXRwdXQsIFsn UkVTVUxUIEJpbmRpbmdzOiBldmVudC10YXJnZXQtd3JhcHBlcj0gMTQ4OS4wNSBtc1xuJywKQEAg LTM0NCw4ICszNDIsNyBAQCBtYXggMTEyMAogICAgICAgICBhZGRfZmlsZSgndGVzdDIuaHRtbCcp CiAgICAgICAgIGFkZF9maWxlKCd0ZXN0My5odG1sJykKICAgICAgICAgcnVubmVyLl9ob3N0LmZp bGVzeXN0ZW0uY2hkaXIocnVubmVyLl9wb3J0LnBlcmZfdGVzdHNfZGlyKClbOnJ1bm5lci5fcG9y dC5wZXJmX3Rlc3RzX2RpcigpLnJmaW5kKHJ1bm5lci5faG9zdC5maWxlc3lzdGVtLnNlcCldKQot ICAgICAgICB0ZXN0cyA9IFtydW5uZXIuX3BvcnQucmVsYXRpdmVfcGVyZl90ZXN0X2ZpbGVuYW1l KHRlc3QpIGZvciB0ZXN0IGluIHJ1bm5lci5fY29sbGVjdF90ZXN0cygpXQotICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHNvcnRlZCh0ZXN0cyksIFsndGVzdDEuaHRtbCcsICd0ZXN0Mi5odG1sJ10p CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc29ydGVkKFt0ZXN0WzBdIGZvciB0ZXN0IGluIHJ1 bm5lci5fY29sbGVjdF90ZXN0cygpXSksIFsndGVzdDEuaHRtbCcsICd0ZXN0Mi5odG1sJ10pCiAK ICAgICBkZWYgdGVzdF9jb2xsZWN0X3Rlc3RzX3dpdGhfc2tpcHBlZF9saXN0KHNlbGYpOgogICAg ICAgICBydW5uZXIgPSBzZWxmLmNyZWF0ZV9ydW5uZXIoKQpAQCAtMzYxLDggKzM1OCw3IEBAIG1h eCAxMTIwCiAgICAgICAgIGFkZF9maWxlKCdpbnNwZWN0b3IvcmVzb3VyY2VzJywgJ3Jlc291cmNl X2ZpbGUuaHRtbCcpCiAgICAgICAgIGFkZF9maWxlKCd1bnN1cHBvcnRlZCcsICd1bnN1cHBvcnRl ZF90ZXN0Mi5odG1sJykKICAgICAgICAgcnVubmVyLl9wb3J0LnNraXBwZWRfcGVyZl90ZXN0cyA9 IGxhbWJkYTogWydpbnNwZWN0b3IvdW5zdXBwb3J0ZWRfdGVzdDEuaHRtbCcsICd1bnN1cHBvcnRl ZCddCi0gICAgICAgIHRlc3RzID0gW3J1bm5lci5fcG9ydC5yZWxhdGl2ZV9wZXJmX3Rlc3RfZmls ZW5hbWUodGVzdCkgZm9yIHRlc3QgaW4gcnVubmVyLl9jb2xsZWN0X3Rlc3RzKCldCi0gICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoc29ydGVkKHRlc3RzKSwgWydpbnNwZWN0b3IvdGVzdDEuaHRtbCcs ICdpbnNwZWN0b3IvdGVzdDIuaHRtbCddKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNvcnRl ZChbdGVzdFswXSBmb3IgdGVzdCBpbiBydW5uZXIuX2NvbGxlY3RfdGVzdHMoKV0pLCBbJ2luc3Bl Y3Rvci90ZXN0MS5odG1sJywgJ2luc3BlY3Rvci90ZXN0Mi5odG1sJ10pCiAKICAgICBkZWYgdGVz dF9wYXJzZV9hcmdzKHNlbGYpOgogICAgICAgICBydW5uZXIgPSBzZWxmLmNyZWF0ZV9ydW5uZXIo KQo=