142021 2015-02-25 13:14:03 -0800 Get rid of TestInvocation::pathOrURL 2015-02-25 13:28:07 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson oldest_to_newest 1072112 0 beidson 2015-02-25 13:14:03 -0800 Get rid of TestInvocation::pathOrURL When running tests using `run-webkit-tests`, the pathOrURL string is always an absolute path. But when running tests using `WebKitTestRunner <path to test>`, the pathOrURL string can be a relative path. If you are inside a "special" directory and invoke WebKitTestRunner directly on a test in that directory, then the pathOrURL string does NOT contain that directory name. Therefore, special behavior based on the directory name does not take place. The pathOrURL string never really needs to be exposed, so this is a pretty good cleanup. 1072113 1 247337 beidson 2015-02-25 13:19:07 -0800 Created attachment 247337 Patch v1 1072114 2 beidson 2015-02-25 13:28:07 -0800 http://trac.webkit.org/changeset/180636 247337 2015-02-25 13:19:07 -0800 2015-02-25 13:22:17 -0800 Patch v1 patch text/plain 11398 beidson ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiYjdk MWY1Li4xM2IxYzAyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsNDIgQEAKIDIwMTUtMDItMjUgIEJyYWR5IEVpZHNvbiAgPGJlaWRz b25AYXBwbGUuY29tPgogCisgICAgICAgIEdldCByaWQgb2YgVGVzdEludm9jYXRpb246OnBhdGhP clVSTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQy MDIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IHBhdGhPclVSTCBzdHJpbmcgaXMgYSByZWxhdGl2ZSBwYXRoIHVzZWQgYXMgYW4gYXJndW1lbnQg dG8gV2ViS2l0VGVzdFJ1bm5lciwKKyAgICAgICAgYnV0IG1vc3QgY29kZSB0aGF0IHVzZXMgaXQg ZXhwZWN0ZWQgYW4gYWJzb2x1dGUgcGF0aC4KKworICAgICAgICBUaGlzIGdldHMgcmlkIG9mIHRo ZSBtZW1iZXIgYW5kIHJlcGxhY2VzIGFsbCB1c2VzIHdpdGggYSBtb3JlIGRlc2NyaXB0aXZlICJ1 cmxDb250YWlucyIgbWV0aG9kLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29u dHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjp1cGRhdGVXZWJWaWV3 U2l6ZUZvclRlc3QpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6dXBkYXRlV2luZG93 U2NhbGVGb3JUZXN0KToKKyAgICAgICAgKFdUUjo6c2hvdWxkVXNlRml4ZWRMYXlvdXQpOgorICAg ICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6dXBkYXRlTGF5b3V0VHlwZUZvclRlc3QpOgorCisg ICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5jcHA6CisgICAgICAgIChX VFI6OlRlc3RJbnZvY2F0aW9uOjpUZXN0SW52b2NhdGlvbik6CisgICAgICAgIChXVFI6OlRlc3RJ bnZvY2F0aW9uOjp1cmxDb250YWlucyk6CisgICAgICAgIChXVFI6OlRlc3RJbnZvY2F0aW9uOjpz aG91bGRMb2dGcmFtZUxvYWREZWxlZ2F0ZXMpOgorICAgICAgICAoV1RSOjpUZXN0SW52b2NhdGlv bjo6c2hvdWxkTG9nSGlzdG9yeUNsaWVudENhbGxiYWNrcyk6CisgICAgICAgIChXVFI6OlRlc3RJ bnZvY2F0aW9uOjppbnZva2UpOgorICAgICAgICAoV1RSOjpzaG91bGRMb2dGcmFtZUxvYWREZWxl Z2F0ZXMpOiBEZWxldGVkLgorICAgICAgICAoV1RSOjpzaG91bGRMb2dIaXN0b3J5Q2xpZW50Q2Fs bGJhY2tzKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0 aW9uLmg6CisgICAgICAgIChXVFI6OlRlc3RJbnZvY2F0aW9uOjpwYXRoT3JVUkwpOiBEZWxldGVk LgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9pb3MvVGVzdENvbnRyb2xsZXJJT1MubW06 CisgICAgICAgIChXVFI6OnNob3VsZE1ha2VWaWV3cG9ydEZsZXhpYmxlKToKKyAgICAgICAgKFdU Ujo6VGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtQ29uZmlndXJlVmlld0ZvclRlc3QpOgorCisgICAg ICAgICogV2ViS2l0VGVzdFJ1bm5lci9tYWMvVGVzdENvbnRyb2xsZXJNYWMubW06CisgICAgICAg IChXVFI6OnNob3VsZFVzZVRocmVhZGVkU2Nyb2xsaW5nKToKKyAgICAgICAgKFdUUjo6VGVzdENv bnRyb2xsZXI6OnBsYXRmb3JtQ29uZmlndXJlVmlld0ZvclRlc3QpOgorCisyMDE1LTAyLTI1ICBC cmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAgICBMYXlvdXQgdGVzdCBz dXBwb3J0IGZvciB1c2VyIGNvbnRlbnQgZmlsdGVycwogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyMDE4CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9U ZXN0Q29udHJvbGxlci5jcHAKaW5kZXggMzVjMzM5Mi4uM2M3Y2JmMiAxMDA2NDQKLS0tIGEvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKKysrIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKQEAgLTcxNyw3ICs3MTcsNyBAQCBjb25zdCBj aGFyKiBUZXN0Q29udHJvbGxlcjo6bmV0d29ya1Byb2Nlc3NOYW1lKCkKIAogdm9pZCBUZXN0Q29u dHJvbGxlcjo6dXBkYXRlV2ViVmlld1NpemVGb3JUZXN0KGNvbnN0IFRlc3RJbnZvY2F0aW9uJiB0 ZXN0KQogewotICAgIGJvb2wgaXNTVkdXM0NUZXN0ID0gc3Ryc3RyKHRlc3QucGF0aE9yVVJMKCks ICJzdmcvVzNDLVNWRy0xLjEiKSB8fCBzdHJzdHIodGVzdC5wYXRoT3JVUkwoKSwgInN2Z1xcVzND LVNWRy0xLjEiKTsKKyAgICBib29sIGlzU1ZHVzNDVGVzdCA9IHRlc3QudXJsQ29udGFpbnMoInN2 Zy9XM0MtU1ZHLTEuMSIpIHx8IHRlc3QudXJsQ29udGFpbnMoInN2Z1xcVzNDLVNWRy0xLjEiKTsK IAogICAgIHVuc2lnbmVkIHdpZHRoID0gdmlld1dpZHRoOwogICAgIHVuc2lnbmVkIGhlaWdodCA9 IHZpZXdIZWlnaHQ7CkBAIC03MzEsMzMgKzczMSwzMiBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjp1 cGRhdGVXZWJWaWV3U2l6ZUZvclRlc3QoY29uc3QgVGVzdEludm9jYXRpb24mIHRlc3QpCiAKIHZv aWQgVGVzdENvbnRyb2xsZXI6OnVwZGF0ZVdpbmRvd1NjYWxlRm9yVGVzdChQbGF0Zm9ybVdlYlZp ZXcqIHZpZXcsIGNvbnN0IFRlc3RJbnZvY2F0aW9uJiB0ZXN0KQogewotICAgIFdURjo6U3RyaW5n IGxvY2FsUGF0aE9yVXJsID0gU3RyaW5nKHRlc3QucGF0aE9yVVJMKCkpOwotICAgIGJvb2wgbmVl ZHNIaWdoRFBJV2luZG93ID0gbG9jYWxQYXRoT3JVcmwuZmluZElnbm9yaW5nQ2FzZSgiL2hpZHBp LSIpICE9IG5vdEZvdW5kOworICAgIGJvb2wgbmVlZHNIaWdoRFBJV2luZG93ID0gdGVzdC51cmxD b250YWlucygiL2hpZHBpLSIpOwogICAgIHZpZXctPmNoYW5nZVdpbmRvd1NjYWxlSWZOZWVkZWQo bmVlZHNIaWdoRFBJV2luZG93ID8gMiA6IDEpOwogfQogCiAvLyBGSVhNRTogbW92ZSBpbnRvIHJl bGV2YW50IHBsYXRmb3JtQ29uZmlndXJlVmlld0ZvclRlc3QoKT8KLXN0YXRpYyBib29sIHNob3Vs ZFVzZUZpeGVkTGF5b3V0KGNvbnN0IGNoYXIqIHBhdGhPclVSTCkKK3N0YXRpYyBib29sIHNob3Vs ZFVzZUZpeGVkTGF5b3V0KGNvbnN0IFRlc3RJbnZvY2F0aW9uJiB0ZXN0KQogewogI2lmIEVOQUJM RShDU1NfREVWSUNFX0FEQVBUQVRJT04pCi0gICAgaWYgKHN0cnN0cihwYXRoT3JVUkwsICJkZXZp Y2UtYWRhcHQvIikgfHwgc3Ryc3RyKHBhdGhPclVSTCwgImRldmljZS1hZGFwdFxcIikpCisgICAg aWYgKHRlc3QudXJsQ29udGFpbnMoImRldmljZS1hZGFwdC8iKSB8fCB0ZXN0LnVybENvbnRhaW5z KCJkZXZpY2UtYWRhcHRcXCIpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICNlbmRpZgogCiAjaWYg VVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpICYmIFBMQVRGT1JNKEVGTCkKLSAgICBpZiAoc3Ryc3Ry KHBhdGhPclVSTCwgInN0aWNreS8iKSB8fCBzdHJzdHIocGF0aE9yVVJMLCAic3RpY2t5XFwiKSkK KyAgICBpZiAodGVzdC51cmxDb250YWlucygic3RpY2t5LyIpIHx8IHRlc3QudXJsQ29udGFpbnMo InN0aWNreVxcIikpCiAgICAgICAgIHJldHVybiB0cnVlOwogI2VuZGlmCiAgICAgcmV0dXJuIGZh bHNlOwogCi0gICAgVU5VU0VEX1BBUkFNKHBhdGhPclVSTCk7CisgICAgVU5VU0VEX1BBUkFNKHRl c3QpOwogfQogCiB2b2lkIFRlc3RDb250cm9sbGVyOjp1cGRhdGVMYXlvdXRUeXBlRm9yVGVzdChj b25zdCBUZXN0SW52b2NhdGlvbiYgdGVzdCkKIHsKICAgICBhdXRvIHZpZXdPcHRpb25zID0gYWRv cHRXSyhXS011dGFibGVEaWN0aW9uYXJ5Q3JlYXRlKCkpOwogICAgIGF1dG8gdXNlRml4ZWRMYXlv dXRLZXkgPSBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJVc2VGaXhlZExh eW91dCIpKTsKLSAgICBhdXRvIHVzZUZpeGVkTGF5b3V0VmFsdWUgPSBhZG9wdFdLKFdLQm9vbGVh bkNyZWF0ZShzaG91bGRVc2VGaXhlZExheW91dCh0ZXN0LnBhdGhPclVSTCgpKSkpOworICAgIGF1 dG8gdXNlRml4ZWRMYXlvdXRWYWx1ZSA9IGFkb3B0V0soV0tCb29sZWFuQ3JlYXRlKHNob3VsZFVz ZUZpeGVkTGF5b3V0KHRlc3QpKSk7CiAgICAgV0tEaWN0aW9uYXJ5U2V0SXRlbSh2aWV3T3B0aW9u cy5nZXQoKSwgdXNlRml4ZWRMYXlvdXRLZXkuZ2V0KCksIHVzZUZpeGVkTGF5b3V0VmFsdWUuZ2V0 KCkpOwogCiAgICAgZW5zdXJlVmlld1N1cHBvcnRzT3B0aW9ucyh2aWV3T3B0aW9ucy5nZXQoKSk7 CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcCBi L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uY3BwCmluZGV4IGFmMDI1Njgu LmVjYTljMTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRp b24uY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uY3BwCkBA IC05MSw3ICs5MSw2IEBAIHN0YXRpYyBXS1VSTFJlZiBjcmVhdGVXS1VSTChjb25zdCBjaGFyKiBw YXRoT3JVUkwpCiAKIFRlc3RJbnZvY2F0aW9uOjpUZXN0SW52b2NhdGlvbihjb25zdCBzdGQ6OnN0 cmluZyYgcGF0aE9yVVJMKQogICAgIDogbV91cmwoQWRvcHRXSywgY3JlYXRlV0tVUkwocGF0aE9y VVJMLmNfc3RyKCkpKQotICAgICwgbV9wYXRoT3JVUkwocGF0aE9yVVJMKQogICAgICwgbV9kdW1w UGl4ZWxzKGZhbHNlKQogICAgICwgbV90aW1lb3V0KDApCiAgICAgLCBtX2dvdEluaXRpYWxSZXNw b25zZShmYWxzZSkKQEAgLTEwMCw2ICs5OSwxNiBAQCBUZXN0SW52b2NhdGlvbjo6VGVzdEludm9j YXRpb24oY29uc3Qgc3RkOjpzdHJpbmcmIHBhdGhPclVSTCkKICAgICAsIG1fZXJyb3IoZmFsc2Up CiAgICAgLCBtX3dlYlByb2Nlc3NJc1VucmVzcG9uc2l2ZShmYWxzZSkKIHsKKyAgICBXS1JldGFp blB0cjxXS1N0cmluZ1JlZj4gdXJsU3RyaW5nID0gYWRvcHRXSyhXS1VSTENvcHlTdHJpbmcobV91 cmwuZ2V0KCkpKTsKKworICAgIHNpemVfdCBzdHJpbmdMZW5ndGggPSBXS1N0cmluZ0dldExlbmd0 aCh1cmxTdHJpbmcuZ2V0KCkpOworCisgICAgVmVjdG9yPGNoYXI+IHVybFZlY3RvcjsKKyAgICB1 cmxWZWN0b3IucmVzaXplKHN0cmluZ0xlbmd0aCArIDEpOworCisgICAgV0tTdHJpbmdHZXRVVEY4 Q1N0cmluZyh1cmxTdHJpbmcuZ2V0KCksIHVybFZlY3Rvci5kYXRhKCksIHN0cmluZ0xlbmd0aCAr IDEpOworCisgICAgbV91cmxTdHJpbmcgPSBTdHJpbmcodXJsVmVjdG9yLmRhdGEoKSwgc3RyaW5n TGVuZ3RoKTsKIH0KIAogVGVzdEludm9jYXRpb246On5UZXN0SW52b2NhdGlvbigpCkBAIC0xMTEs MjAgKzEyMCwyNSBAQCBXS1VSTFJlZiBUZXN0SW52b2NhdGlvbjo6dXJsKCkgY29uc3QKICAgICBy ZXR1cm4gbV91cmwuZ2V0KCk7CiB9CiAKK2Jvb2wgVGVzdEludm9jYXRpb246OnVybENvbnRhaW5z KGNvbnN0IGNoYXIqIHNlYXJjaFN0cmluZykgY29uc3QKK3sKKyAgICByZXR1cm4gbV91cmxTdHJp bmcuY29udGFpbnMoc2VhcmNoU3RyaW5nLCBmYWxzZSk7Cit9CisKIHZvaWQgVGVzdEludm9jYXRp b246OnNldElzUGl4ZWxUZXN0KGNvbnN0IHN0ZDo6c3RyaW5nJiBleHBlY3RlZFBpeGVsSGFzaCkK IHsKICAgICBtX2R1bXBQaXhlbHMgPSB0cnVlOwogICAgIG1fZXhwZWN0ZWRQaXhlbEhhc2ggPSBl eHBlY3RlZFBpeGVsSGFzaDsKIH0KIAotc3RhdGljIGJvb2wgc2hvdWxkTG9nRnJhbWVMb2FkRGVs ZWdhdGVzKGNvbnN0IGNoYXIqIHBhdGhPclVSTCkKK2Jvb2wgVGVzdEludm9jYXRpb246OnNob3Vs ZExvZ0ZyYW1lTG9hZERlbGVnYXRlcygpCiB7Ci0gICAgcmV0dXJuIHN0cnN0cihwYXRoT3JVUkws ICJsb2FkaW5nLyIpOworICAgIHJldHVybiB1cmxDb250YWlucygibG9hZGluZy8iKTsKIH0KIAot c3RhdGljIGJvb2wgc2hvdWxkTG9nSGlzdG9yeUNsaWVudENhbGxiYWNrcyhjb25zdCBjaGFyKiBw YXRoT3JVUkwpCitib29sIFRlc3RJbnZvY2F0aW9uOjpzaG91bGRMb2dIaXN0b3J5Q2xpZW50Q2Fs bGJhY2tzKCkKIHsKLSAgICByZXR1cm4gc3Ryc3RyKHBhdGhPclVSTCwgImdsb2JhbGhpc3Rvcnkv Iik7CisgICAgcmV0dXJuIHVybENvbnRhaW5zKCJnbG9iYWxoaXN0b3J5LyIpOwogfQogCiB2b2lk IFRlc3RJbnZvY2F0aW9uOjppbnZva2UoKQpAQCAtMTM1LDcgKzE0OSw3IEBAIHZvaWQgVGVzdElu dm9jYXRpb246Omludm9rZSgpCiAKICAgICBtX3RleHRPdXRwdXQuY2xlYXIoKTsKIAotICAgIFRl c3RDb250cm9sbGVyOjpzaW5nbGV0b24oKS5zZXRTaG91bGRMb2dIaXN0b3J5Q2xpZW50Q2FsbGJh Y2tzKHNob3VsZExvZ0hpc3RvcnlDbGllbnRDYWxsYmFja3MobV9wYXRoT3JVUkwuY19zdHIoKSkp OworICAgIFRlc3RDb250cm9sbGVyOjpzaW5nbGV0b24oKS5zZXRTaG91bGRMb2dIaXN0b3J5Q2xp ZW50Q2FsbGJhY2tzKHNob3VsZExvZ0hpc3RvcnlDbGllbnRDYWxsYmFja3MoKSk7CiAKICAgICAv LyBGSVhNRTogV2Ugc2hvdWxkIGNsZWFyIG91dCB2aXNpdGVkIGxpbmtzIGhlcmUuCiAKQEAgLTE0 Myw3ICsxNTcsNyBAQCB2b2lkIFRlc3RJbnZvY2F0aW9uOjppbnZva2UoKQogICAgIFdLUmV0YWlu UHRyPFdLTXV0YWJsZURpY3Rpb25hcnlSZWY+IGJlZ2luVGVzdE1lc3NhZ2VCb2R5ID0gYWRvcHRX SyhXS011dGFibGVEaWN0aW9uYXJ5Q3JlYXRlKCkpOwogCiAgICAgV0tSZXRhaW5QdHI8V0tTdHJp bmdSZWY+IGR1bXBGcmFtZUxvYWREZWxlZ2F0ZXNLZXkgPSBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRl V2l0aFVURjhDU3RyaW5nKCJEdW1wRnJhbWVMb2FkRGVsZWdhdGVzIikpOwotICAgIFdLUmV0YWlu UHRyPFdLQm9vbGVhblJlZj4gZHVtcEZyYW1lTG9hZERlbGVnYXRlc1ZhbHVlID0gYWRvcHRXSyhX S0Jvb2xlYW5DcmVhdGUoc2hvdWxkTG9nRnJhbWVMb2FkRGVsZWdhdGVzKG1fcGF0aE9yVVJMLmNf c3RyKCkpKSk7CisgICAgV0tSZXRhaW5QdHI8V0tCb29sZWFuUmVmPiBkdW1wRnJhbWVMb2FkRGVs ZWdhdGVzVmFsdWUgPSBhZG9wdFdLKFdLQm9vbGVhbkNyZWF0ZShzaG91bGRMb2dGcmFtZUxvYWRE ZWxlZ2F0ZXMoKSkpOwogICAgIFdLRGljdGlvbmFyeVNldEl0ZW0oYmVnaW5UZXN0TWVzc2FnZUJv ZHkuZ2V0KCksIGR1bXBGcmFtZUxvYWREZWxlZ2F0ZXNLZXkuZ2V0KCksIGR1bXBGcmFtZUxvYWRE ZWxlZ2F0ZXNWYWx1ZS5nZXQoKSk7CiAKICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gZHVt cFBpeGVsc0tleSA9IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoIkR1bXBQ aXhlbHMiKSk7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0 aW9uLmggYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmgKaW5kZXggYWY3 NjZhYS4uZmY3NjBlNyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52 b2NhdGlvbi5oCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uaApA QCAtNDAsNyArNDAsNyBAQCBwdWJsaWM6CiAgICAgflRlc3RJbnZvY2F0aW9uKCk7CiAKICAgICBX S1VSTFJlZiB1cmwoKSBjb25zdDsKLSAgICBjb25zdCBjaGFyKiBwYXRoT3JVUkwoKSBjb25zdCB7 IHJldHVybiBtX3BhdGhPclVSTC5jX3N0cigpOyB9CisgICAgYm9vbCB1cmxDb250YWlucyhjb25z dCBjaGFyKikgY29uc3Q7CiAKICAgICB2b2lkIHNldElzUGl4ZWxUZXN0KGNvbnN0IHN0ZDo6c3Ry aW5nJiBleHBlY3RlZFBpeGVsSGFzaCk7CiAKQEAgLTYzLDkgKzYzLDEyIEBAIHByaXZhdGU6CiAK ICAgICBzdGF0aWMgdm9pZCBmb3JjZVJlcGFpbnREb25lQ2FsbGJhY2soV0tFcnJvclJlZiwgdm9p ZCogY29udGV4dCk7CiAKKyAgICBib29sIHNob3VsZExvZ0ZyYW1lTG9hZERlbGVnYXRlcygpOwor ICAgIGJvb2wgc2hvdWxkTG9nSGlzdG9yeUNsaWVudENhbGxiYWNrcygpOworCiAgICAgV0tSZXRh aW5QdHI8V0tVUkxSZWY+IG1fdXJsOwotICAgIHN0ZDo6c3RyaW5nIG1fcGF0aE9yVVJMOwotICAg IAorICAgIFdURjo6U3RyaW5nIG1fdXJsU3RyaW5nOworCiAgICAgYm9vbCBtX2R1bXBQaXhlbHM7 CiAgICAgc3RkOjpzdHJpbmcgbV9leHBlY3RlZFBpeGVsSGFzaDsKIApkaWZmIC0tZ2l0IGEvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9pb3MvVGVzdENvbnRyb2xsZXJJT1MubW0gYi9Ub29scy9XZWJL aXRUZXN0UnVubmVyL2lvcy9UZXN0Q29udHJvbGxlcklPUy5tbQppbmRleCA2OGMxOTcxLi5mZGZl NDQ4IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2lvcy9UZXN0Q29udHJvbGxl cklPUy5tbQorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2lvcy9UZXN0Q29udHJvbGxlcklP Uy5tbQpAQCAtNzUsOSArNzUsOSBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpwbGF0Zm9ybVdpbGxS dW5UZXN0KGNvbnN0IFRlc3RJbnZvY2F0aW9uJiB0ZXN0SW52b2NhdGlvbikKICAgICBzZXRDcmFz aFJlcG9ydEFwcGxpY2F0aW9uU3BlY2lmaWNJbmZvcm1hdGlvblRvVVJMKHRlc3RJbnZvY2F0aW9u LnVybCgpKTsKIH0KIAotc3RhdGljIGJvb2wgc2hvdWxkTWFrZVZpZXdwb3J0RmxleGlibGUoY29u c3QgY2hhciogcGF0aE9yVVJMKQorc3RhdGljIGJvb2wgc2hvdWxkTWFrZVZpZXdwb3J0RmxleGli bGUoY29uc3QgVGVzdEludm9jYXRpb24mIHRlc3QpCiB7Ci0gICAgcmV0dXJuIHN0cnN0cihwYXRo T3JVUkwsICJ2aWV3cG9ydC8iKTsKKyAgICByZXR1cm4gdGVzdC51cmxDb250YWlucygidmlld3Bv cnQvIik7CiB9CiAKIHZvaWQgVGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtUmVzZXRQcmVmZXJlbmNl c1RvQ29uc2lzdGVudFZhbHVlcygpCkBAIC04OSw3ICs4OSw3IEBAIHZvaWQgVGVzdENvbnRyb2xs ZXI6OnBsYXRmb3JtUmVzZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcygpCiAKIHZvaWQg VGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtQ29uZmlndXJlVmlld0ZvclRlc3QoY29uc3QgVGVzdElu dm9jYXRpb24mIHRlc3QpCiB7Ci0gICAgaWYgKHNob3VsZE1ha2VWaWV3cG9ydEZsZXhpYmxlKHRl c3QucGF0aE9yVVJMKCkpKSB7CisgICAgaWYgKHNob3VsZE1ha2VWaWV3cG9ydEZsZXhpYmxlKHRl c3QpKSB7CiAgICAgICAgIGNvbnN0IHVuc2lnbmVkIHBob25lVmlld0hlaWdodCA9IDQ4MDsKICAg ICAgICAgY29uc3QgdW5zaWduZWQgcGhvbmVWaWV3V2lkdGggPSAzMjA7CiAKZGlmZiAtLWdpdCBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL1Rlc3RDb250cm9sbGVyTWFjLm1tIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9tYWMvVGVzdENvbnRyb2xsZXJNYWMubW0KaW5kZXggN2QyY2VjOC4u OWViY2VjNCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvVGVzdENvbnRy b2xsZXJNYWMubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvVGVzdENvbnRyb2xs ZXJNYWMubW0KQEAgLTc1LDkgKzc1LDkgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1X aWxsUnVuVGVzdChjb25zdCBUZXN0SW52b2NhdGlvbiYgdGVzdEludm9jYXRpb24pCiAgICAgc2V0 Q3Jhc2hSZXBvcnRBcHBsaWNhdGlvblNwZWNpZmljSW5mb3JtYXRpb25Ub1VSTCh0ZXN0SW52b2Nh dGlvbi51cmwoKSk7CiB9CiAKLXN0YXRpYyBib29sIHNob3VsZFVzZVRocmVhZGVkU2Nyb2xsaW5n KGNvbnN0IGNoYXIqIHBhdGhPclVSTCkKK3N0YXRpYyBib29sIHNob3VsZFVzZVRocmVhZGVkU2Ny b2xsaW5nKGNvbnN0IFRlc3RJbnZvY2F0aW9uJiB0ZXN0KQogewotICAgIHJldHVybiBzdHJzdHIo cGF0aE9yVVJMLCAidGlsZWQtZHJhd2luZy8iKTsKKyAgICByZXR1cm4gdGVzdC51cmxDb250YWlu cygidGlsZWQtZHJhd2luZy8iKTsKIH0KIAogdm9pZCBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1S ZXNldFByZWZlcmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKCkKQEAgLTg4LDcgKzg4LDcgQEAgdm9p ZCBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1Db25maWd1cmVWaWV3Rm9yVGVzdChjb25zdCBUZXN0 SW52b2NhdGlvbiYgdGVzdCkKIHsKICAgICBhdXRvIHZpZXdPcHRpb25zID0gYWRvcHRXSyhXS011 dGFibGVEaWN0aW9uYXJ5Q3JlYXRlKCkpOwogICAgIGF1dG8gdXNlVGhyZWFkZWRTY3JvbGxpbmdL ZXkgPSBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJUaHJlYWRlZFNjcm9s bGluZyIpKTsKLSAgICBhdXRvIHVzZVRocmVhZGVkU2Nyb2xsaW5nVmFsdWUgPSBhZG9wdFdLKFdL Qm9vbGVhbkNyZWF0ZShzaG91bGRVc2VUaHJlYWRlZFNjcm9sbGluZyh0ZXN0LnBhdGhPclVSTCgp KSkpOworICAgIGF1dG8gdXNlVGhyZWFkZWRTY3JvbGxpbmdWYWx1ZSA9IGFkb3B0V0soV0tCb29s ZWFuQ3JlYXRlKHNob3VsZFVzZVRocmVhZGVkU2Nyb2xsaW5nKHRlc3QpKSk7CiAgICAgV0tEaWN0 aW9uYXJ5U2V0SXRlbSh2aWV3T3B0aW9ucy5nZXQoKSwgdXNlVGhyZWFkZWRTY3JvbGxpbmdLZXku Z2V0KCksIHVzZVRocmVhZGVkU2Nyb2xsaW5nVmFsdWUuZ2V0KCkpOwogCiAgICAgYXV0byB1c2VS ZW1vdGVMYXllclRyZWVLZXkgPSBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5n KCJSZW1vdGVMYXllclRyZWUiKSk7CkBAIC05NywxNSArOTcsMTAgQEAgdm9pZCBUZXN0Q29udHJv bGxlcjo6cGxhdGZvcm1Db25maWd1cmVWaWV3Rm9yVGVzdChjb25zdCBUZXN0SW52b2NhdGlvbiYg dGVzdCkKIAogICAgIGVuc3VyZVZpZXdTdXBwb3J0c09wdGlvbnModmlld09wdGlvbnMuZ2V0KCkp OwogCi0gICAgV0tVUkxSZWYgdXJsID0gdGVzdC51cmwoKTsKLSAgICBXS1JldGFpblB0cjxXS1N0 cmluZ1JlZj4gdXJsU3RyaW5nID0gYWRvcHRXSyhXS1VSTENvcHlTdHJpbmcodXJsKSk7Ci0KLSAg ICBjaGFyIHVybENTdHJpbmdbMTYzODRdOwotICAgIFdLU3RyaW5nR2V0VVRGOENTdHJpbmcodXJs U3RyaW5nLmdldCgpLCB1cmxDU3RyaW5nLCAxNjM4NCk7Ci0gICAgaWYgKCFzdHJzdHIodXJsQ1N0 cmluZywgInVzZXJjb250ZW50ZmlsdGVyLyIpKQorICAgIGlmICghdGVzdC51cmxDb250YWlucygi dXNlcmNvbnRlbnRmaWx0ZXIvIikpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJldGFpblB0cjxD RlVSTFJlZj4gdGVzdFVSTCA9IGFkb3B0Q0YoV0tVUkxDb3B5Q0ZVUkwoa0NGQWxsb2NhdG9yRGVm YXVsdCwgdXJsKSk7CisgICAgUmV0YWluUHRyPENGVVJMUmVmPiB0ZXN0VVJMID0gYWRvcHRDRihX S1VSTENvcHlDRlVSTChrQ0ZBbGxvY2F0b3JEZWZhdWx0LCB0ZXN0LnVybCgpKSk7CiAgICAgTlNV UkwgKmZpbHRlclVSTCA9IFsoTlNVUkwgKil0ZXN0VVJMLmdldCgpIFVSTEJ5QXBwZW5kaW5nUGF0 aEV4dGVuc2lvbjpAImpzb24iXTsKIAogICAgIE5TU3RyaW5nRW5jb2RpbmcgZW5jb2Rpbmc7Cg==