58929 2011-04-19 15:01:56 -0700 don't show failures table if there are only new tests 2011-04-19 16:38:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan eric tony oldest_to_newest 388824 0 ojan 2011-04-19 15:01:56 -0700 don't show failures table if there are only new tests 388825 1 90261 ojan 2011-04-19 15:02:41 -0700 Created attachment 90261 Patch 388826 2 ojan 2011-04-19 15:03:24 -0700 Sorry for the large diff. It's almost entirely just moving code around. 388844 3 90261 eric 2011-04-19 15:29:43 -0700 Comment on attachment 90261 Patch OK. Seems all your globals probably want to be instance members on some class instead (with one global instance of the class). 388855 4 ojan 2011-04-19 15:36:40 -0700 (In reply to comment #3) > (From update of attachment 90261 [details]) > OK. Seems all your globals probably want to be instance members on some class instead (with one global instance of the class). Totally. I'll do that in a separate patch. 388908 5 ojan 2011-04-19 16:38:55 -0700 Committed r84312: <http://trac.webkit.org/changeset/84312> 90261 2011-04-19 15:02:41 -0700 2011-04-19 15:29:43 -0700 Patch bug-58929-20110419150239.patch text/plain 11725 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogODQyOTYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwNjhhMDk1MDYzOWEyYTIzN2M5NzZjNGEwMjY0MjA4Yjdk MTc3MjUyLi44YzE1MjhhZGI3ZDA2NTNmNjQ4NTUxOThlMTBlMGZiMGY4Zjk5ZWI3IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTEtMDQtMTkgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBkb24ndCBzaG93IGZhaWx1 cmVzIHRhYmxlIGlmIHRoZXJlIGFyZSBvbmx5IG5ldyB0ZXN0cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTg5MjkKKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0cy5odG1sOgor CiAyMDExLTA0LTE4ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHMuaHRtbCBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0 cy5odG1sCmluZGV4IGFkMmIwYzY5MTRlOWRhZTVhZmMxM2ZiZjk4ZGUzMzBmNTgyMjMzYzEuLmQx YjE3ZTE0NzU1ODhiNzlmODBjMGU0NjljMmQ2MjljY2QwNDA4ZGEgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0 cy5odG1sCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9w YWNrYWdlL2pzb25fcmVzdWx0cy5odG1sCkBAIC0xMDgsMTAgKzEwOCwxMCBAQCBsYWJlbCB7CiA8 L3N0eWxlPgogCiA8c2NyaXB0PgotdmFyIHJlc3VsdHM7Cit2YXIgZ19yZXN1bHRzOwogZnVuY3Rp b24gQUREX1JFU1VMVFMoaW5wdXQpCiB7Ci0gICAgcmVzdWx0cyA9IGlucHV0OworICAgIGdfcmVz dWx0cyA9IGlucHV0OwogfQogPC9zY3JpcHQ+CiAKQEAgLTEyNCwyMiArMTI0LDYgQEAgZnVuY3Rp b24gc3RyaXBFeHRlbnNpb24odGVzdCkKICAgICByZXR1cm4gdGVzdC5zdWJzdHJpbmcoMCwgaW5k ZXgpOwogfQogCi12YXIgaHRtbCA9ICc8cD5UZXN0cyB3aGVyZSByZXN1bHRzIGRpZCBub3QgbWF0 Y2ggZXhwZWN0ZWQgcmVzdWx0czo8L3A+JzsKLQotaWYgKHJlc3VsdHMudXNlc19leHBlY3RhdGlv bnNfZmlsZSkKLSAgICBodG1sICs9ICc8ZGl2IGlkPW9wdGlvbnM+PGxhYmVsPjxpbnB1dCBjbGFz cz0idW5leHBlY3RlZC1yZXN1bHRzIiB0eXBlPWNoZWNrYm94IGNoZWNrZWQ+T25seSBzaG93IHVu ZXhwZWN0ZWQgcmVzdWx0czwvbGFiZWw+PC9kaXY+JzsKLQotaHRtbCArPSAnPHRhYmxlIGlkPSJy ZXN1bHRzLXRhYmxlIj48dGhlYWQ+PHRyPicgKwotICAgICAgICAnPHRoPnRlc3Q8L3RoPicgKwot ICAgICAgICAnPHRoIGlkPSJ0ZXh0LXJlc3VsdHMtaGVhZGVyIj50ZXh0IHJlc3VsdHM8L3RoPicg KwotICAgICAgICAnPHRoIGlkPSJpbWFnZS1yZXN1bHRzLWhlYWRlciI+aW1hZ2UgcmVzdWx0czwv dGg+JyArCi0gICAgICAgICc8dGg+ZmFpbHVyZSB0eXBlPC90aD4nOwotICAgICAgICAKLWlmIChy ZXN1bHRzLnVzZXNfZXhwZWN0YXRpb25zX2ZpbGUpCi0gICAgaHRtbCArPSAnPHRoPmV4cGVjdGVk IGZhaWx1cmUgdHlwZTwvdGg+JzsKLQotaHRtbCArPSAnPC90cj48L3RoZWFkPic7Ci0KIGZ1bmN0 aW9uIHBhcmVudE9mVHlwZShub2RlLCBzZWxlY3RvcikKIHsKICAgICB3aGlsZSAobm9kZSA9IG5v ZGUucGFyZW50RWxlbWVudCkgewpAQCAtMjE1LDggKzE5OSw4IEBAIGZ1bmN0aW9uIGV4cGFuZEV4 cGVjdGF0aW9ucyhlKQogZnVuY3Rpb24gdGVzdExpbmsodGVzdCkKIHsKICAgICB2YXIgYmFzZVBh dGg7Ci0gICAgaWYgKHJlc3VsdHMubGF5b3V0X3Rlc3RzX2RpciAmJiBsb2NhdGlvbi50b1N0cmlu ZygpLmluZGV4T2YoJ2ZpbGU6Ly8nKSA9PSAwKQotICAgICAgICBiYXNlUGF0aCA9IHJlc3VsdHMu bGF5b3V0X3Rlc3RzX2RpciArICcvJzsKKyAgICBpZiAoZ19yZXN1bHRzLmxheW91dF90ZXN0c19k aXIgJiYgbG9jYXRpb24udG9TdHJpbmcoKS5pbmRleE9mKCdmaWxlOi8vJykgPT0gMCkKKyAgICAg ICAgYmFzZVBhdGggPSBnX3Jlc3VsdHMubGF5b3V0X3Rlc3RzX2RpciArICcvJzsKICAgICBlbHNl CiAgICAgICAgIGJhc2VQYXRoID0gJ2h0dHA6Ly90cmFjLndlYmtpdC5vcmcvYnJvd3Nlci90cnVu ay9MYXlvdXRUZXN0cy8nOwogICAgIHJldHVybiAnPHNwYW4gY2xhc3M9ZXhwYW5kLWJ1dHRvbiBv bmNsaWNrPSJleHBhbmRFeHBlY3RhdGlvbnMoZXZlbnQpIj48c3BhbiBjbGFzcz1leHBhbmQtYnV0 dG9uLXRleHQ+Kzwvc3Bhbj48L3NwYW4+JyArCkBAIC0yMjgsODMgKzIxMiwxMDYgQEAgZnVuY3Rp b24gcmVzdWx0TGluayh0ZXN0UHJlZml4LCBzdWZmaXgsIGNvbnRlbnRzKQogICAgIHJldHVybiAn PGEgY2xhc3M9cmVzdWx0LWxpbmsgaHJlZj0iJyArIHRlc3RQcmVmaXggKyBzdWZmaXggKyAnIj4n ICsgY29udGVudHMgKyAnPC9hPiAnOwogfQogCi12YXIgaGFzVGV4dEZhaWx1cmVzID0gZmFsc2U7 Ci12YXIgaGFzSW1hZ2VGYWlsdXJlcyA9IGZhbHNlOwotCi12YXIgdGVzdHNXaXRoU3RkZXJyID0g W107Ci12YXIgbmV3VGVzdHMgPSBbXTsKLXZhciBoYXNIdHRwVGVzdHMgPSBmYWxzZTsKLQotZm9y ICh2YXIgdGVzdCBpbiByZXN1bHRzLnRlc3RzKSB7Ci0gIGlmIChyZXN1bHRzLnRlc3RzW3Rlc3Rd Lmhhc19zdGRlcnIpCi0gICAgICB0ZXN0c1dpdGhTdGRlcnIucHVzaCh0ZXN0KTsKLQotICBoYXNI dHRwVGVzdHMgPSBoYXNIdHRwVGVzdHMgfHwgdGVzdC5pbmRleE9mKCdodHRwLycpID09IDA7Ci0K LSAgdmFyIGFjdHVhbCA9IHJlc3VsdHMudGVzdHNbdGVzdF0uYWN0dWFsOwotICBpZiAoYWN0dWFs ID09ICdNSVNTSU5HJykgewotICAgICAgLy8gRklYTUU6IG1ha2Ugc3VyZSB0aGF0IG5ldy1ydW4t d2Via2l0LXRlc3RzIHNwaXRzIG91dCBhbiAtYWN0dWFsLnR4dCBmaWxlIGZvcgotICAgICAgLy8g dGVzdHMgd2l0aCBNSVNTSU5HIHJlc3VsdHMuCi0gICAgICBuZXdUZXN0cy5wdXNoKHRlc3QpOwot ICAgICAgY29udGludWU7Ci0gIH0KLSAgCi0gIHZhciBleHBlY3RlZCA9IHJlc3VsdHMudGVzdHNb dGVzdF0uZXhwZWN0ZWQgfHwgJ1BBU1MnOwotICBpZiAoYWN0dWFsID09ICdQQVNTJyAmJiAoIXJl c3VsdHMudXNlc19leHBlY3RhdGlvbnNfZmlsZSB8fCBleHBlY3RlZCA9PSAnUEFTUycpKQotICAg IGNvbnRpbnVlOwotCi0gIHZhciByb3cgPSAnPHRkPicgKyB0ZXN0TGluayh0ZXN0KSArICc8L3Rk Pic7Ci0gIHZhciB0ZXN0X3ByZWZpeCA9IHN0cmlwRXh0ZW5zaW9uKHRlc3QpOwotCi0gIHJvdyAr PSAnPHRkPic7Ci0gIGlmIChhY3R1YWwgPT0gJ0NSQVNIJykKLSAgICAgIHJvdyArPSByZXN1bHRM aW5rKHRlc3RfcHJlZml4LCAnLXN0YWNrLnR4dCcsICdzdGFjaycpOwotICBlbHNlIGlmIChhY3R1 YWwgPT0gJ0FVRElPJykgewotICAgICAgcm93ICs9IHJlc3VsdExpbmsodGVzdF9wcmVmaXgsICct ZXhwZWN0ZWQud2F2JywgJ2V4cGVjdGVkJyk7Ci0gICAgICByb3cgKz0gcmVzdWx0TGluayh0ZXN0 X3ByZWZpeCwgJy1hY3R1YWwud2F2JywgJ2FjdHVhbCcpOwotICB9IGVsc2UgaWYgKGFjdHVhbC5p bmRleE9mKCdURVhUJykgIT0gLTEgfHwgYWN0dWFsID09ICdUSU1FT1VUJykgewotICAgICAgLy8g RklYTUU6IG9ubHkgaW5jbHVkZSB0aW1lb3V0IGFjdHVhbC9leHBlY3RlZCByZXN1bHRzIGhlcmUg aWYgd2UgYWN0dWFsbHkgc3BpdCBvdXQgcmVzdWx0cyBmb3IgdGltZW91dCB0ZXN0cy4KLSAgICAg IGhhc1RleHRGYWlsdXJlcyA9IHRydWU7Ci0gICAgICByb3cgKz0gcmVzdWx0TGluayh0ZXN0X3By ZWZpeCwgJy1leHBlY3RlZC50eHQnLCAnZXhwZWN0ZWQnKSArCi0gICAgICAgICAgcmVzdWx0TGlu ayh0ZXN0X3ByZWZpeCwgJy1hY3R1YWwudHh0JywgJ2FjdHVhbCcpICsKLSAgICAgICAgICByZXN1 bHRMaW5rKHRlc3RfcHJlZml4LCAnLWRpZmYudHh0JywgJ2RpZmYnKTsKLSAgICAgICAgCi0gICAg ICBpZiAocmVzdWx0cy5oYXNfcHJldHR5X3BhdGNoKQotICAgICAgICAgIHJvdyArPSByZXN1bHRM aW5rKHRlc3RfcHJlZml4LCAnLXByZXR0eS1kaWZmLmh0bWwnLCAncHJldHR5IGRpZmYnKTsKK3Zh ciBnX2hhc1RleHRGYWlsdXJlcyA9IGZhbHNlOwordmFyIGdfaGFzSW1hZ2VGYWlsdXJlcyA9IGZh bHNlOwogCi0gICAgICBpZiAocmVzdWx0cy5oYXNfd2RpZmYpCi0gICAgICAgICAgcm93ICs9IHJl c3VsdExpbmsodGVzdF9wcmVmaXgsICctd2RpZmYuaHRtbCcsICd3ZGlmZicpOwotICB9Cit2YXIg Z190ZXN0c1dpdGhTdGRlcnIgPSBbXTsKK3ZhciBnX25ld1Rlc3RzID0gW107Cit2YXIgZ19oYXNI dHRwVGVzdHMgPSBmYWxzZTsKIAotICByb3cgKz0gJzwvdGQ+PHRkPic7CitmdW5jdGlvbiB0YWJs ZVJvd3MoKQoreworICAgIHZhciBodG1sID0gJyc7CisgICAgZm9yICh2YXIgdGVzdCBpbiBnX3Jl c3VsdHMudGVzdHMpIHsKKyAgICAgICAgaWYgKGdfcmVzdWx0cy50ZXN0c1t0ZXN0XS5oYXNfc3Rk ZXJyKQorICAgICAgICAgICAgZ190ZXN0c1dpdGhTdGRlcnIucHVzaCh0ZXN0KTsKKworICAgICAg ICBnX2hhc0h0dHBUZXN0cyA9IGdfaGFzSHR0cFRlc3RzIHx8IHRlc3QuaW5kZXhPZignaHR0cC8n KSA9PSAwOworCisgICAgICAgIHZhciBhY3R1YWwgPSBnX3Jlc3VsdHMudGVzdHNbdGVzdF0uYWN0 dWFsOworICAgICAgICBpZiAoYWN0dWFsID09ICdNSVNTSU5HJykgeworICAgICAgICAgICAgLy8g RklYTUU6IG1ha2Ugc3VyZSB0aGF0IG5ldy1ydW4td2Via2l0LXRlc3RzIHNwaXRzIG91dCBhbiAt YWN0dWFsLnR4dCBmaWxlIGZvcgorICAgICAgICAgICAgLy8gdGVzdHMgd2l0aCBNSVNTSU5HIHJl c3VsdHMuCisgICAgICAgICAgICBnX25ld1Rlc3RzLnB1c2godGVzdCk7CisgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgfQogCi0gIGlmIChhY3R1YWwuaW5kZXhPZignSU1BR0UnKSAhPSAt MSkgewotICAgICAgaGFzSW1hZ2VGYWlsdXJlcyA9IHRydWU7CisgICAgICAgIHZhciBleHBlY3Rl ZCA9IGdfcmVzdWx0cy50ZXN0c1t0ZXN0XS5leHBlY3RlZCB8fCAnUEFTUyc7CisgICAgICAgIGlm IChhY3R1YWwgPT0gJ1BBU1MnICYmICghZ19yZXN1bHRzLnVzZXNfZXhwZWN0YXRpb25zX2ZpbGUg fHwgZXhwZWN0ZWQgPT0gJ1BBU1MnKSkKKyAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICB2 YXIgcm93ID0gJzx0ZD4nICsgdGVzdExpbmsodGVzdCkgKyAnPC90ZD4nOworICAgICAgICB2YXIg dGVzdF9wcmVmaXggPSBzdHJpcEV4dGVuc2lvbih0ZXN0KTsKKworICAgICAgICByb3cgKz0gJzx0 ZD4nOworICAgICAgICBpZiAoYWN0dWFsID09ICdDUkFTSCcpCisgICAgICAgICAgICByb3cgKz0g cmVzdWx0TGluayh0ZXN0X3ByZWZpeCwgJy1zdGFjay50eHQnLCAnc3RhY2snKTsKKyAgICAgICAg ZWxzZSBpZiAoYWN0dWFsID09ICdBVURJTycpIHsKKyAgICAgICAgICAgIHJvdyArPSByZXN1bHRM aW5rKHRlc3RfcHJlZml4LCAnLWV4cGVjdGVkLndhdicsICdleHBlY3RlZCcpOworICAgICAgICAg ICAgcm93ICs9IHJlc3VsdExpbmsodGVzdF9wcmVmaXgsICctYWN0dWFsLndhdicsICdhY3R1YWwn KTsKKyAgICAgICAgfSBlbHNlIGlmIChhY3R1YWwuaW5kZXhPZignVEVYVCcpICE9IC0xIHx8IGFj dHVhbCA9PSAnVElNRU9VVCcpIHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBvbmx5IGluY2x1ZGUg dGltZW91dCBhY3R1YWwvZXhwZWN0ZWQgcmVzdWx0cyBoZXJlIGlmIHdlIGFjdHVhbGx5IHNwaXQg b3V0IHJlc3VsdHMgZm9yIHRpbWVvdXQgdGVzdHMuCisgICAgICAgICAgICBnX2hhc1RleHRGYWls dXJlcyA9IHRydWU7CisgICAgICAgICAgICByb3cgKz0gcmVzdWx0TGluayh0ZXN0X3ByZWZpeCwg Jy1leHBlY3RlZC50eHQnLCAnZXhwZWN0ZWQnKSArCisgICAgICAgICAgICAgICAgcmVzdWx0TGlu ayh0ZXN0X3ByZWZpeCwgJy1hY3R1YWwudHh0JywgJ2FjdHVhbCcpICsKKyAgICAgICAgICAgICAg ICByZXN1bHRMaW5rKHRlc3RfcHJlZml4LCAnLWRpZmYudHh0JywgJ2RpZmYnKTsKKyAgICAgIAor ICAgICAgICAgICAgaWYgKGdfcmVzdWx0cy5oYXNfcHJldHR5X3BhdGNoKQorICAgICAgICAgICAg ICAgIHJvdyArPSByZXN1bHRMaW5rKHRlc3RfcHJlZml4LCAnLXByZXR0eS1kaWZmLmh0bWwnLCAn cHJldHR5IGRpZmYnKTsKKworICAgICAgICAgICAgaWYgKGdfcmVzdWx0cy5oYXNfd2RpZmYpCisg ICAgICAgICAgICAgICAgcm93ICs9IHJlc3VsdExpbmsodGVzdF9wcmVmaXgsICctd2RpZmYuaHRt bCcsICd3ZGlmZicpOworICAgICAgICB9CiAKLSAgICAgIGlmIChyZXN1bHRzLnRlc3RzW3Rlc3Rd LmlzX21pc21hdGNoX3JlZnRlc3QpIHsKLSAgICAgICAgICByb3cgKz0gcmVzdWx0TGluayh0ZXN0 X3ByZWZpeCwgJy1leHBlY3RlZC1taXNtYXRjaC5odG1sJywgJ3JlZiBtaXNtYXRjaCBodG1sJykg KwotICAgICAgICAgICAgICByZXN1bHRMaW5rKHRlc3RfcHJlZml4LCAnLWFjdHVhbC5wbmcnLCAn YWN0dWFsJyk7Ci0gICAgICB9IGVsc2UgewotICAgICAgICAgIGlmIChyZXN1bHRzLnRlc3RzW3Rl c3RdLmlzX3JlZnRlc3QpCi0gICAgICAgICAgICAgIHJvdyArPSByZXN1bHRMaW5rKHRlc3RfcHJl Zml4LCAnLWV4cGVjdGVkLmh0bWwnLCAncmVmIGh0bWwnKTsKKyAgICAgICAgcm93ICs9ICc8L3Rk Pjx0ZD4nOwogCi0gICAgICAgICAgcm93ICs9IHJlc3VsdExpbmsodGVzdF9wcmVmaXgsICctZXhw ZWN0ZWQucG5nJywgJ2V4cGVjdGVkJykgKwotICAgICAgICAgICAgICByZXN1bHRMaW5rKHRlc3Rf cHJlZml4LCAnLWFjdHVhbC5wbmcnLCAnYWN0dWFsJykgKwotICAgICAgICAgICAgICByZXN1bHRM aW5rKHRlc3RfcHJlZml4LCAnLWRpZmYucG5nJywgJ2RpZmYnKTsKLSAgICAgIH0KLSAgfQorICAg ICAgICBpZiAoYWN0dWFsLmluZGV4T2YoJ0lNQUdFJykgIT0gLTEpIHsKKyAgICAgICAgICAgIGdf aGFzSW1hZ2VGYWlsdXJlcyA9IHRydWU7CiAKLSAgcm93ICs9ICc8L3RkPic7Ci0gIHJvdyArPSAn PHRkPicgKyBhY3R1YWwgKyAnPC90ZD4nOwotICAKLSAgaWYgKHJlc3VsdHMudXNlc19leHBlY3Rh dGlvbnNfZmlsZSkKLSAgICByb3cgKz0gJzx0ZD4nICsgZXhwZWN0ZWQgKyAnPC90ZD4nOworICAg ICAgICAgICAgaWYgKGdfcmVzdWx0cy50ZXN0c1t0ZXN0XS5pc19taXNtYXRjaF9yZWZ0ZXN0KSB7 CisgICAgICAgICAgICAgICAgcm93ICs9IHJlc3VsdExpbmsodGVzdF9wcmVmaXgsICctZXhwZWN0 ZWQtbWlzbWF0Y2guaHRtbCcsICdyZWYgbWlzbWF0Y2ggaHRtbCcpICsKKyAgICAgICAgICAgICAg ICAgICAgcmVzdWx0TGluayh0ZXN0X3ByZWZpeCwgJy1hY3R1YWwucG5nJywgJ2FjdHVhbCcpOwor ICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBpZiAoZ19yZXN1bHRzLnRlc3Rz W3Rlc3RdLmlzX3JlZnRlc3QpCisgICAgICAgICAgICAgICAgICAgIHJvdyArPSByZXN1bHRMaW5r KHRlc3RfcHJlZml4LCAnLWV4cGVjdGVkLmh0bWwnLCAncmVmIGh0bWwnKTsKIAotICB2YXIgaXNF eHBlY3RlZCA9IGFjdHVhbCA9PSAnU0tJUCcgfHwgKHJlc3VsdHMudXNlc19leHBlY3RhdGlvbnNf ZmlsZSAmJiBleHBlY3RlZCA9PSBhY3R1YWwpOwotICBodG1sICs9ICc8dGJvZHkgY2xhc3M9Iicg KyAoaXNFeHBlY3RlZCA/ICdleHBlY3RlZCcgOiAnJykgKyAnIj48dHI+JyArIHJvdyArICc8L3Ry PjwvdGJvZHk+JzsKKyAgICAgICAgICAgICAgICByb3cgKz0gcmVzdWx0TGluayh0ZXN0X3ByZWZp eCwgJy1leHBlY3RlZC5wbmcnLCAnZXhwZWN0ZWQnKSArCisgICAgICAgICAgICAgICAgICAgIHJl c3VsdExpbmsodGVzdF9wcmVmaXgsICctYWN0dWFsLnBuZycsICdhY3R1YWwnKSArCisgICAgICAg ICAgICAgICAgICAgIHJlc3VsdExpbmsodGVzdF9wcmVmaXgsICctZGlmZi5wbmcnLCAnZGlmZicp OworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgcm93ICs9ICc8L3RkPic7Cisg ICAgICAgIHJvdyArPSAnPHRkPicgKyBhY3R1YWwgKyAnPC90ZD4nOworCisgICAgICAgIGlmIChn X3Jlc3VsdHMudXNlc19leHBlY3RhdGlvbnNfZmlsZSkKKyAgICAgICAgICByb3cgKz0gJzx0ZD4n ICsgZXhwZWN0ZWQgKyAnPC90ZD4nOworCisgICAgICAgIHZhciBpc0V4cGVjdGVkID0gYWN0dWFs ID09ICdTS0lQJyB8fCAoZ19yZXN1bHRzLnVzZXNfZXhwZWN0YXRpb25zX2ZpbGUgJiYgZXhwZWN0 ZWQgPT0gYWN0dWFsKTsKKyAgICAgICAgaHRtbCArPSAnPHRib2R5IGNsYXNzPSInICsgKGlzRXhw ZWN0ZWQgPyAnZXhwZWN0ZWQnIDogJycpICsgJyI+PHRyPicgKyByb3cgKyAnPC90cj48L3Rib2R5 Pic7CisgICAgfQorICAgIHJldHVybiBodG1sOwogfQogCi1odG1sICs9ICc8L3RhYmxlPicKK3Zh ciBodG1sID0gJyc7CitpZiAoZ19yZXN1bHRzLnVzZXNfZXhwZWN0YXRpb25zX2ZpbGUpCisgICAg aHRtbCArPSAnPGRpdiBpZD1vcHRpb25zPjxsYWJlbD48aW5wdXQgY2xhc3M9InVuZXhwZWN0ZWQt cmVzdWx0cyIgdHlwZT1jaGVja2JveCBjaGVja2VkPk9ubHkgc2hvdyB1bmV4cGVjdGVkIHJlc3Vs dHM8L2xhYmVsPjwvZGl2Pic7CisKK3ZhciB0YWJsZVJvd3NIdG1sID0gdGFibGVSb3dzKCk7CisK K2lmICh0YWJsZVJvd3NIdG1sKSB7CisgICAgaHRtbCArPSAnPHA+VGVzdHMgd2hlcmUgcmVzdWx0 cyBkaWQgbm90IG1hdGNoIGV4cGVjdGVkIHJlc3VsdHM6PC9wPicgKworICAgICAgICAnPHRhYmxl IGlkPSJyZXN1bHRzLXRhYmxlIj48dGhlYWQ+PHRyPicgKworICAgICAgICAnPHRoPnRlc3Q8L3Ro PicgKworICAgICAgICAnPHRoIGlkPSJ0ZXh0LXJlc3VsdHMtaGVhZGVyIj50ZXh0IHJlc3VsdHM8 L3RoPicgKworICAgICAgICAnPHRoIGlkPSJpbWFnZS1yZXN1bHRzLWhlYWRlciI+aW1hZ2UgcmVz dWx0czwvdGg+JyArCisgICAgICAgICc8dGg+ZmFpbHVyZSB0eXBlPC90aD4nOworICAgICAgICAK KyAgICBpZiAoZ19yZXN1bHRzLnVzZXNfZXhwZWN0YXRpb25zX2ZpbGUpCisgICAgICAgIGh0bWwg Kz0gJzx0aD5leHBlY3RlZCBmYWlsdXJlIHR5cGU8L3RoPic7CisKKyAgICBodG1sICs9ICc8L3Ry PjwvdGhlYWQ+JyArIHRhYmxlUm93c0h0bWwgKyAnPC90YWJsZT4nOworfQogCiBmdW5jdGlvbiBh cHBlbmRUZXN0TGlzdCh0ZXN0cywgaGVhZGVyLCB0YWJsZUlkLCBmaWxlU3VmZml4LCBsaW5rTmFt ZSkKIHsKQEAgLTMxOCwxMSArMzI1LDExIEBAIGZ1bmN0aW9uIGFwcGVuZFRlc3RMaXN0KHRlc3Rz LCBoZWFkZXIsIHRhYmxlSWQsIGZpbGVTdWZmaXgsIGxpbmtOYW1lKQogICAgICAgICBpZiAoZmls ZVN1ZmZpeC5pbmRleE9mKCdhY3R1YWwnKSA9PSAtMSkKICAgICAgICAgICAgIGh0bWwgKz0gcmVz dWx0TGluayhzdHJpcEV4dGVuc2lvbih0ZXN0KSwgZmlsZVN1ZmZpeCwgbGlua05hbWUpOwogICAg ICAgICBlbHNlIHsKLSAgICAgICAgICAgIGlmIChyZXN1bHRzLnRlc3RzW3Rlc3RdLmlzX21pc3Np bmdfYXVkaW8pCisgICAgICAgICAgICBpZiAoZ19yZXN1bHRzLnRlc3RzW3Rlc3RdLmlzX21pc3Np bmdfYXVkaW8pCiAgICAgICAgICAgICAgICAgaHRtbCArPSByZXN1bHRMaW5rKHN0cmlwRXh0ZW5z aW9uKHRlc3QpLCAnLWFjdHVhbC53YXYnLCAnYXVkaW8gcmVzdWx0Jyk7CiAgICAgICAgICAgICBl bHNlIHsKICAgICAgICAgICAgICAgICBodG1sICs9IHJlc3VsdExpbmsoc3RyaXBFeHRlbnNpb24o dGVzdCksIGZpbGVTdWZmaXgsIGxpbmtOYW1lKTsKLSAgICAgICAgICAgICAgICBpZiAocmVzdWx0 cy50ZXN0c1t0ZXN0XS5pc19taXNzaW5nX2ltYWdlKQorICAgICAgICAgICAgICAgIGlmIChnX3Jl c3VsdHMudGVzdHNbdGVzdF0uaXNfbWlzc2luZ19pbWFnZSkKICAgICAgICAgICAgICAgICAgICAg aHRtbCArPSByZXN1bHRMaW5rKHN0cmlwRXh0ZW5zaW9uKHRlc3QpLCAnLWFjdHVhbC5wbmcnLCAn cG5nIHJlc3VsdCcpOwogICAgICAgICAgICAgfQogICAgICAgICB9IApAQCAtMzMyLDEzICszMzks MTMgQEAgZnVuY3Rpb24gYXBwZW5kVGVzdExpc3QodGVzdHMsIGhlYWRlciwgdGFibGVJZCwgZmls ZVN1ZmZpeCwgbGlua05hbWUpCiAgICAgaHRtbCArPSAnPC90YWJsZT4nCiB9CiAKLWlmIChuZXdU ZXN0cy5sZW5ndGgpCi0gICAgYXBwZW5kVGVzdExpc3QobmV3VGVzdHMsICdUZXN0cyB0aGF0IGhh ZCBubyBleHBlY3RlZCByZXN1bHRzIChwcm9iYWJseSBuZXcpOicsICduZXctdGVzdHMtdGFibGUn LCAnLWFjdHVhbC50eHQnLCAncmVzdWx0Jyk7CitpZiAoZ19uZXdUZXN0cy5sZW5ndGgpCisgICAg YXBwZW5kVGVzdExpc3QoZ19uZXdUZXN0cywgJ1Rlc3RzIHRoYXQgaGFkIG5vIGV4cGVjdGVkIHJl c3VsdHMgKHByb2JhYmx5IG5ldyk6JywgJ25ldy10ZXN0cy10YWJsZScsICctYWN0dWFsLnR4dCcs ICdyZXN1bHQnKTsKIAotaWYgKHRlc3RzV2l0aFN0ZGVyci5sZW5ndGgpCi0gICAgYXBwZW5kVGVz dExpc3QodGVzdHNXaXRoU3RkZXJyLCAnVGVzdHMgdGhhdCBoYWQgc3RkZXJyIG91dHB1dDonLCAn c3RkZXJyLXRhYmxlJywgJy1zdGRlcnIudHh0JywgJ3N0ZGVycicpOworaWYgKGdfdGVzdHNXaXRo U3RkZXJyLmxlbmd0aCkKKyAgICBhcHBlbmRUZXN0TGlzdChnX3Rlc3RzV2l0aFN0ZGVyciwgJ1Rl c3RzIHRoYXQgaGFkIHN0ZGVyciBvdXRwdXQ6JywgJ3N0ZGVyci10YWJsZScsICctc3RkZXJyLnR4 dCcsICdzdGRlcnInKTsKIAotaWYgKGhhc0h0dHBUZXN0cykgeworaWYgKGdfaGFzSHR0cFRlc3Rz KSB7CiAgICAgaHRtbCArPSAnPHA+aHR0cGQgYWNjZXNzIGxvZzogPGEgaHJlZj0iYWNjZXNzX2xv Zy50eHQiPmFjY2Vzc19sb2cudHh0PC9hPjwvcD4nICsKICAgICAgICAgJzxwPmh0dHBkIGVycm9y IGxvZzogPGEgaHJlZj0iZXJyb3JfbG9nLnR4dCI+ZXJyb3JfbG9nLnR4dDwvYT48L3A+JzsKIH0K QEAgLTUyOCwxMCArNTM1LDExIEBAIGZ1bmN0aW9uIHVwZGF0ZUV4cGVjdGVkUmVzdWx0cygpCiB9 CiAKIHVwZGF0ZUV4cGVjdGVkUmVzdWx0cygpOwotZG9jdW1lbnQucXVlcnlTZWxlY3RvcignLnVu ZXhwZWN0ZWQtcmVzdWx0cycpLmFkZEV2ZW50TGlzdGVuZXIoJ2NoYW5nZScsIHVwZGF0ZUV4cGVj dGVkUmVzdWx0cywgZmFsc2UpOworaWYgKGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJy51bmV4cGVj dGVkLXJlc3VsdHMnKSkKKyAgICBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCcudW5leHBlY3RlZC1y ZXN1bHRzJykuYWRkRXZlbnRMaXN0ZW5lcignY2hhbmdlJywgdXBkYXRlRXhwZWN0ZWRSZXN1bHRz LCBmYWxzZSk7CiAKLWlmICghaGFzVGV4dEZhaWx1cmVzKQoraWYgKCFnX2hhc1RleHRGYWlsdXJl cykKICAgZG9jdW1lbnQuYm9keS5xdWVyeVNlbGVjdG9yKCcjdGV4dC1yZXN1bHRzLWhlYWRlcicp LnRleHRDb250ZW50ID0gJyc7Ci1pZiAoIWhhc0ltYWdlRmFpbHVyZXMpCitpZiAoIWdfaGFzSW1h Z2VGYWlsdXJlcykKICAgZG9jdW1lbnQuYm9keS5xdWVyeVNlbGVjdG9yKCcjaW1hZ2UtcmVzdWx0 cy1oZWFkZXInKS50ZXh0Q29udGVudCA9ICcnOwogPC9zY3JpcHQ+Cg==