48043 2010-10-20 23:10:10 -0700 TestWebKitAPI should detect test hangs 2011-05-19 21:11:04 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 61088 57513 1 aroben webkit-unassigned commit-queue dslomov sam oldest_to_newest 297241 0 aroben 2010-10-20 23:10:10 -0700 If a test hangs, TestWebKitAPI will never exit and run-api-tests will hang forever. TestWebKitAPI should detect when a test hangs and print out a failure message. 304661 1 aroben 2010-11-04 07:54:46 -0700 <rdar://problem/8630444> 405894 2 93953 dslomov 2011-05-18 11:36:03 -0700 Created attachment 93953 Adding hang-detection to run-api-tests I returned back to running tests one-by-one and original run-api-tests output format. 405898 3 93953 aroben 2011-05-18 11:39:59 -0700 Comment on attachment 93953 Adding hang-detection to run-api-tests Can we do this in two pieces? 1) Go back to running tests singly, 2) add hang detection? It's hard to review both at once. 405899 4 dslomov 2011-05-18 11:41:45 -0700 (In reply to comment #3) > (From update of attachment 93953 [details]) > Can we do this in two pieces? 1) Go back to running tests singly, 2) add hang detection? It's hard to review both at once. sure - do you want a separate issue for the 1st? 405904 5 aroben 2011-05-18 11:47:06 -0700 (In reply to comment #4) > (In reply to comment #3) > > (From update of attachment 93953 [details] [details]) > > Can we do this in two pieces? 1) Go back to running tests singly, 2) add hang detection? It's hard to review both at once. > > sure - do you want a separate issue for the 1st? Doesn't matter to me. Thanks! 406777 6 94152 dslomov 2011-05-19 17:39:58 -0700 Created attachment 94152 New, smaller patch 406780 7 94152 aroben 2011-05-19 17:44:42 -0700 Comment on attachment 94152 New, smaller patch View in context: https://bugs.webkit.org/attachment.cgi?id=94152&action=review > Tools/Scripts/run-api-tests:177 > + eval { > + local $SIG{ALRM} = sub { die "alarm\n" }; > + alarm $timeout; > + waitpid($pid, 0); > + alarm 0; > + $result = $?; > + }; > + if ($@) { > + die unless $@ eq "alarm\n"; > + kill SIGTERM, $pid or kill SIGKILL, $pid; > + $timedOut = 1; > + }; It's too bad we can't share more of this code between Mac and Windows. No need for the semicolon after the if braces. > Tools/Scripts/run-api-tests:196 > + if ($@) { > + die unless $@ eq "alarm\n"; > + $timedOut = 1; > + }; No need for the semicolon after the closing brace. 406858 8 94152 commit-queue 2011-05-19 21:10:59 -0700 Comment on attachment 94152 New, smaller patch Clearing flags on attachment: 94152 Committed r86922: <http://trac.webkit.org/changeset/86922> 406859 9 commit-queue 2011-05-19 21:11:04 -0700 All reviewed patches have been landed. Closing bug. 93953 2011-05-18 11:36:03 -0700 2011-05-19 17:39:58 -0700 Adding hang-detection to run-api-tests 48043.patch text/plain 7927 dslomov ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNWU4 N2NjLi5kNWFhNGM1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDUtMTggIERtaXRyeSBMb21vdiAgPGRzbG9t b3ZAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBEZXRlY3QgaGFuZ3MgaW4gcnVuLWFwaS10ZXN0cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDgwNDMKKworICAgICAgICAqIFNjcmlwdHMv cnVuLWFwaS10ZXN0czogUHV0IGJhY2sgb25lLXRlc3QtYXQtYS10aW1lIHJ1bm5pbmcgbG9naWMg YW5kIGFkZGVkIHRlc3QgdGltZW91dHMKKwogMjAxMS0wNS0xOCAgQWRhbSBSb2JlbiAgPGFyb2Jl bkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgbmV3IHBhZ2UgdG8gYnVpbGQud2Via2l0Lm9y ZyB0byBoZWxwIGZpbmQgd2hlbiB0ZXN0cyBzdGFydGVkIGZhaWxpbmcKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvcnVuLWFwaS10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWFwaS10ZXN0cwpp bmRleCBiOWQ4NGI1Li5hZTdkMDUxIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1hcGkt dGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tYXBpLXRlc3RzCkBAIC0zNiwxMCArMzYsMTgg QEAgdXNlIEdldG9wdDo6TG9uZyBxdyg6Y29uZmlnIHBhc3NfdGhyb3VnaCk7CiB1c2UgSVBDOjpP cGVuMzsKIHVzZSBsaWIgJEZpbmRCaW46OkJpbjsKIHVzZSB3ZWJraXRkaXJzOwordXNlIFRlcm06 OkFOU0lDb2xvciBxdyg6Y29uc3RhbnRzKTsKIAotc3ViIHJ1blRlc3RUb29sKEApOworc3ViIGR1 bXBBbGxUZXN0cygpOworc3ViIHJ1bkFsbFRlc3RzKCk7CitzdWIgcnVuQWxsVGVzdHNJblN1aXRl KCQpOworc3ViIHJ1blRlc3QoJCQpOworc3ViIHBvcHVsYXRlVGVzdHMoKTsKIHN1YiBidWlsZFRl c3RUb29sKCk7CiAKKyMgVGltZW91dCBmb3IgaW5kaXZpZHVhbCB0ZXN0LCBpbiBzZWMKK215ICR0 aW1lb3V0ID0gMTA7CisKIG15ICRzaG93SGVscCA9IDA7CiBteSAkdmVyYm9zZSA9IDA7CiBteSAk ZHVtcCA9IDA7CkBAIC02NiwyMCArNzQsNzAgQEAgaWYgKCRzaG93SGVscCkgewogc2V0Q29uZmln dXJhdGlvbigpOwogYnVpbGRUZXN0VG9vbCgpOwogc2V0UGF0aEZvclJ1bm5pbmdXZWJLaXRBcHAo XCVFTlYpOworbXkgJXRlc3RzVG9SdW4gPSBwb3B1bGF0ZVRlc3RzKCk7CiAKIGlmICgkZHVtcCkg ewotICAgIG15IEBkdW1wQXJndW1lbnRzID0gKCItLWd0ZXN0X2xpc3RfdGVzdHMiKTsKLSAgICBy dW5UZXN0VG9vbChAZHVtcEFyZ3VtZW50cyk7Ci0gICAgZXhpdCgwKTsKKyAgICBkdW1wQWxsVGVz dHMoKTsKKyAgICBleGl0IDA7Cit9CisKK2lmIChydW5BbGxUZXN0cygpKSB7CisgICAgZXhpdCAx OworfQorZWxzZSB7CisgICAgZXhpdCAwOworfQorCitzdWIgZHVtcEFsbFRlc3RzKCkKK3sKKyAg ICBwcmludCAiRHVtcGluZyB0ZXN0IGNhc2VzXG4iOworICAgIHByaW50ICItLS0tLS0tLS0tLS0t LS0tLS1cbiI7CisgICAgZm9yIG15ICRzdWl0ZSAoa2V5cyAldGVzdHNUb1J1bikgeworICAgICAg ICBwcmludCAkc3VpdGUgLiAiOlxuIjsKKyAgICAgICAgcHJpbnQgbWFwIHsgIiAgICIgLiAkXyAu ICJcbiIgfSBAeyAkdGVzdHNUb1J1bnskc3VpdGV9IH07CisgICAgfQorICAgIHByaW50ICItLS0t LS0tLS0tLS0tLS0tLS1cbiI7Cit9CisKK3N1YiBydW5BbGxUZXN0cygpCit7CisgICAgbXkgJGFu eUZhaWx1cmVzID0gMDsKKyAgICBmb3IgbXkgJHN1aXRlIChrZXlzICV0ZXN0c1RvUnVuKSB7Cisg ICAgICAgIG15ICRmYWlsZWQgPSBydW5BbGxUZXN0c0luU3VpdGUoJHN1aXRlKTsKKyAgICAgICAg aWYgKCRmYWlsZWQpIHsKKyAgICAgICAgICAgICRhbnlGYWlsdXJlcyA9IDE7CisgICAgICAgIH0K KyAgICB9CisgICAgcmV0dXJuICRhbnlGYWlsdXJlczsKIH0KIAotcnVuVGVzdFRvb2woKTsKK3N1 YiBydW5BbGxUZXN0c0luU3VpdGUoJCkKK3sKKyAgICBteSAoJHN1aXRlKSA9IEBfOworICAgIHBy aW50ICJTdWl0ZTogJHN1aXRlXG4iOworCisgICAgbXkgJGFueUZhaWx1cmVzID0gMDsKKyAgICBm b3IgbXkgJHRlc3QgKEB7JHRlc3RzVG9SdW57JHN1aXRlfX0pIHsKKyAgICAgICAgbXkgJGZhaWxl ZCA9IHJ1blRlc3QoJHN1aXRlLCAkdGVzdCk7CisgICAgICAgIGlmICgkZmFpbGVkKSB7CisgICAg ICAgICAgICAkYW55RmFpbHVyZXMgPSAxOworICAgICAgICB9CisgICAgfQorICAgCisgICAgcmV0 dXJuICRhbnlGYWlsdXJlczsKK30KIAotc3ViIHJ1blRlc3RUb29sKEApCitzdWIgcnVuVGVzdCgk JCkKIHsKLSAgICBteSAoQGFyZ3VtZW50cykgPSBAXzsKKyAgICBteSAoJHN1aXRlLCAkdGVzdE5h bWUpID0gQF87CisgICAgbXkgJHRlc3QgPSAkc3VpdGUgLiAiLiIgLiAkdGVzdE5hbWU7CisKKyAg ICBteSAkZ3Rlc3RBcmcgPSAiLS1ndGVzdF9maWx0ZXI9IiAuICR0ZXN0OworCisgICAgcHJpbnQg IiAgICBUZXN0OiAkdGVzdE5hbWUgLT4gIjsKIAogICAgIG15ICRyZXN1bHQgPSAwOworICAgIG15 ICR0aW1lZE91dCA9IDA7CiAgICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAgICAgICBt eSAkcHJvZHVjdERpciA9IHByb2R1Y3REaXIoKTsKICAgICAgICAgJEVOVntEWUxEX0ZSQU1FV09S S19QQVRIfSA9ICRwcm9kdWN0RGlyOwpAQCAtODgsOCArMTQ2LDg1IEBAIHN1YiBydW5UZXN0VG9v bChAKQogCiAgICAgICAgIGxvY2FsICpERVZOVUxMOwogICAgICAgICBteSAoJGNoaWxkSW4sICRj aGlsZE91dCwgJGNoaWxkRXJyKTsKKyAgICAgICAgdW5sZXNzICgkdmVyYm9zZSkgeworICAgICAg ICAgICAgb3BlbihERVZOVUxMLCAiPiIsIEZpbGU6OlNwZWMtPmRldm51bGwoKSkgb3IgZGllICJG YWlsZWQgdG8gb3BlbiAvZGV2L251bGwiOworICAgICAgICAgICAgJGNoaWxkT3V0ID0gIj4mREVW TlVMTCI7CisgICAgICAgICAgICAkY2hpbGRFcnIgPSAiPiZERVZOVUxMIjsKKyAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgICRjaGlsZE91dCA9ICI+JlNURE9VVCI7CisgICAgICAgICAgICAk Y2hpbGRFcnIgPSAiPiZTVERFUlIiOworICAgICAgICB9CiAKLSAgICAgICAgJGNoaWxkT3V0ID0g Ij4mU1RET1VUIjsKKyAgICAgICAgbXkgJHBpZDsKKyAgICAgICAgaWYgKGFyY2hpdGVjdHVyZSgp KSB7CisgICAgICAgICAgICAkcGlkID0gb3BlbjMoJGNoaWxkSW4sICRjaGlsZE91dCwgJGNoaWxk RXJyLCAiYXJjaCIsICItIiAuIGFyY2hpdGVjdHVyZSgpLCAkYXBpVGVzdGVyUGF0aCwgJGd0ZXN0 QXJnLCBAQVJHVikgb3IgZGllICJGYWlsZWQgdG8gcnVuIHRlc3Q6ICR0ZXN0LiI7CisgICAgICAg IH0gZWxzZSB7CisgICAgICAgICAgICAkcGlkID0gb3BlbjMoJGNoaWxkSW4sICRjaGlsZE91dCwg JGNoaWxkRXJyLCAkYXBpVGVzdGVyUGF0aCwgJGd0ZXN0QXJnLCBAQVJHVikgb3IgZGllICJGYWls ZWQgdG8gcnVuIHRlc3Q6ICR0ZXN0LiI7CisgICAgICAgIH0KKworICAgICAgICBjbG9zZSgkY2hp bGRJbik7CisgICAgICAgIGNsb3NlKCRjaGlsZE91dCk7CisgICAgICAgIGNsb3NlKCRjaGlsZEVy cik7CisgICAgICAgIGNsb3NlKERFVk5VTEwpIHVubGVzcyAoJHZlcmJvc2UpOworCisgICAgICAg IGV2YWwgeworICAgICAgICAgICAgbG9jYWwgJFNJR3tBTFJNfSA9IHN1YiB7IGRpZSAiYWxhcm1c biIgfTsKKyAgICAgICAgICAgIGFsYXJtICR0aW1lb3V0OworICAgICAgICAgICAgd2FpdHBpZCgk cGlkLCAwKTsKKyAgICAgICAgICAgIGFsYXJtIDA7CisgICAgICAgICAgICAkcmVzdWx0ID0gJD87 CisgICAgICAgIH07CisgICAgICAgIGlmICgkQCkgeworICAgICAgICAgICAgZGllIHVubGVzcyAk QCBlcSAiYWxhcm1cbiI7CisgICAgICAgICAgICBraWxsIFNJR1RFUk0sICRwaWQgb3Iga2lsbCBT SUdLSUxMLCAkcGlkOworICAgICAgICAgICAgJHRpbWVkT3V0ID0gMTsKKyAgICAgICAgfTsKKyAg ICB9IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKKyAgICAgICAgbXkgJGFwaVRlc3Rlck5h bWVTdWZmaXg7CisgICAgICAgIGlmIChjb25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGlvKCkgbmUg IkRlYnVnX0FsbCIpIHsKKyAgICAgICAgICAgICRhcGlUZXN0ZXJOYW1lU3VmZml4ID0gIiI7Cisg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAkYXBpVGVzdGVyTmFtZVN1ZmZpeCA9ICJfZGVi dWciOworICAgICAgICB9CisgICAgICAgIG15ICRhcGlUZXN0ZXJQYXRoID0gRmlsZTo6U3BlYy0+ Y2F0ZmlsZShwcm9kdWN0RGlyKCksICJUZXN0V2ViS2l0QVBJJGFwaVRlc3Rlck5hbWVTdWZmaXgu ZXhlIik7CisgICAgICAgIGV2YWwgeworICAgICAgICAgICAgbG9jYWwgJFNJR3tBTFJNfSA9IHN1 YiB7IGRpZSAiYWxhcm1cbiIgfTsKKyAgICAgICAgICAgIGFsYXJtICR0aW1lb3V0OworICAgICAg ICAgICAgJHJlc3VsdCA9IHN5c3RlbSB7ICRhcGlUZXN0ZXJQYXRoIH0gJGFwaVRlc3RlclBhdGgs ICRndGVzdEFyZywgQEFSR1Y7CisgICAgICAgICAgICBhbGFybSAwOworICAgICAgICB9OworICAg ICAgICBpZiAoJEApIHsKKyAgICAgICAgICAgIGRpZSB1bmxlc3MgJEAgZXEgImFsYXJtXG4iOwor ICAgICAgICAgICAgJHRpbWVkT3V0ID0gMTsKKyAgICAgICAgfTsKKworICAgIH0gZWxzZSB7Cisg ICAgICAgIGRpZSAicnVuLWFwaS10ZXN0cyBpcyBub3Qgc3VwcG9ydGVkIG9uIHRoaXMgcGxhdGZv cm0uXG4iCisgICAgfQorICAgCisgICAgaWYgKCR0aW1lZE91dCkgeworICAgICAgICBwcmludCBC T0xEIFlFTExPVywgIlRpbWVvdXQiLCBSRVNFVCwgIlxuIjsKKyAgICB9IGVsc2lmICgkcmVzdWx0 ID09IDApIHsKKyAgICAgICAgcHJpbnQgQk9MRCBHUkVFTiwgIlBhc3NlZCIsIFJFU0VULCAiXG4i OworICAgIH0gZWxzZSB7CisgICAgICAgIHByaW50IEJPTEQgUkVELCAiRmFpbGVkIiwgUkVTRVQs ICJcbiI7CisgICAgfQorICAgIHJldHVybiAkdGltZWRPdXQgfHwgJHJlc3VsdDsKK30KKworc3Vi IHBvcHVsYXRlVGVzdHMoKQoreworICAgIG15IEB0ZXN0czsKKyAgICBteSAkdGltZWRPdXQ7CisK KyAgICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7CisgICAgICAgIG15ICRwcm9kdWN0RGlyID0g cHJvZHVjdERpcigpOworICAgICAgICAkRU5We0RZTERfRlJBTUVXT1JLX1BBVEh9ID0gJHByb2R1 Y3REaXI7CisgICAgICAgICRFTlZ7V0VCS0lUX1VOU0VUX0RZTERfRlJBTUVXT1JLX1BBVEh9ID0g IllFUyI7CisgICAgICAgIG15ICRhcGlUZXN0ZXJQYXRoID0gIiRwcm9kdWN0RGlyL1Rlc3RXZWJL aXRBUEkiOworCisgICAgICAgIGxvY2FsICpERVZOVUxMOworICAgICAgICBteSAoJGNoaWxkSW4s ICRjaGlsZE91dCwgJGNoaWxkRXJyKTsKICAgICAgICAgdW5sZXNzICgkdmVyYm9zZSkgewogICAg ICAgICAgICAgb3BlbihERVZOVUxMLCAiPiIsIEZpbGU6OlNwZWMtPmRldm51bGwoKSkgb3IgZGll ICJGYWlsZWQgdG8gb3BlbiAvZGV2L251bGwiOwogICAgICAgICAgICAgJGNoaWxkRXJyID0gIj4m REVWTlVMTCI7CkBAIC05OSwxOCArMjM0LDI0IEBAIHN1YiBydW5UZXN0VG9vbChAKQogCiAgICAg ICAgIG15ICRwaWQ7CiAgICAgICAgIGlmIChhcmNoaXRlY3R1cmUoKSkgewotICAgICAgICAgICAg JHBpZCA9IG9wZW4zKCRjaGlsZEluLCAkY2hpbGRPdXQsICRjaGlsZEVyciwgImFyY2giLCAiLSIg LiBhcmNoaXRlY3R1cmUoKSwgJGFwaVRlc3RlclBhdGgsIEBhcmd1bWVudHMsIEBBUkdWKSBvciBk aWUgIkZhaWxlZCB0byBydW4gdGVzdCB0b29sLiI7CisgICAgICAgICAgICAkcGlkID0gb3BlbjMo JGNoaWxkSW4sICRjaGlsZE91dCwgJGNoaWxkRXJyLCAiYXJjaCIsICItIiAuIGFyY2hpdGVjdHVy ZSgpLCAkYXBpVGVzdGVyUGF0aCwgIi0tZ3Rlc3RfbGlzdF90ZXN0cyIpIG9yIGRpZSAiRmFpbGVk IHRvIGJ1aWxkIGxpc3Qgb2YgdGVzdHMhIjsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAg ICRwaWQgPSBvcGVuMygkY2hpbGRJbiwgJGNoaWxkT3V0LCAkY2hpbGRFcnIsICRhcGlUZXN0ZXJQ YXRoLCBAYXJndW1lbnRzLCBAQVJHVikgb3IgZGllICJGYWlsZWQgdG8gcnVuIHRlc3QgdG9vbC4i OworICAgICAgICAgICAgJHBpZCA9IG9wZW4zKCRjaGlsZEluLCAkY2hpbGRPdXQsICRjaGlsZEVy ciwgJGFwaVRlc3RlclBhdGgsICItLWd0ZXN0X2xpc3RfdGVzdHMiKSBvciBkaWUgIkZhaWxlZCB0 byBidWlsZCBsaXN0IG9mIHRlc3RzISI7CiAgICAgICAgIH0KIAogICAgICAgICBjbG9zZSgkY2hp bGRJbik7CisgICAgICAgIEB0ZXN0cyA9IDwkY2hpbGRPdXQ+OwogICAgICAgICBjbG9zZSgkY2hp bGRPdXQpOwogICAgICAgICBjbG9zZSgkY2hpbGRFcnIpOwotICAgICAgICBjbG9zZShERVZOVUxM KTsKKyAgICAgICAgY2xvc2UoREVWTlVMTCkgdW5sZXNzICgkdmVyYm9zZSk7CiAKICAgICAgICAg d2FpdHBpZCgkcGlkLCAwKTsKLSAgICAgICAgJHJlc3VsdCA9ICQ/OworICAgICAgICBteSAkcmVz dWx0ID0gJD87CisKKyAgICAgICAgaWYgKCRyZXN1bHQpIHsKKyAgICAgICAgICAgIHByaW50IFNU REVSUiAiRmFpbGVkIHRvIGJ1aWxkIGxpc3Qgb2YgdGVzdHMhXG4iOworICAgICAgICAgICAgZXhp dCBleGl0U3RhdHVzKCRyZXN1bHQpOworICAgICAgICB9CiAgICAgfSBlbHNpZiAoaXNBcHBsZVdp bldlYktpdCgpKSB7CiAgICAgICAgIG15ICRhcGlUZXN0ZXJOYW1lU3VmZml4OwogICAgICAgICBp ZiAoY29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbygpIG5lICJEZWJ1Z19BbGwiKSB7CkBAIC0x MTksMTQgKzI2MCwzMCBAQCBzdWIgcnVuVGVzdFRvb2woQCkKICAgICAgICAgICAgICRhcGlUZXN0 ZXJOYW1lU3VmZml4ID0gIl9kZWJ1ZyI7CiAgICAgICAgIH0KICAgICAgICAgbXkgJGFwaVRlc3Rl clBhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxlKHByb2R1Y3REaXIoKSwgIlRlc3RXZWJLaXRBUEkk YXBpVGVzdGVyTmFtZVN1ZmZpeC5leGUiKTsKLSAgICAgICAgJHJlc3VsdCA9IHN5c3RlbSB7ICRh cGlUZXN0ZXJQYXRoIH0gJGFwaVRlc3RlclBhdGgsIEBBUkdWOworICAgICAgICBvcGVuKFRFU1RT LCAiLXwiLCAkYXBpVGVzdGVyUGF0aCwgIi0tZHVtcC10ZXN0cyIpIG9yIGRpZSAkITsKKyAgICAg ICAgQHRlc3RzID0gPFRFU1RTPjsKKyAgICAgICAgY2xvc2UoVEVTVFMpIG9yIGRpZSAkITsKICAg ICB9IGVsc2UgewogICAgICAgICBkaWUgInJ1bi1hcGktdGVzdHMgaXMgbm90IHN1cHBvcnRlZCBv biB0aGlzIHBsYXRmb3JtLlxuIgogICAgIH0KLSAgICAKLSAgICByZXR1cm4gJHJlc3VsdDsKKwor ICAgIG15ICVrZXllZFRlc3RzID0gKCk7CisgICAgbXkgJHN1aXRlOworICAgIGZvciBteSAkdGVz dCAoQHRlc3RzKSB7CisgICAgICAgJHRlc3QgPX4gcy9bXHJcbl0qJC8vOworICAgICAgIGlmICgk dGVzdCA9fiBtL1wuJC8pIHsKKyAgICAgICAgICAkdGVzdCA9fiBzL1wuJC8vOworICAgICAgICAg ICRzdWl0ZSA9ICR0ZXN0OworICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgJHRlc3QgPX4gcy9e XHMqLy87CisgICAgICAgICAgcHVzaCBAeyRrZXllZFRlc3RzeyRzdWl0ZX19LCAkdGVzdDsKKyAg ICAgICAgfQorICAgIH0KKyAKKyAgICByZXR1cm4gJWtleWVkVGVzdHM7CiB9CiAKKwogc3ViIGJ1 aWxkVGVzdFRvb2woKQogewogICAgIG15ICRvcmlnaW5hbEN3ZCA9IGdldGN3ZCgpOwpAQCAtMTYz LDYgKzMyMCw2IEBAIHN1YiBidWlsZFRlc3RUb29sKCkKICAgICAgICAgcHJpbnQgU1RERVJSICJD b21waWxpbmcgVGVzdFdlYktpdEFQSSBmYWlsZWQhXG4iOwogICAgICAgICBleGl0IGV4aXRTdGF0 dXMoJGJ1aWxkUmVzdWx0KTsKICAgICB9Ci0KKyAgICAKICAgICBjaGRpciAkb3JpZ2luYWxDd2Q7 CiB9Cg== 94152 2011-05-19 17:39:58 -0700 2011-05-19 21:10:59 -0700 New, smaller patch 48043.patch text/plain 2826 dslomov ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzM2Y4 MDllLi5iNTU0ODFkYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTA1LTE4ICBEbWl0cnkgTG9tb3YgIDxkc2xv bW92QGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRGV0ZWN0IGhhbmdzIGluIHJ1bi1hcGktdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MDQzCisKKyAgICAgICAgKiBTY3JpcHRz L3J1bi1hcGktdGVzdHM6IEFkZGVkIHRlc3QgdGltZW91dHMKKwogMjAxMS0wNS0xOSAgRG1pdHJ5 IExvbW92ICA8ZHNsb21vdkBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0g Um9iZW4uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3J1bi1hcGktdGVzdHMgYi9Ub29scy9T Y3JpcHRzL3J1bi1hcGktdGVzdHMKaW5kZXggMzVlM2VhZS4uNmM0OGFjMiAxMDA3NTUKLS0tIGEv VG9vbHMvU2NyaXB0cy9ydW4tYXBpLXRlc3RzCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWFwaS10 ZXN0cwpAQCAtNDUsNiArNDUsOSBAQCBzdWIgcnVuQWxsVGVzdHMoKTsKIHN1YiBydW5BbGxUZXN0 c0luU3VpdGUoJCk7CiBzdWIgcnVuVGVzdCgkJCk7CiAKKyMgVGltZW91dCBmb3IgaW5kaXZpZHVh bCB0ZXN0LCBpbiBzZWMKK215ICR0aW1lb3V0ID0gMTA7CisKIG15ICRzaG93SGVscCA9IDA7CiBt eSAkdmVyYm9zZSA9IDA7CiBteSAkZHVtcCA9IDA7CkBAIC0xMzEsNiArMTM0LDcgQEAgc3ViIHJ1 blRlc3QoJCQpCiAgICAgcHJpbnQgIiAgICBUZXN0OiAkdGVzdE5hbWUgLT4gIjsKIAogICAgIG15 ICRyZXN1bHQgPSAwOworICAgIG15ICR0aW1lZE91dCA9IDA7CiAgICAgaWYgKGlzQXBwbGVNYWNX ZWJLaXQoKSkgewogICAgICAgICBteSAkcHJvZHVjdERpciA9IHByb2R1Y3REaXIoKTsKICAgICAg ICAgJEVOVntEWUxEX0ZSQU1FV09SS19QQVRIfSA9ICRwcm9kdWN0RGlyOwpAQCAtMTU5LDEwICsx NjMsMjAgQEAgc3ViIHJ1blRlc3QoJCQpCiAgICAgICAgIGNsb3NlKCRjaGlsZE91dCk7CiAgICAg ICAgIGNsb3NlKCRjaGlsZEVycik7CiAgICAgICAgIGNsb3NlKERFVk5VTEwpIHVubGVzcyAoJHZl cmJvc2UpOwotCi0gICAgICAgIHdhaXRwaWQoJHBpZCwgMCk7Ci0gICAgICAgICRyZXN1bHQgPSAk PzsKLSAgICB9IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKKyAgICAgICAgZXZhbCB7Cisg ICAgICAgICAgICBsb2NhbCAkU0lHe0FMUk19ID0gc3ViIHsgZGllICJhbGFybVxuIiB9OworICAg ICAgICAgICAgYWxhcm0gJHRpbWVvdXQ7CisgICAgICAgICAgICB3YWl0cGlkKCRwaWQsIDApOwor ICAgICAgICAgICAgYWxhcm0gMDsKKyAgICAgICAgICAgICRyZXN1bHQgPSAkPzsKKyAgICAgICAg fTsKKyAgICAgICAgaWYgKCRAKSB7CisgICAgICAgICAgICBkaWUgdW5sZXNzICRAIGVxICJhbGFy bVxuIjsKKyAgICAgICAgICAgIGtpbGwgU0lHVEVSTSwgJHBpZCBvciBraWxsIFNJR0tJTEwsICRw aWQ7CisgICAgICAgICAgICAkdGltZWRPdXQgPSAxOworICAgICAgICB9OworCisgICAgIH0gZWxz aWYgKGlzQXBwbGVXaW5XZWJLaXQoKSkgewogICAgICAgICBteSAkYXBpVGVzdGVyTmFtZVN1ZmZp eDsKICAgICAgICAgaWYgKGNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKSBuZSAiRGVidWdf QWxsIikgewogICAgICAgICAgICAgJGFwaVRlc3Rlck5hbWVTdWZmaXggPSAiIjsKQEAgLTE3MCwx NyArMTg0LDI4IEBAIHN1YiBydW5UZXN0KCQkKQogICAgICAgICAgICAgJGFwaVRlc3Rlck5hbWVT dWZmaXggPSAiX2RlYnVnIjsKICAgICAgICAgfQogICAgICAgICBteSAkYXBpVGVzdGVyUGF0aCA9 IEZpbGU6OlNwZWMtPmNhdGZpbGUocHJvZHVjdERpcigpLCAiVGVzdFdlYktpdEFQSSRhcGlUZXN0 ZXJOYW1lU3VmZml4LmV4ZSIpOwotICAgICAgICAkcmVzdWx0ID0gc3lzdGVtIHsgJGFwaVRlc3Rl clBhdGggfSAkYXBpVGVzdGVyUGF0aCwgJGd0ZXN0QXJnLCBAQVJHVjsKKyAgICAgICAgZXZhbCB7 CisgICAgICAgICAgICBsb2NhbCAkU0lHe0FMUk19ID0gc3ViIHsgZGllICJhbGFybVxuIiB9Owor ICAgICAgICAgICAgYWxhcm0gJHRpbWVvdXQ7CisgICAgICAgICAgICAkcmVzdWx0ID0gc3lzdGVt IHsgJGFwaVRlc3RlclBhdGggfSAkYXBpVGVzdGVyUGF0aCwgJGd0ZXN0QXJnLCBAQVJHVjsKKyAg ICAgICAgICAgIGFsYXJtIDA7CisgICAgICAgIH07CisgICAgICAgIGlmICgkQCkgeworICAgICAg ICAgICAgZGllIHVubGVzcyAkQCBlcSAiYWxhcm1cbiI7CisgICAgICAgICAgICAkdGltZWRPdXQg PSAxOworICAgICAgICB9OwogICAgIH0gZWxzZSB7CiAgICAgICAgIGRpZSAicnVuLWFwaS10ZXN0 cyBpcyBub3Qgc3VwcG9ydGVkIG9uIHRoaXMgcGxhdGZvcm0uXG4iCiAgICAgfQotICAgCi0gICAg aWYgKCEkcmVzdWx0KSB7CisKKyAgICBpZiAoJHRpbWVkT3V0KSB7CisgICAgICAgIHByaW50IEJP TEQgWUVMTE9XLCAiVGltZW91dCIsIFJFU0VULCAiXG4iOworICAgIH0gZWxzaWYgKCEkcmVzdWx0 KSB7CiAgICAgICAgIHByaW50IEJPTEQgR1JFRU4sICJQYXNzZWQiLCBSRVNFVCwgIlxuIjsKICAg ICB9IGVsc2UgewogICAgICAgICBwcmludCBCT0xEIFJFRCwgIkZhaWxlZCIsIFJFU0VULCAiXG4i OwogICAgIH0KLSAgICByZXR1cm4gJHJlc3VsdDsKKyAgICByZXR1cm4gJHRpbWVkT3V0IHx8ICRy ZXN1bHQ7CiB9CiAKIHN1YiBwb3B1bGF0ZVRlc3RzKCkK