124550 2013-11-18 17:13:17 -0800 run-jsc-stress-tests only supports host environments that have make installed 2013-12-03 10:48:28 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhahnenberg mhahnenberg fpizlo oldest_to_newest 951891 0 mhahnenberg 2013-11-18 17:13:17 -0800 This might not be the case for all hosts, so we should write an alternate "backend" for run-jsc-stress-tests to use normal shell commands rather than Makefiles. This will probably sacrifice the ability to run tests in parallel, at least in the first version. 951893 1 mhahnenberg 2013-11-18 17:15:27 -0800 This new backend could be enabled by passing --shell-runner to run-jsc-stress-tests. There would also be a (default) flag for --make-runner. 955740 2 218254 mhahnenberg 2013-12-02 18:33:53 -0800 Created attachment 218254 Patch 955959 3 218254 fpizlo 2013-12-03 10:21:06 -0800 Comment on attachment 218254 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218254&action=review r=me too > Tools/Scripts/jsc-stress-test-helpers/shell-runner.sh:53 > +NUM_PROCS=`sysctl -n hw.activecpu` > +if [ $? -gt 0 ] > +then > + NUM_PROCS=`nproc --all 2>/dev/null` > + if [ $? -gt 0 ] > + then > + NUM_PROCS=1 > + fi > +fi > + > +INDEX_FILE=".index" > +TEST_LIST=".all_tests.txt" > +TEMP_FILE=".temp.txt" > +LOCK_DIR=".lock_dir" > + > +trap "kill -9 0" SIGINT > + > +echo 0 > ${INDEX_FILE} > +ls test_script_* > ${TEST_LIST} > + > +function lock_test_list() { > + until mkdir ${LOCK_DIR} 2> /dev/null; do sleep 0; done > +} > + > +function unlock_test_list() { > + rmdir ${LOCK_DIR} > +} > + > +TOTAL=`wc -l < "${TEST_LIST}" | sed 's/ //g'` > +for PROC in `seq ${NUM_PROCS}` > +do > + ( > + lock_test_list > + while [ -s ${TEST_LIST} ] > + do > + INDEX=`cat ${INDEX_FILE}` > + INDEX=$((INDEX + 1)) > + echo "${INDEX}" > ${INDEX_FILE} > + printf "\r ${INDEX}/${TOTAL}" > + > + TEST=`tail -n 1 ${TEST_LIST}` > + sed '$d' < ${TEST_LIST} > ${TEMP_FILE} > + mv ${TEMP_FILE} ${TEST_LIST} > + unlock_test_list > + > + sh ${TEST} > /dev/null > + > + lock_test_list > + done > + unlock_test_list > + )& > +done > +wait Copyright thingy? 955976 4 mhahnenberg 2013-12-03 10:48:28 -0800 Committed r160016: <http://trac.webkit.org/changeset/160016> 218254 2013-12-02 18:33:53 -0800 2013-12-03 10:21:06 -0800 Patch bug-124550-20131202183356.patch text/plain 10377 mhahnenberg SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1OTk4NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEzLTEyLTAyICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBs ZS5jb20+CisKKyAgICAgICAgcnVuLWpzYy1zdHJlc3MtdGVzdHMgb25seSBzdXBwb3J0cyBob3N0 IGVudmlyb25tZW50cyB0aGF0IGhhdmUgbWFrZSBpbnN0YWxsZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDU1MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgbWlnaHQgbm90IGJlIHRoZSBjYXNl IGZvciBhbGwgaG9zdHMsIHNvIHRoaXMgcGF0Y2ggaW1wbGVtZW50cyBhbiBhbHRlcm5hdGUgImJh Y2tlbmQiIAorICAgICAgICBmb3IgcnVuLWpzYy1zdHJlc3MtdGVzdHMgdG8gdXNlIG5vcm1hbCBz aGVsbCBjb21tYW5kcyByYXRoZXIgdGhhbiBNYWtlZmlsZXMuIFRvIHJlbWFpbiBhdCAKKyAgICAg ICAgbGVhc3Qgc29tZXdoYXQgY29tcGV0aXRpdmUgd2l0aCB0aGUgbWFrZS1iYXNlZCB0ZXN0IHJ1 bm5lciwgdGhlIHNoZWxsIGJhY2tlbmQgdXNlcyBzdWJzaGVsbHMKKyAgICAgICAgcnVuIGluIHRo ZSBiYWNrZ3JvdW5kIHRvIGFsbG93IHRlc3RzIHRvIHJ1biBpbiBwYXJhbGxlbC4gU2luY2UgdGhl IGNvbmN1cnJlbmN5IHByaW1pdGl2ZXMgCisgICAgICAgIGluIHNoZWxsIHNjcmlwdGluZyBhcmUg cmF0aGVyIGNvYXJzZSwgdGhlIG92ZXJoZWFkIG9mIHRoaXMgcGFyYWxsZWxpc20gaXMgaGlnaGVy IHRoYW4gdGhhdCAKKyAgICAgICAgb2YgdGhlIG1ha2UtYmFzZWQgcnVubmVyLgorCisgICAgICAg ICogU2NyaXB0cy9qc2Mtc3RyZXNzLXRlc3QtaGVscGVycy9zaGVsbC1ydW5uZXIuc2g6IEFkZGVk LiBUaGlzIGlzIHRoZSBydW5uZXIgdGhhdCBpcyBjb3BpZWQgaW50bworICAgICAgICB0aGUgYnVu ZGxlIGFuZCBjb250cm9scyBhbGwgb2YgdGhlIHBhcmFsbGVsIGFzcGVjdHMgb2YgdGhlIHNoZWxs LWJhc2VkIHRlc3QgcnVubmVyLgorICAgICAgICAqIFNjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVz dHM6CisKIDIwMTMtMTItMDIgIFNhbXVlbCBXaGl0ZSAgPHNhbXVlbF93aGl0ZUBhcHBsZS5jb20+ CiAKICAgICAgICAgQVg6IEFkZCBBWFVJRWxlbWVudENvdW50Rm9yU2VhcmNoUHJlZGljYXRlIHBh cmFtZXRlcml6ZWQgYXR0cmlidXRlLgpJbmRleDogVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVz cy10ZXN0cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3Rz CShyZXZpc2lvbiAxNTk5NjQpCisrKyBUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3Rz CSh3b3JraW5nIGNvcHkpCkBAIC02OCw3ICs2OCw3IEBAIGRlZiBwcmludENvbW1hbmRBcnJheSgq Y21kKQogZW5kCiAKIGRlZiBteXN5cygqY21kKQotICAgIHByaW50Q29tbWFuZEFycmF5KCpjbWQp CisgICAgcHJpbnRDb21tYW5kQXJyYXkoKmNtZCkgaWYgJHZlcmJvc2l0eSA+PSAxCiAgICAgcmFp c2UgIkNvbW1hbmQgZmFpbGVkOiAjeyQ/Lmluc3BlY3R9IiB1bmxlc3Mgc3lzdGVtKCpjbWQpCiBl bmQKIApAQCAtOTIsNiArOTIsNyBAQCAkdmVyYm9zaXR5ID0gMAogJGJ1bmRsZSA9IG5pbAogJHRh cmJhbGwgPSBmYWxzZQogJGNvcHlWTSA9IGZhbHNlCiskdGVzdFJ1bm5lclR5cGUgPSA6bWFrZQog CiBkZWYgdXNhZ2UKICAgICBwdXRzICJydW4tanNjLXN0cmVzcy10ZXN0cyAtaiA8c2hlbGwgcGF0 aD4gPGNvbGxlY3Rpb25zIHBhdGg+IFs8Y29sbGVjdGlvbnMgcGF0aD4gLi4uXSIKQEAgLTEwMiw2 ICsxMDMsOCBAQCBkZWYgdXNhZ2UKICAgICBwdXRzICItLXZlcmJvc2UgICAgICAgICAgICAoLXYp ICAgUHJpbnQgbW9yZSB0aGluZ3Mgd2hpbGUgcnVubmluZy4iCiAgICAgcHV0cyAiLS1ydW4tYnVu ZGxlICAgICAgICAgICAgICAgIFJ1bnMgYSBidW5kbGUgcHJldmlvdXNseSBjcmVhdGVkIGJ5IHJ1 bi1qc2Mtc3RyZXNzLXRlc3RzLiIKICAgICBwdXRzICItLXRhcmJhbGwgICAgICAgICAgICAgICAg ICAgQ3JlYXRlcyBhIHRhcmJhbGwgb2YgdGhlIGZpbmFsIGJ1bmRsZS4iCisgICAgcHV0cyAiLS1z aGVsbC1ydW5uZXIgICAgICAgICAgICAgIFVzZXMgdGhlIHNoZWxsLWJhc2VkIHRlc3QgcnVubmVy IGluc3RlYWQgb2YgdGhlIGRlZmF1bHQgbWFrZS1iYXNlZCBydW5uZXIuIgorICAgIHB1dHMgIiAg ICAgICAgICAgICAgICAgICAgICAgICAgICBJbiBnZW5lcmFsIHRoZSBzaGVsbCBydW5uZXIgaXMg c2xvd2VyIHRoYW4gdGhlIG1ha2UgcnVubmVyLiIKICAgICBwdXRzICItLWhlbHAgICAgICAgICAg ICAgICAoLWgpICAgUHJpbnQgdGhpcyBtZXNzYWdlLiIKICAgICBleGl0IDEKIGVuZApAQCAtMTEz LDYgKzExNiw3IEBAIEdldG9wdExvbmcubmV3KFsnLS1oZWxwJywgJy1oJywgR2V0b3B0TG8KICAg ICAgICAgICAgICAgIFsnLS1ydW4tYnVuZGxlJywgR2V0b3B0TG9uZzo6UkVRVUlSRURfQVJHVU1F TlRdLAogICAgICAgICAgICAgICAgWyctLXRhcmJhbGwnLCBHZXRvcHRMb25nOjpOT19BUkdVTUVO VF0sCiAgICAgICAgICAgICAgICBbJy0tZm9yY2Utdm0tY29weScsIEdldG9wdExvbmc6Ok5PX0FS R1VNRU5UXSwKKyAgICAgICAgICAgICAgIFsnLS1zaGVsbC1ydW5uZXInLCBHZXRvcHRMb25nOjpO T19BUkdVTUVOVF0sCiAgICAgICAgICAgICAgICBbJy0tdmVyYm9zZScsICctdicsIEdldG9wdExv bmc6Ok5PX0FSR1VNRU5UXSkuZWFjaCB7CiAgICAgfCBvcHQsIGFyZyB8CiAgICAgY2FzZSBvcHQK QEAgLTEzMyw2ICsxMzcsOCBAQCBHZXRvcHRMb25nLm5ldyhbJy0taGVscCcsICctaCcsIEdldG9w dExvCiAgICAgICAgICRjb3B5Vk0gPSB0cnVlCiAgICAgd2hlbiAnLS1mb3JjZS12bS1jb3B5Jwog ICAgICAgICAkY29weVZNID0gdHJ1ZQorICAgIHdoZW4gJy0tc2hlbGwtcnVubmVyJworICAgICAg ICAkdGVzdFJ1bm5lclR5cGUgPSA6c2hlbGwKICAgICBlbmQKIH0KIApAQCAtMzgxLDcgKzM4Nyw3 IEBAIGNsYXNzIFBsYW4KICAgICBlbmQKICAgICAKICAgICBkZWYgcmVwcm9TY3JpcHRDb21tYW5k Ci0gICAgICAgICMgV2UgaGF2ZSB0byBmaW5kIG91ciB3YXkgYmFjayB0byB0aGUgLnBhcmFsbGVs IGRpcmVjdG9yeSBzaW5jZSB0aGF0J3Mgd2hlcmUgYWxsIG9mIHRoZSByZWxhdGl2ZQorICAgICAg ICAjIFdlIGhhdmUgdG8gZmluZCBvdXIgd2F5IGJhY2sgdG8gdGhlIC5ydW5uZXIgZGlyZWN0b3J5 IHNpbmNlIHRoYXQncyB3aGVyZSBhbGwgb2YgdGhlIHJlbGF0aXZlCiAgICAgICAgICMgcGF0aHMg YXNzdW1lIHRoZXkgc3RhcnQgb3V0IGZyb20uCiAgICAgICAgIHNjcmlwdCA9ICJDVVJSRU5UX0RJ Uj1cIiQoIGNkIFwiJCggZGlybmFtZSBcIiR7QkFTSF9TT1VSQ0VbMF19XCIgKVwiICYmIHB3ZCAp XCJcbiIKICAgICAgICAgc2NyaXB0ICs9ICJjZCAkQ1VSUkVOVF9ESVJcbiIKQEAgLTM4OSw3ICsz OTUsNyBAQCBjbGFzcyBQbGFuCiAgICAgICAgICAgICB8IHBhdGhDb21wb25lbnQgfAogICAgICAg ICAgICAgc2NyaXB0ICs9ICJjZCAuLlxuIgogICAgICAgICB9Ci0gICAgICAgIHNjcmlwdCArPSAi Y2QgLnBhcmFsbGVsXG4iCisgICAgICAgIHNjcmlwdCArPSAiY2QgLnJ1bm5lclxuIgogCiAgICAg ICAgIHNjcmlwdCArPSAiZXhwb3J0IERZTERfRlJBTUVXT1JLX1BBVEg9JChjZCAuLi8jeyRmcmFt ZXdvcmtQYXRoLmRpcm5hbWV9OyBwd2QpXG4iCiAgICAgICAgIElNUE9SVEFOVF9FTlZTLmVhY2gg ewpAQCAtOTEyLDEzICs5MTgsNTQgQEAgZGVmIGVhY2hSZXN1bHRGaWxlKHN0YXJ0aW5nRGlyLCAm YmxvY2spCiAgICAgZW5kCiBlbmQKIAotZGVmIHByZXBhcmVQYXJhbGxlbFRlc3RSdW5uZXIKK2Rl ZiBwcmVwYXJlVGVzdFJ1bm5lcgorICAgIHJhaXNlIGlmICRidW5kbGUKKworICAgICRydW5saXN0 LmVhY2hfd2l0aF9pbmRleCB7CisgICAgICAgIHwgcGxhbiwgaW5kZXggfAorICAgICAgICBwbGFu LmluZGV4ID0gaW5kZXgKKyAgICB9CisKKyAgICBEaXIubWtkaXIoJHJ1bm5lckRpcikgdW5sZXNz ICRydW5uZXJEaXIuZGlyZWN0b3J5PworICAgIHRvRGVsZXRlID0gW10KKyAgICBEaXIuZm9yZWFj aCgkcnVubmVyRGlyKSB7CisgICAgICAgIHwgZmlsZW5hbWUgfAorICAgICAgICBpZiBmaWxlbmFt ZSA9fiAvXnRlc3RfLworICAgICAgICAgICAgdG9EZWxldGUgPDwgZmlsZW5hbWUKKyAgICAgICAg ZW5kCisgICAgfQorICAgIAorICAgIHRvRGVsZXRlLmVhY2ggeworICAgICAgICB8IGZpbGVuYW1l IHwKKyAgICAgICAgRmlsZS51bmxpbmsoJHJ1bm5lckRpciArIGZpbGVuYW1lKQorICAgIH0KKwor ICAgICRydW5saXN0LmVhY2ggeworICAgICAgICB8IHBsYW4gfAorICAgICAgICBwbGFuLndyaXRl UnVuU2NyaXB0KCRydW5uZXJEaXIgKyAidGVzdF9zY3JpcHRfI3twbGFuLmluZGV4fSIpCisgICAg fQorCisgICAgY2FzZSAkdGVzdFJ1bm5lclR5cGUKKyAgICB3aGVuIDptYWtlCisgICAgICAgIHBy ZXBhcmVNYWtlVGVzdFJ1bm5lcgorICAgIHdoZW4gOnNoZWxsCisgICAgICAgIHByZXBhcmVTaGVs bFRlc3RSdW5uZXIKKyAgICBlbHNlCisgICAgICAgIHJhaXNlICJVbmtub3duIHRlc3QgcnVubmVy IHR5cGU6ICN7JHRlc3RSdW5uZXJUeXBlLnRvX3N9IgorICAgIGVuZAorZW5kCisKK2RlZiBwcmVw YXJlU2hlbGxUZXN0UnVubmVyCisgICAgRmlsZVV0aWxzLmNwIFNDUklQVFNfUEFUSCArICJqc2Mt c3RyZXNzLXRlc3QtaGVscGVycyIgKyAic2hlbGwtcnVubmVyLnNoIiwgJHJ1bm5lckRpciArICJy dW5zY3JpcHQiCitlbmQKKworZGVmIHByZXBhcmVNYWtlVGVzdFJ1bm5lcgogICAgICMgVGhlIGdv YWxzIG9mIG91ciBwYXJhbGxlbCB0ZXN0IHJ1bm5lciBhcmUgc2NhbGFiaWxpdHkgYW5kIHNpbXBs aWNpdHkuIFRoZQogICAgICMgc2ltcGxpY2l0eSBwYXJ0IGlzIHBhcnRpY3VsYXJseSBpbXBvcnRh bnQuIFdlIGRvbid0IHdhbnQgdG8gaGF2ZSB0byBoYXZlCiAgICAgIyBhIGZ1bGwtdGltZSBjb250 cmlidXRvciBqdXN0IHBoaWxvc29waGlzaW5nIGFib3V0IHBhcmFsbGVsIHRlc3RpbmcuCiAgICAg IwogICAgICMgQXMgc3VjaCwgd2UganVzdCBwYXNzIG9mZiBhbGwgb2YgdGhlIGhhcmQgd29yayB0 byAnbWFrZScuIFRoaXMgY3JlYXRlcyBhCi0gICAgIyBkdW1teSBkaXJlY3RvcnkgKCIkb3V0cHV0 RGlyLy5wYXJhbGxlbCIpIGluIHdoaWNoIHdlIGNyZWF0ZSBhIGR1bW15CisgICAgIyBkdW1teSBk aXJlY3RvcnkgKCIkb3V0cHV0RGlyLy5ydW5uZXIiKSBpbiB3aGljaCB3ZSBjcmVhdGUgYSBkdW1t eQogICAgICMgTWFrZWZpbGUuIFRoZSBNYWtlZmlsZSBoYXMgYW4gJ2FsbCcgcnVsZSB0aGF0IGRl cGVuZHMgb24gYWxsIG9mIHRoZSB0ZXN0cy4KICAgICAjIFRoYXQgaXMsIGZvciBlYWNoIHRlc3Qg d2Uga25vdyB3ZSB3aWxsIHJ1biwgdGhlcmUgaXMgYSBydWxlIGluIHRoZQogICAgICMgTWFrZWZp bGUgYW5kICdhbGwnIGRlcGVuZHMgb24gaXQuIFJ1bm5pbmcgJ21ha2UgLWogPHdoYXRldmVyPicg b24gdGhpcwpAQCAtOTQxLDQwICs5ODgsMTkgQEAgZGVmIHByZXBhcmVQYXJhbGxlbFRlc3RSdW5u ZXIKICAgICAjIGNvbnRpbnVlIHBhc3QgdGhhdCBmYWlsdXJlIGFuZCBjb21wbGV0ZSBhbGwgdGhl IHRlc3RzIGFueXdheS4KICAgICAjCiAgICAgIyBJbiB0aGUgZW5kLCB0aGlzIHNjcmlwdCBjb2xs ZWN0cyBhbGwgb2YgdGhlIGZhaWx1cmVzIGJ5IHNlYXJjaGluZyBmb3IKLSAgICAjIGZpbGVzIGlu IHRoZSAucGFyYWxsZWwgZGlyZWN0b3J5IHdob3NlIG5hbWUgbWF0Y2hlcyAvXnRlc3RfZmFpbF8v LCB3aGVyZQorICAgICMgZmlsZXMgaW4gdGhlIC5ydW5uZXIgZGlyZWN0b3J5IHdob3NlIG5hbWUg bWF0Y2hlcyAvXnRlc3RfZmFpbF8vLCB3aGVyZQogICAgICMgdGhlIHRoaW5nIGFmdGVyIHRoZSAn ZmFpbF8nIGlzIHRoZSB0ZXN0IGluZGV4LiBUaG9zZSBhcmUgdGhlIGZpbGVzIHRoYXQKICAgICAj IHdvdWxkIGJlIGNyZWF0ZWQgYnkgdGhlIHRlc3Qgc2NyaXB0cyBpZiB0aGV5IGRldGVjdCBmYWls dXJlLiBXZSdyZQogICAgICMgYmFzaWNhbGx5IHVzaW5nIHRoZSBmaWxlc3lzdGVtIGFzIGEgY29u Y3VycmVudCBkYXRhYmFzZSBvZiB0ZXN0IGZhaWx1cmVzLgogICAgICMgRXZlbiBpZiB0d28gdGVz dHMgZmFpbCBhdCB0aGUgc2FtZSB0aW1lLCBzaW5jZSB0aGV5J3JlIHRvdWNoaW5nIGRpZmZlcmVu dAogICAgICMgZmlsZXMgd2Ugd29uJ3QgbWlzcyBhbnkgZmFpbHVyZXMuCi0gICAgCiAgICAgcnVu SW5kaWNlcyA9IFtdCi0gICAgJHJ1bmxpc3QuZWFjaF93aXRoX2luZGV4IHsKLSAgICAgICAgfCBw bGFuLCBpbmRleCB8Ci0gICAgICAgIHJ1bkluZGljZXMgPDwgaW5kZXgKLSAgICAgICAgcGxhbi5p bmRleCA9IGluZGV4Ci0gICAgfQotICAgIAotICAgIERpci5ta2RpcigkcGFyYWxsZWxEaXIpIHVu bGVzcyAkcGFyYWxsZWxEaXIuZGlyZWN0b3J5PwotICAgIHRvRGVsZXRlID0gW10KLSAgICBEaXIu Zm9yZWFjaCgkcGFyYWxsZWxEaXIpIHsKLSAgICAgICAgfCBmaWxlbmFtZSB8Ci0gICAgICAgIGlm IGZpbGVuYW1lID1+IC9edGVzdF8vCi0gICAgICAgICAgICB0b0RlbGV0ZSA8PCBmaWxlbmFtZQot ICAgICAgICBlbmQKLSAgICB9Ci0gICAgCi0gICAgdG9EZWxldGUuZWFjaCB7Ci0gICAgICAgIHwg ZmlsZW5hbWUgfAotICAgICAgICBGaWxlLnVubGluaygkcGFyYWxsZWxEaXIgKyBmaWxlbmFtZSkK LSAgICB9Ci0KICAgICAkcnVubGlzdC5lYWNoIHsKICAgICAgICAgfCBwbGFuIHwKLSAgICAgICAg cGxhbi53cml0ZVJ1blNjcmlwdCgkcGFyYWxsZWxEaXIgKyAidGVzdF9zY3JpcHRfI3twbGFuLmlu ZGV4fSIpCisgICAgICAgIHJ1bkluZGljZXMgPDwgcGxhbi5pbmRleAogICAgIH0KICAgICAKLSAg ICBGaWxlLm9wZW4oJHBhcmFsbGVsRGlyICsgIk1ha2VmaWxlIiwgInciKSB7CisgICAgRmlsZS5v cGVuKCRydW5uZXJEaXIgKyAiTWFrZWZpbGUiLCAidyIpIHsKICAgICAgICAgfCBvdXRwIHwKICAg ICAgICAgb3V0cC5wdXRzKCJhbGw6ICIgKyBydW5JbmRpY2VzLm1hcHt8dnwgInRlc3RfZG9uZV8j e3Z9In0uam9pbignICcpKQogICAgICAgICBydW5JbmRpY2VzLmVhY2ggewpAQCAtMTAwMCwxNyAr MTAyNiwzNCBAQCBlbmQKICAgICAKIHB1dHMKIAotZGVmIGNsZWFuUGFyYWxsZWxEaXJlY3RvcnkK K2RlZiBjbGVhblJ1bm5lckRpcmVjdG9yeQogICAgIHJhaXNlIHVubGVzcyAkYnVuZGxlCi0gICAg RGlyLmZvcmVhY2goJHBhcmFsbGVsRGlyKSB7CisgICAgRGlyLmZvcmVhY2goJHJ1bm5lckRpcikg ewogICAgICAgICB8IGZpbGVuYW1lIHwKICAgICAgICAgbmV4dCB1bmxlc3MgZmlsZW5hbWUgPX4g L150ZXN0X2ZhaWwvCi0gICAgICAgIEZpbGVVdGlscy5ybV9mICRwYXJhbGxlbERpciArIGZpbGVu YW1lCisgICAgICAgIEZpbGVVdGlscy5ybV9mICRydW5uZXJEaXIgKyBmaWxlbmFtZQogICAgIH0K IGVuZAogCi1kZWYgcnVuUGFyYWxsZWxUZXN0UnVubmVyCi0gICAgRGlyLmNoZGlyKCRwYXJhbGxl bERpcikgeworZGVmIHJ1blRlc3RSdW5uZXIKKyAgICBjYXNlICR0ZXN0UnVubmVyVHlwZQorICAg IHdoZW4gOnNoZWxsCisgICAgICAgIHJ1blNoZWxsVGVzdFJ1bm5lcgorICAgIHdoZW4gOm1ha2UK KyAgICAgICAgcnVuTWFrZVRlc3RSdW5uZXIKKyAgICBlbHNlCisgICAgICAgIHJhaXNlICJVbmtu b3duIHRlc3QgcnVubmVyIHR5cGU6ICN7JHRlc3RSdW5uZXJUeXBlLnRvX3N9IgorICAgIGVuZAor ZW5kCisKK2RlZiBydW5TaGVsbFRlc3RSdW5uZXIKKyAgICBEaXIuY2hkaXIoJHJ1bm5lckRpcikg eworICAgICAgICBteXN5cygic2giLCAicnVuc2NyaXB0IikKKyAgICB9CitlbmQKKworZGVmIHJ1 bk1ha2VUZXN0UnVubmVyCisgICAgRGlyLmNoZGlyKCRydW5uZXJEaXIpIHsKICAgICAgICAgIyAt MSBmb3IgdGhlIE1ha2VmaWxlLCBhbmQgLTIgZm9yICcuLicgYW5kICcuJwogICAgICAgICBudW1i ZXJPZlRlc3RzID0gRGlyLmVudHJpZXMoIi4iKS5jb3VudCAtIDMKICAgICAgICAgdW5sZXNzICRw cm9ncmVzc01ldGVyCkBAIC0xMDc5LDcgKzExMjIsNyBAQCBlbmQKIGRlZiBkZXRlY3RGYWlsdXJl cwogICAgIHJhaXNlIGlmICRidW5kbGUKIAotICAgIERpci5mb3JlYWNoKCRwYXJhbGxlbERpcikg eworICAgIERpci5mb3JlYWNoKCRydW5uZXJEaXIpIHsKICAgICAgICAgfCBmaWxlbmFtZSB8CiAg ICAgICAgIG5leHQgdW5sZXNzIGZpbGVuYW1lID1+IC90ZXN0X2ZhaWxfLwogICAgICAgICBhcHBl bmRGYWlsdXJlKCRydW5saXN0WyR+LnBvc3RfbWF0Y2gudG9faV0pCkBAIC0xMTAxLDEzICsxMTQ0 LDE2IEBAIHJlc2N1ZQogZW5kCiAKICRvdXRwdXREaXIgPSAkb3V0cHV0RGlyLnJlYWxwYXRoCi0k cGFyYWxsZWxEaXIgPSAkb3V0cHV0RGlyICsgIi5wYXJhbGxlbCIKKyRydW5uZXJEaXIgPSAkb3V0 cHV0RGlyICsgIi5ydW5uZXIiCiAKIHByZXBhcmVCdW5kbGUgdW5sZXNzICRidW5kbGUKLXByZXBh cmVQYXJhbGxlbFRlc3RSdW5uZXIgdW5sZXNzICRidW5kbGUKLWNsZWFuUGFyYWxsZWxEaXJlY3Rv cnkgaWYgJGJ1bmRsZQorCitwdXRzICIgIgorCitwcmVwYXJlVGVzdFJ1bm5lciB1bmxlc3MgJGJ1 bmRsZQorY2xlYW5SdW5uZXJEaXJlY3RvcnkgaWYgJGJ1bmRsZQogY2xlYW5PbGRSZXN1bHRzIGlm ICRidW5kbGUKLXJ1blBhcmFsbGVsVGVzdFJ1bm5lcgorcnVuVGVzdFJ1bm5lcgogY2xlYW5FbXB0 eVJlc3VsdEZpbGVzCiBkZXRlY3RGYWlsdXJlcyB1bmxlc3MgJGJ1bmRsZQogY29tcHJlc3NCdW5k bGUgaWYgJHRhcmJhbGwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvanNjLXN0cmVzcy10ZXN0LWhlbHBl cnMvc2hlbGwtcnVubmVyLnNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvanNjLXN0cmVz cy10ZXN0LWhlbHBlcnMvc2hlbGwtcnVubmVyLnNoCShyZXZpc2lvbiAwKQorKysgVG9vbHMvU2Ny aXB0cy9qc2Mtc3RyZXNzLXRlc3QtaGVscGVycy9zaGVsbC1ydW5uZXIuc2gJKHdvcmtpbmcgY29w eSkKQEAgLTAsMCArMSw1MyBAQAorTlVNX1BST0NTPWBzeXNjdGwgLW4gaHcuYWN0aXZlY3B1YAor aWYgWyAkPyAtZ3QgMCBdCit0aGVuCisgICAgTlVNX1BST0NTPWBucHJvYyAtLWFsbCAyPi9kZXYv bnVsbGAKKyAgICBpZiBbICQ/IC1ndCAwIF0KKyAgICB0aGVuCisgICAgICAgIE5VTV9QUk9DUz0x CisgICAgZmkKK2ZpCisKK0lOREVYX0ZJTEU9Ii5pbmRleCIKK1RFU1RfTElTVD0iLmFsbF90ZXN0 cy50eHQiCitURU1QX0ZJTEU9Ii50ZW1wLnR4dCIKK0xPQ0tfRElSPSIubG9ja19kaXIiCisKK3Ry YXAgImtpbGwgLTkgMCIgU0lHSU5UCisKK2VjaG8gMCA+ICR7SU5ERVhfRklMRX0KK2xzIHRlc3Rf c2NyaXB0XyogPiAke1RFU1RfTElTVH0KKworZnVuY3Rpb24gbG9ja190ZXN0X2xpc3QoKSB7Cisg ICAgdW50aWwgbWtkaXIgJHtMT0NLX0RJUn0gMj4gL2Rldi9udWxsOyBkbyBzbGVlcCAwOyBkb25l Cit9CisKK2Z1bmN0aW9uIHVubG9ja190ZXN0X2xpc3QoKSB7CisgICAgcm1kaXIgJHtMT0NLX0RJ Un0KK30KKworVE9UQUw9YHdjIC1sIDwgIiR7VEVTVF9MSVNUfSIgfCBzZWQgJ3MvIC8vZydgCitm b3IgUFJPQyBpbiBgc2VxICR7TlVNX1BST0NTfWAKK2RvCisgICAgKAorICAgICAgICBsb2NrX3Rl c3RfbGlzdAorICAgICAgICB3aGlsZSBbIC1zICR7VEVTVF9MSVNUfSBdCisgICAgICAgIGRvCisg ICAgICAgICAgICBJTkRFWD1gY2F0ICR7SU5ERVhfRklMRX1gCisgICAgICAgICAgICBJTkRFWD0k KChJTkRFWCArIDEpKQorICAgICAgICAgICAgZWNobyAiJHtJTkRFWH0iID4gJHtJTkRFWF9GSUxF fQorICAgICAgICAgICAgcHJpbnRmICJcciAgICAke0lOREVYfS8ke1RPVEFMfSIKKworICAgICAg ICAgICAgVEVTVD1gdGFpbCAtbiAxICR7VEVTVF9MSVNUfWAKKyAgICAgICAgICAgIHNlZCAnJGQn IDwgJHtURVNUX0xJU1R9ID4gJHtURU1QX0ZJTEV9CisgICAgICAgICAgICBtdiAke1RFTVBfRklM RX0gJHtURVNUX0xJU1R9CisgICAgICAgICAgICB1bmxvY2tfdGVzdF9saXN0CisKKyAgICAgICAg ICAgIHNoICR7VEVTVH0gPiAvZGV2L251bGwKKworICAgICAgICAgICAgbG9ja190ZXN0X2xpc3QK KyAgICAgICAgZG9uZQorICAgICAgICB1bmxvY2tfdGVzdF9saXN0CisgICAgKSYKK2RvbmUKK3dh aXQK