60859 2011-05-15 14:50:38 -0700 Make API tester more gtest friendly 2011-05-15 15:41:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam levin oldest_to_newest 404207 0 sam 2011-05-15 14:50:38 -0700 Make API tester more gtest friendly 404208 1 93590 sam 2011-05-15 14:56:16 -0700 Created attachment 93590 Patch 404209 2 sam 2011-05-15 14:59:09 -0700 With this patch, the output of run-api-tests is the standard gtest output (which I am not particularly fond of, but that is neither here nor there) and you can easily pass gtest command line arguments to the tool just by passing them on the command line (eg. run-api-tests --gtest_output="xml"). This gives us a nicer place to improve from. 404213 3 93590 levin 2011-05-15 15:38:39 -0700 Comment on attachment 93590 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93590&action=review Thanks! > Tools/Scripts/run-api-tests:94 > + $childOut = ">&STDOUT"; You could even move out out of the unless/else, since it is now common between the two clauses. 404214 4 sam 2011-05-15 15:41:26 -0700 Committed r86511: <http://trac.webkit.org/changeset/86511> 93590 2011-05-15 14:56:16 -0700 2011-05-15 15:38:39 -0700 Patch bug-60859-20110515145615.patch text/plain 11735 sam SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDg2NTA5KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMzAgQEAKKzIwMTEtMDUtMTUgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIEFQSSB0ZXN0 ZXIgbW9yZSBndGVzdCBmcmllbmRseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjA4NTkKKworICAgICAgICAqIFNjcmlwdHMvcnVuLWFwaS10ZXN0czoK KyAgICAgICAgTnVtZXJvdXMgY2hhbmdlczoKKyAgICAgICAgLSBSZW1vdmUgbG9naWMgdG8gcnVu IHRlc3RzIG9uZSBhdCBhIHRpbWUuCisgICAgICAgIC0gUmVtb3ZlIGxvZ2ljIHRvIGJ1aWxkIHVw IGEgbGlzdCBvZiB0ZXN0cywgaW5zdGVhZCBqdXN0IHBhc3MgLS1ndGVzdF9saXN0X3Rlc3RzIHRv IAorICAgICAgICAgIHRoZSB0ZXN0IHJ1bm5lciBhbmQgYWxsb3cgZ3Rlc3QgdG8gcHJpbnQgaXQg Zm9yIHVzLgorICAgICAgICAtIEZvcndhcmQgc3Rkb3V0IGZyb20gdGhlIHRlc3QgdG9vbCB0byBz dGRvdXQsIGV2ZW4gaW4gbm9uLXZlcmJvc2UgcnVucy4KKyAgICAgICAgLSBSdW4gdGVzdCB0b29s IGZyb20gdGhlIGN1cnJlbnQgd29ya2luZyBkaXJlY3RvcnkgaW5zdGVhZCBvZiB0aGUgcm9vdCB3 ZWJraXQKKyAgICAgICAgICBkaXJlY3RvcnkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rl c3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgTW92ZSBwbGlz dCB0byBiZSB3aXRoIG90aGVyIGJ1bmRsZSBzb3VyY2VzLgorCisgICAgICAgICogVGVzdFdlYktp dEFQSS9UZXN0c0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VGVzdHND b250cm9sbGVyOjpUZXN0c0NvbnRyb2xsZXIpOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VGVz dHNDb250cm9sbGVyOjpydW4pOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHNDb250cm9s bGVyLmg6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9tYWMvbWFpbi5tbToKKyAgICAgICAgU2lt cGxpZnkgVGVzdENvbnRyb2xsZXIgZG93biB0byBhIHNpbmdsZSBydW4gZnVuY3Rpb24uIFdlIHNo b3VsZCBjb25zaWRlciByZW1vdmluZyB0aGUgY2xhc3MKKyAgICAgICAgZW50aXJlbHkgYXQgc29t ZSBwb2ludC4KKwogMjAxMS0wNS0xNSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBn bWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjg2NTA0LgpJbmRl eDogVG9vbHMvU2NyaXB0cy9ydW4tYXBpLXRlc3RzCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvcnVuLWFwaS10ZXN0cwkocmV2aXNpb24gODY1MDkpCisrKyBUb29scy9TY3JpcHRzL3J1bi1h cGktdGVzdHMJKHdvcmtpbmcgY29weSkKQEAgLTM2LDEzICszNiw4IEBAIHVzZSBHZXRvcHQ6Okxv bmcgcXcoOmNvbmZpZyBwYXNzX3Rocm91Z2gKIHVzZSBJUEM6Ok9wZW4zOwogdXNlIGxpYiAkRmlu ZEJpbjo6QmluOwogdXNlIHdlYmtpdGRpcnM7Ci11c2UgVGVybTo6QU5TSUNvbG9yIHF3KDpjb25z dGFudHMpOwogCi1zdWIgZHVtcEFsbFRlc3RzKCk7Ci1zdWIgcnVuQWxsVGVzdHMoKTsKLXN1YiBy dW5BbGxUZXN0c0luU3VpdGUoJCk7Ci1zdWIgcnVuVGVzdCgkJCk7Ci1zdWIgcG9wdWxhdGVUZXN0 cygpOworc3ViIHJ1blRlc3RUb29sKEApOwogc3ViIGJ1aWxkVGVzdFRvb2woKTsKIAogbXkgJHNo b3dIZWxwID0gMDsKQEAgLTcxLDYwICs2NiwxOCBAQCBpZiAoJHNob3dIZWxwKSB7CiBzZXRDb25m aWd1cmF0aW9uKCk7CiBidWlsZFRlc3RUb29sKCk7CiBzZXRQYXRoRm9yUnVubmluZ1dlYktpdEFw cChcJUVOVik7Ci1teSAldGVzdHNUb1J1biA9IHBvcHVsYXRlVGVzdHMoKTsKIAogaWYgKCRkdW1w KSB7Ci0gICAgZHVtcEFsbFRlc3RzKCk7Ci0gICAgZXhpdCAwOworICAgIG15IEBkdW1wQXJndW1l bnRzID0gKCItLWd0ZXN0X2xpc3RfdGVzdHMiKTsKKyAgICBydW5UZXN0VG9vbChAZHVtcEFyZ3Vt ZW50cyk7CisgICAgZXhpdCgwKTsKIH0KIAotcnVuQWxsVGVzdHMoKTsKK3J1blRlc3RUb29sKCk7 CiAKLXN1YiBkdW1wQWxsVGVzdHMoKQorc3ViIHJ1blRlc3RUb29sKEApCiB7Ci0gICAgcHJpbnQg IkR1bXBpbmcgdGVzdCBjYXNlc1xuIjsKLSAgICBwcmludCAiLS0tLS0tLS0tLS0tLS0tLS0tXG4i OwotICAgIGZvciBteSAkc3VpdGUgKGtleXMgJXRlc3RzVG9SdW4pIHsKLSAgICAgICAgcHJpbnQg JHN1aXRlIC4gIjpcbiI7Ci0gICAgICAgIHByaW50IG1hcCB7ICIgICAgIiAuICRfIC4gIlxuIiB9 IEB7ICR0ZXN0c1RvUnVueyRzdWl0ZX0gfTsKLSAgICB9Ci0gICAgcHJpbnQgIi0tLS0tLS0tLS0t LS0tLS0tLVxuIjsKLX0KLQotc3ViIHJ1bkFsbFRlc3RzKCkKLXsKLSAgICBteSAkYW55RmFpbHVy ZXMgPSAwOwotICAgIGZvciBteSAkc3VpdGUgKGtleXMgJXRlc3RzVG9SdW4pIHsKLSAgICAgICAg bXkgJGZhaWxlZCA9IHJ1bkFsbFRlc3RzSW5TdWl0ZSgkc3VpdGUpOwotICAgICAgICBpZiAoJGZh aWxlZCkgewotICAgICAgICAgICAgJGFueUZhaWx1cmVzID0gMTsKLSAgICAgICAgfQotICAgIH0K LSAgICByZXR1cm4gJGFueUZhaWx1cmVzOwotfQotCi1zdWIgcnVuQWxsVGVzdHNJblN1aXRlKCQp Ci17Ci0gICAgbXkgKCRzdWl0ZSkgPSBAXzsKLSAgICBwcmludCAiU3VpdGU6ICRzdWl0ZVxuIjsK LQotICAgIG15ICRhbnlGYWlsdXJlcyA9IDA7Ci0gICAgZm9yIG15ICR0ZXN0IChAeyR0ZXN0c1Rv UnVueyRzdWl0ZX19KSB7Ci0gICAgICAgIG15ICRmYWlsZWQgPSBydW5UZXN0KCRzdWl0ZSwgJHRl c3QpOwotICAgICAgICBpZiAoJGZhaWxlZCkgewotICAgICAgICAgICAgJGFueUZhaWx1cmVzID0g MTsKLSAgICAgICAgfQotICAgIH0KLSAgICAKLSAgICByZXR1cm4gJGFueUZhaWx1cmVzOwotfQot Ci1zdWIgcnVuVGVzdCgkJCkKLXsKLSAgICBteSAoJHN1aXRlLCAkdGVzdE5hbWUpID0gQF87Ci0g ICAgbXkgJHRlc3QgPSAkc3VpdGUgLiAiLiIgLiAkdGVzdE5hbWU7Ci0KLSAgICBwcmludCAiICAg IFRlc3Q6ICR0ZXN0TmFtZSAtPiAiOworICAgIG15IChAYXJndW1lbnRzKSA9IEBfOwogCiAgICAg bXkgJHJlc3VsdCA9IDA7CiAgICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewpAQCAtMTM0LDg5 ICs4NywzMyBAQCBzdWIgcnVuVGVzdCgkJCkKICAgICAgICAgbXkgJGFwaVRlc3RlclBhdGggPSAi JHByb2R1Y3REaXIvVGVzdFdlYktpdEFQSSI7CiAKICAgICAgICAgbG9jYWwgKkRFVk5VTEw7Cisg ICAgICAgIG9wZW4oREVWTlVMTCwgIj4iLCBGaWxlOjpTcGVjLT5kZXZudWxsKCkpIG9yIGRpZSAi RmFpbGVkIHRvIG9wZW4gL2Rldi9udWxsIjsKKwogICAgICAgICBteSAoJGNoaWxkSW4sICRjaGls ZE91dCwgJGNoaWxkRXJyKTsKICAgICAgICAgdW5sZXNzICgkdmVyYm9zZSkgewotICAgICAgICAg ICAgb3BlbihERVZOVUxMLCAiPiIsIEZpbGU6OlNwZWMtPmRldm51bGwoKSkgb3IgZGllICJGYWls ZWQgdG8gb3BlbiAvZGV2L251bGwiOwotICAgICAgICAgICAgJGNoaWxkT3V0ID0gIj4mREVWTlVM TCI7CisgICAgICAgICAgICAkY2hpbGRPdXQgPSAiPiZTVERPVVQiOwogICAgICAgICAgICAgJGNo aWxkRXJyID0gIj4mREVWTlVMTCI7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAkY2hp bGRPdXQgPSAiPiZTVERPVVQiOwogICAgICAgICAgICAgJGNoaWxkRXJyID0gIj4mU1RERVJSIjsK ICAgICAgICAgfQogCi0gICAgICAgIG15ICRwaWQ7Ci0gICAgICAgIGlmIChhcmNoaXRlY3R1cmUo KSkgewotICAgICAgICAgICAgJHBpZCA9IG9wZW4zKCRjaGlsZEluLCAkY2hpbGRPdXQsICRjaGls ZEVyciwgImFyY2giLCAiLSIgLiBhcmNoaXRlY3R1cmUoKSwgJGFwaVRlc3RlclBhdGgsICR0ZXN0 LCBAQVJHVikgb3IgZGllICJGYWlsZWQgdG8gcnVuIHRlc3Q6ICR0ZXN0LiI7Ci0gICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICAkcGlkID0gb3BlbjMoJGNoaWxkSW4sICRjaGlsZE91dCwgJGNo aWxkRXJyLCAkYXBpVGVzdGVyUGF0aCwgJHRlc3QsIEBBUkdWKSBvciBkaWUgIkZhaWxlZCB0byBy dW4gdGVzdDogJHRlc3QuIjsKLSAgICAgICAgfQotCi0gICAgICAgIGNsb3NlKCRjaGlsZEluKTsK LSAgICAgICAgY2xvc2UoJGNoaWxkT3V0KTsKLSAgICAgICAgY2xvc2UoJGNoaWxkRXJyKTsKLSAg ICAgICAgY2xvc2UoREVWTlVMTCkgdW5sZXNzICgkdmVyYm9zZSk7Ci0KLSAgICAgICAgd2FpdHBp ZCgkcGlkLCAwKTsKLSAgICAgICAgJHJlc3VsdCA9ICQ/OwotICAgIH0gZWxzaWYgKGlzQXBwbGVX aW5XZWJLaXQoKSkgewotICAgICAgICBteSAkYXBpVGVzdGVyTmFtZVN1ZmZpeDsKLSAgICAgICAg aWYgKGNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKSBuZSAiRGVidWdfQWxsIikgewotICAg ICAgICAgICAgJGFwaVRlc3Rlck5hbWVTdWZmaXggPSAiIjsKLSAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgICRhcGlUZXN0ZXJOYW1lU3VmZml4ID0gIl9kZWJ1ZyI7Ci0gICAgICAgIH0KLSAg ICAgICAgbXkgJGFwaVRlc3RlclBhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxlKHByb2R1Y3REaXIo KSwgIlRlc3RXZWJLaXRBUEkkYXBpVGVzdGVyTmFtZVN1ZmZpeC5leGUiKTsKLSAgICAgICAgJHJl c3VsdCA9IHN5c3RlbSAkYXBpVGVzdGVyUGF0aCwgJHRlc3QsIEBBUkdWOwotICAgIH0gZWxzZSB7 Ci0gICAgICAgIGRpZSAicnVuLWFwaS10ZXN0cyBpcyBub3Qgc3VwcG9ydGVkIG9uIHRoaXMgcGxh dGZvcm0uXG4iCi0gICAgfQotICAgIAotICAgIGlmICgkcmVzdWx0ID09IDApIHsKLSAgICAgICAg cHJpbnQgQk9MRCBHUkVFTiwgIlBhc3NlZCIsIFJFU0VULCAiXG4iOwotICAgIH0gZWxzZSB7Ci0g ICAgICAgIHByaW50IEJPTEQgUkVELCAiRmFpbGVkIiwgUkVTRVQsICJcbiI7Ci0gICAgfQotfQot Ci1zdWIgcG9wdWxhdGVUZXN0cygpCi17Ci0gICAgbXkgQHRlc3RzOwotCi0gICAgaWYgKGlzQXBw bGVNYWNXZWJLaXQoKSkgewotICAgICAgICBteSAkcHJvZHVjdERpciA9IHByb2R1Y3REaXIoKTsK LSAgICAgICAgJEVOVntEWUxEX0ZSQU1FV09SS19QQVRIfSA9ICRwcm9kdWN0RGlyOwotICAgICAg ICAkRU5We1dFQktJVF9VTlNFVF9EWUxEX0ZSQU1FV09SS19QQVRIfSA9ICJZRVMiOwotICAgICAg ICBteSAkYXBpVGVzdGVyUGF0aCA9ICIkcHJvZHVjdERpci9UZXN0V2ViS2l0QVBJIjsKLQotICAg ICAgICBsb2NhbCAqREVWTlVMTDsKLSAgICAgICAgbXkgKCRjaGlsZEluLCAkY2hpbGRPdXQsICRj aGlsZEVycik7Ci0gICAgICAgIHVubGVzcyAoJHZlcmJvc2UpIHsKLSAgICAgICAgICAgIG9wZW4o REVWTlVMTCwgIj4iLCBGaWxlOjpTcGVjLT5kZXZudWxsKCkpIG9yIGRpZSAiRmFpbGVkIHRvIG9w ZW4gL2Rldi9udWxsIjsKLSAgICAgICAgICAgICRjaGlsZEVyciA9ICI+JkRFVk5VTEwiOwotICAg ICAgICB9IGVsc2UgewotICAgICAgICAgICAgJGNoaWxkRXJyID0gIj4mU1RERVJSIjsKLSAgICAg ICAgfQorICAgICAgICAKIAogICAgICAgICBteSAkcGlkOwogICAgICAgICBpZiAoYXJjaGl0ZWN0 dXJlKCkpIHsKLSAgICAgICAgICAgICRwaWQgPSBvcGVuMygkY2hpbGRJbiwgJGNoaWxkT3V0LCAk Y2hpbGRFcnIsICJhcmNoIiwgIi0iIC4gYXJjaGl0ZWN0dXJlKCksICRhcGlUZXN0ZXJQYXRoLCAi LS1kdW1wLXRlc3RzIikgb3IgZGllICJGYWlsZWQgdG8gYnVpbGQgbGlzdCBvZiB0ZXN0cyEiOwor ICAgICAgICAgICAgJHBpZCA9IG9wZW4zKCRjaGlsZEluLCAkY2hpbGRPdXQsICRjaGlsZEVyciwg ImFyY2giLCAiLSIgLiBhcmNoaXRlY3R1cmUoKSwgJGFwaVRlc3RlclBhdGgsIEBhcmd1bWVudHMs IEBBUkdWKSBvciBkaWUgIkZhaWxlZCB0byBydW4gdGVzdCB0b29sLiI7CiAgICAgICAgIH0gZWxz ZSB7Ci0gICAgICAgICAgICAkcGlkID0gb3BlbjMoJGNoaWxkSW4sICRjaGlsZE91dCwgJGNoaWxk RXJyLCAkYXBpVGVzdGVyUGF0aCwgIi0tZHVtcC10ZXN0cyIpIG9yIGRpZSAiRmFpbGVkIHRvIGJ1 aWxkIGxpc3Qgb2YgdGVzdHMhIjsKKyAgICAgICAgICAgICRwaWQgPSBvcGVuMygkY2hpbGRJbiwg JGNoaWxkT3V0LCAkY2hpbGRFcnIsICRhcGlUZXN0ZXJQYXRoLCBAYXJndW1lbnRzLCBAQVJHVikg b3IgZGllICJGYWlsZWQgdG8gcnVuIHRlc3QgdG9vbC4iOwogICAgICAgICB9CiAKICAgICAgICAg Y2xvc2UoJGNoaWxkSW4pOwotICAgICAgICBAdGVzdHMgPSA8JGNoaWxkT3V0PjsKICAgICAgICAg Y2xvc2UoJGNoaWxkT3V0KTsKICAgICAgICAgY2xvc2UoJGNoaWxkRXJyKTsKLSAgICAgICAgY2xv c2UoREVWTlVMTCkgdW5sZXNzICgkdmVyYm9zZSk7CisgICAgICAgIGNsb3NlKERFVk5VTEwpOwog CiAgICAgICAgIHdhaXRwaWQoJHBpZCwgMCk7Ci0gICAgICAgIG15ICRyZXN1bHQgPSAkPzsKLQot ICAgICAgICBpZiAoJHJlc3VsdCkgewotICAgICAgICAgICAgcHJpbnQgU1RERVJSICJGYWlsZWQg dG8gYnVpbGQgbGlzdCBvZiB0ZXN0cyFcbiI7Ci0gICAgICAgICAgICBleGl0IGV4aXRTdGF0dXMo JHJlc3VsdCk7Ci0gICAgICAgIH0KKyAgICAgICAgJHJlc3VsdCA9ICQ/OwogICAgIH0gZWxzaWYg KGlzQXBwbGVXaW5XZWJLaXQoKSkgewogICAgICAgICBteSAkYXBpVGVzdGVyTmFtZVN1ZmZpeDsK ICAgICAgICAgaWYgKGNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKSBuZSAiRGVidWdfQWxs IikgewpAQCAtMjI1LDI1ICsxMjIsMTggQEAgc3ViIHBvcHVsYXRlVGVzdHMoKQogICAgICAgICAg ICAgJGFwaVRlc3Rlck5hbWVTdWZmaXggPSAiX2RlYnVnIjsKICAgICAgICAgfQogICAgICAgICBt eSAkYXBpVGVzdGVyUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUocHJvZHVjdERpcigpLCAiVGVz dFdlYktpdEFQSSRhcGlUZXN0ZXJOYW1lU3VmZml4LmV4ZSIpOwotICAgICAgICBvcGVuKFRFU1RT LCAiLXwiLCAkYXBpVGVzdGVyUGF0aCwgIi0tZHVtcC10ZXN0cyIpIG9yIGRpZSAkITsKLSAgICAg ICAgQHRlc3RzID0gPFRFU1RTPjsKLSAgICAgICAgY2xvc2UoVEVTVFMpIG9yIGRpZSAkITsKKyAg ICAgICAgJHJlc3VsdCA9IHN5c3RlbSAkYXBpVGVzdGVyUGF0aCwgQEFSR1Y7CiAgICAgfSBlbHNl IHsKICAgICAgICAgZGllICJydW4tYXBpLXRlc3RzIGlzIG5vdCBzdXBwb3J0ZWQgb24gdGhpcyBw bGF0Zm9ybS5cbiIKICAgICB9Ci0KLSAgICBteSAla2V5ZWRUZXN0cyA9ICgpOwotICAgIGZvciBt eSAkdGVzdCAoQHRlc3RzKSB7Ci0gICAgICAgICR0ZXN0ID1+IHMvW1xyXG5dKiQvLzsKLSAgICAg ICAgbXkgKCRzdWl0ZSwgJHRlc3ROYW1lKSA9IHNwbGl0KC9cLi8sICR0ZXN0KTsKLSAgICAgICAg cHVzaCBAeyRrZXllZFRlc3RzeyRzdWl0ZX19LCAkdGVzdE5hbWU7Ci0gICAgfQogICAgIAotICAg IHJldHVybiAla2V5ZWRUZXN0czsKKyAgICByZXR1cm4gJHJlc3VsdDsKIH0KIAogc3ViIGJ1aWxk VGVzdFRvb2woKQogeworICAgIG15ICRvcmlnaW5hbEN3ZCA9IGdldGN3ZCgpOworCiAgICAgY2hk aXJXZWJLaXQoKTsKIAogICAgIG15ICRidWlsZFRlc3RUb29sID0gImJ1aWxkLWFwaS10ZXN0cyI7 CkBAIC0yNzYsNCArMTY2LDYgQEAgc3ViIGJ1aWxkVGVzdFRvb2woKQogICAgICAgICBwcmludCBT VERFUlIgIkNvbXBpbGluZyBUZXN0V2ViS2l0QVBJIGZhaWxlZCFcbiI7CiAgICAgICAgIGV4aXQg ZXhpdFN0YXR1cygkYnVpbGRSZXN1bHQpOwogICAgIH0KKworICAgIGNoZGlyICRvcmlnaW5hbEN3 ZDsKIH0KSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHNDb250cm9sbGVyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzQ29udHJvbGxlci5jcHAJKHJldmlz aW9uIDg2NTA5KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0c0NvbnRyb2xsZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yNSwxMCArMjUsNyBAQAogCiAjaW5jbHVkZSAiVGVzdHNDb250cm9s bGVyLmgiCiAKLSNpbmNsdWRlICJUZXN0LmgiCi0jaW5jbHVkZSA8YXNzZXJ0Lmg+CiAjaW5jbHVk ZSA8Z3Rlc3QvZ3Rlc3QuaD4KLSNpbmNsdWRlIDxjc3RkaW8+CiAKIG5hbWVzcGFjZSBUZXN0V2Vi S2l0QVBJIHsKIApAQCAtNDAsMzEgKzM3LDExIEBAIFRlc3RzQ29udHJvbGxlciYgVGVzdHNDb250 cm9sbGVyOjpzaGFyZWQKIAogVGVzdHNDb250cm9sbGVyOjpUZXN0c0NvbnRyb2xsZXIoKQogewot ICAgIGludCBhcmdjID0gMDsKLSAgICA6OnRlc3Rpbmc6OkluaXRHb29nbGVUZXN0KCZhcmdjLCAo Y2hhcioqKTApOwogfQogCi12b2lkIFRlc3RzQ29udHJvbGxlcjo6ZHVtcFRlc3ROYW1lcygpCi17 Ci0gICAgOjp0ZXN0aW5nOjpVbml0VGVzdCogdW5pdF90ZXN0ID0gOjp0ZXN0aW5nOjpVbml0VGVz dDo6R2V0SW5zdGFuY2UoKTsKLQotICAgIGZvciAoaW50IGkgPSAwOyBpIDwgdW5pdF90ZXN0LT50 b3RhbF90ZXN0X2Nhc2VfY291bnQoKTsgaSsrKSB7Ci0gICAgICAgIGNvbnN0IDo6dGVzdGluZzo6 VGVzdENhc2UqIHRlc3RfY2FzZSA9IHVuaXRfdGVzdC0+R2V0VGVzdENhc2UoaSk7Ci0gICAgICAg IGZvciAoaW50IGogPSAwOyBqIDwgdGVzdF9jYXNlLT50b3RhbF90ZXN0X2NvdW50KCk7IGorKykg ewotICAgICAgICAgIGNvbnN0IDo6dGVzdGluZzo6VGVzdEluZm8qIHRlc3RfaW5mbyA9IHRlc3Rf Y2FzZS0+R2V0VGVzdEluZm8oaik7Ci0gICAgICAgICAgcHJpbnRmKCIlcy4lc1xuIiwgdGVzdF9j YXNlLT5uYW1lKCksIHRlc3RfaW5mby0+bmFtZSgpKTsKLSAgICAgICAgfQotICAgIH0KLX0KLQot Ym9vbCBUZXN0c0NvbnRyb2xsZXI6OnJ1blRlc3ROYW1lZChjb25zdCBzdGQ6OnN0cmluZyYgaWRl bnRpZmllcikKLXsKLSAgICA6OnRlc3Rpbmc6OkdURVNUX0ZMQUcoZmlsdGVyKSA9IGlkZW50aWZp ZXI7Ci0gICAgcmV0dXJuICFSVU5fQUxMX1RFU1RTKCk7Ci19Ci0KLWJvb2wgVGVzdHNDb250cm9s bGVyOjpydW5BbGxUZXN0cygpCitib29sIFRlc3RzQ29udHJvbGxlcjo6cnVuKGludCBhcmdjLCBj aGFyKiogYXJndikKIHsKKyAgICA6OnRlc3Rpbmc6OkluaXRHb29nbGVUZXN0KCZhcmdjLCBhcmd2 KTsKICAgICByZXR1cm4gIVJVTl9BTExfVEVTVFMoKTsKIH0KIApJbmRleDogVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0c0NvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzQ29udHJvbGxlci5oCShyZXZpc2lvbiA4NjUwOSkKKysrIFRvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHNDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDIwICsyNiwxMyBA QAogI2lmbmRlZiBUZXN0c0NvbnRyb2xsZXJfaAogI2RlZmluZSBUZXN0c0NvbnRyb2xsZXJfaAog Ci0jaW5jbHVkZSA8bWFwPgotI2luY2x1ZGUgPHN0cmluZz4KLQogbmFtZXNwYWNlIFRlc3RXZWJL aXRBUEkgewogCi1jbGFzcyBUZXN0OwotCiBjbGFzcyBUZXN0c0NvbnRyb2xsZXIgewogcHVibGlj OgogICAgIHN0YXRpYyBUZXN0c0NvbnRyb2xsZXImIHNoYXJlZCgpOwogCi0gICAgdm9pZCBkdW1w VGVzdE5hbWVzKCk7Ci0gICAgYm9vbCBydW5UZXN0TmFtZWQoY29uc3Qgc3RkOjpzdHJpbmcmKTsK LSAgICBib29sIHJ1bkFsbFRlc3RzKCk7CisgICAgYm9vbCBydW4oaW50IGFyZ2MsIGNoYXIqKiBh cmd2KTsKIAogcHJpdmF0ZToKICAgICBUZXN0c0NvbnRyb2xsZXIoKTsKSW5kZXg6IFRvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qCShyZXZpc2lvbiA4NjUwOSkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0y MDYsNyArMjA2LDYgQEAKIAkJCQlCQzkwOTU3RDEyNTU0Q0VBMDAwODM3NTYgLyogQ29uZmlndXJh dGlvbnMgKi8sCiAJCQkJMDhGQjc3OURGRTg0MTU1REMwMkFBQzA3IC8qIEV4dGVybmFsIEZyYW1l d29ya3MgYW5kIExpYnJhcmllcyAqLywKIAkJCQkxQUI2NzRBREZFOUQ1NEI1MTFDQTJDQkIgLyog UHJvZHVjdHMgKi8sCi0JCQkJQkM1NzU5ODExMjZFNzRBRjAwNkYwRjEyIC8qIEluamVjdGVkQnVu ZGxlLUluZm8ucGxpc3QgKi8sCiAJCQkpOwogCQkJbmFtZSA9IFRlc3RXZWJLaXRBUEk7CiAJCQlz b3VyY2VUcmVlID0gIjxncm91cD4iOwpAQCAtMjUzLDYgKzI1Miw3IEBACiAJCUJDNTc1OTQ0MTI2 RTczM0MwMDZGMEYxMiAvKiBJbmplY3RlZEJ1bmRsZSAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3Vw OwogCQkJY2hpbGRyZW4gPSAoCisJCQkJQkM1NzU5ODExMjZFNzRBRjAwNkYwRjEyIC8qIEluamVj dGVkQnVuZGxlLUluZm8ucGxpc3QgKi8sCiAJCQkJQkM1NzU5NDYxMjZFNzM1MTAwNkYwRjEyIC8q IEluamVjdGVkQnVuZGxlTWFpbi5jcHAgKi8sCiAJCQkJQkM1NzVBOUUxMjZFNzVGQjAwNkYwRjEy IC8qIEluamVjdGVkQnVuZGxlVGVzdC5oICovLAogCQkJCUJDNTc1QTlGMTI2RTc2NTcwMDZGMEYx MiAvKiBJbmplY3RlZEJ1bmRsZUNvbnRyb2xsZXIuaCAqLywKSW5kZXg6IFRvb2xzL1Rlc3RXZWJL aXRBUEkvbWFjL21haW4ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9tYWMv bWFpbi5tbQkocmV2aXNpb24gODY1MDkpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL21hYy9tYWlu Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNSwxOSArMjUsMTMgQEAKIAogI2ltcG9ydCAiVGVzdHND b250cm9sbGVyLmgiCiAKLWludCBtYWluKGludCBhcmdjLCBjb25zdCBjaGFyKiBhcmd2W10pCitp bnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiB7CiAgICAgTlNBdXRvcmVsZWFzZVBvb2wg KnBvb2wgPSBbW05TQXV0b3JlbGVhc2VQb29sIGFsbG9jXSBpbml0XTsKIAogICAgIFtOU0FwcGxp Y2F0aW9uIHNoYXJlZEFwcGxpY2F0aW9uXTsKIAotICAgIGJvb2wgcGFzc2VkID0gdHJ1ZTsKLQot ICAgIHN0ZDo6c3RyaW5nIGFyZ3VtZW50KGFyZ3ZbMV0pOwotICAgIGlmIChhcmd1bWVudCA9PSAi LS1kdW1wLXRlc3RzIikKLSAgICAgICAgVGVzdFdlYktpdEFQSTo6VGVzdHNDb250cm9sbGVyOjpz aGFyZWQoKS5kdW1wVGVzdE5hbWVzKCk7Ci0gICAgZWxzZSAgIAotICAgICAgICBwYXNzZWQgPSBU ZXN0V2ViS2l0QVBJOjpUZXN0c0NvbnRyb2xsZXI6OnNoYXJlZCgpLnJ1blRlc3ROYW1lZChhcmd1 bWVudCk7CisgICAgYm9vbCBwYXNzZWQgPSBUZXN0V2ViS2l0QVBJOjpUZXN0c0NvbnRyb2xsZXI6 OnNoYXJlZCgpLnJ1bihhcmdjLCBhcmd2KTsKIAogICAgIFtwb29sIGRyYWluXTsKIAo=