71567 2011-11-04 10:12:57 -0700 [NRWT] Make single_test_runner aware of test_input.ref_file. 2011-11-08 21:45:12 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66295 1 hayato hayato abarth dpranke ojan rniwa webkit.review.bot oldest_to_newest 496263 0 hayato 2011-11-04 10:12:57 -0700 To support w3c reftests, single_test_runner should be aware of test_input.ref_file (which depends on bug 66937). If the ref_file is given, single_test_runner should use that file as reference_file of the test, instead of trying to find '-expected.html' file. 496289 1 113677 hayato 2011-11-04 10:44:25 -0700 Created attachment 113677 WIP. 496482 2 hayato 2011-11-04 14:40:14 -0700 This WIP patch should work on the top of the patch in bug 66937, though there remains an issue of displaying the result. See bug 71574. I'll add tests later. 497772 3 113677 ojan 2011-11-07 23:27:11 -0800 Comment on attachment 113677 WIP. Does this break the existing reftests? If we can keep this working, then we can commit this patch without waiting for bug 66837 to be resolved. Eventually, whether we use manifests or link elements, we can populate the test_input element appropriately to make this code work. 497776 4 rniwa 2011-11-07 23:29:49 -0800 (In reply to comment #3) > (From update of attachment 113677 [details]) > Does this break the existing reftests? If we can keep this working, then we can commit this patch without waiting for bug 66837 to be resolved. Eventually, whether we use manifests or link elements, we can populate the test_input element appropriately to make this code work. I don't think it makes sense to land this patch unless we're parsing reftest.list. Since we don't need to pass any information from manager to single_test_runner if we're parsing link element. 497814 5 hayato 2011-11-08 00:50:10 -0800 (In reply to comment #3) > (From update of attachment 113677 [details]) > Does this break the existing reftests? If we can keep this working, then we can commit this patch without waiting for bug 66837 to be resolved. Eventually, whether we use manifests or link elements, we can populate the test_input element appropriately to make this code work. Yes, this patch is intended to work on either we use manifest file or link elements. I assumed that caller should pass reference file name. It is possible to make this patch not break existing reftests and independent of bug 66837. 498629 6 114202 hayato 2011-11-08 21:09:04 -0800 Created attachment 114202 aware test_input.ref_file 498632 7 hayato 2011-11-08 21:18:47 -0800 I'll land this patch. The patch now works without bug 66837 and doesn't not break existing reftests. I'll address bug 71574, which also doesn't affect existing reftests, later. 498644 8 hayato 2011-11-08 21:45:12 -0800 Committed r99651: <http://trac.webkit.org/changeset/99651> 113677 2011-11-04 10:44:25 -0700 2011-11-08 21:08:59 -0800 WIP. bug-71567-20111105024423.patch text/plain 5782 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogOTkxODAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhOWVkNWViYzhiNWRiZDVhNDNiOTgwNDQ2ZDk0OGM3MWJh MDhlZGFmLi5hZmJlYWEyOTUyYmRmZjE0Y2UwNjBmYmQwMjZiNmQ5ODI1YzNhN2Q1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMTEtMDQgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFtOUldUXSBNYWtlIHNpbmdsZV90ZXN0X3J1bm5lciBhd2FyZSBvZiByZWZlcmVuY2UgZmls ZW5hbWUgb2YgdGVzdF9pbnB1dC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTcxNTY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTWFrZSBzaW5nbGVfdGVzdF9ydW5uZXIgaG9ub3IgYSByZWZlcmVuY2UgZmls ZW5hbWUgb2YgZ2l2ZW4gdGVzdF9pbnB1dCBzbyB0aGF0CisgICAgICAgIHdlIGNhbiB1c2UgYW55 IGZpbGUgYXMgcmVmZXJlbmNlIGh0bWwsIGluc3RlYWQgb2YgbmFtaW5nIGNvbnZlbnRpb24uCisg ICAgICAgIFRoZSB0eXBpY2FsIHVzZSBjYXNlIGlzIHRvIHN1cHBvcnQgdzNjIHJlZnRlc3RzLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2lu Z2xlX3Rlc3RfcnVubmVyLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2xheW91dF9wYWNrYWdlL3Rlc3RfcmVzdWx0X3dyaXRlci5weToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9mYWlsdXJlcy5weToKKwogMjAx MS0xMS0wMyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS10gW1dLMl0gdHRmLWxpYmVyYXRpb24gZm9udHMgbW92ZWQgdG8gYSBuZXcgbG9jYXRp b24gKGluIERlYmlhbikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQpp bmRleCAxNzY3MzczYmM4NGVlMjdmYjNlMDg0NTM0YzA0YzZlZjdlNTUyMjBlLi4yYzZlZWRkNmJm MmVlYThjMjUxZmE3MWE0MmNhMGMzOWVjNjE4ZGRkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2lu Z2xlX3Rlc3RfcnVubmVyLnB5CkBAIC02MSw2ICs2MSwxMiBAQCBjbGFzcyBTaW5nbGVUZXN0UnVu bmVyOgogICAgICAgICBzZWxmLl9yZWZlcmVuY2VfZmlsZW5hbWUgPSBOb25lCiAKICAgICAgICAg ZnMgPSBwb3J0Ll9maWxlc3lzdGVtCisgICAgICAgIGlmIHRlc3RfaW5wdXQucmVmX2ZpbGU6Cisg ICAgICAgICAgICBzZWxmLl9pc19yZWZ0ZXN0ID0gVHJ1ZQorICAgICAgICAgICAgc2VsZi5fcmVm ZXJlbmNlX2ZpbGVuYW1lID0gZnMuam9pbihzZWxmLl9wb3J0LmxheW91dF90ZXN0c19kaXIoKSwg dGVzdF9pbnB1dC5yZWZfZmlsZSkKKyAgICAgICAgICAgIHNlbGYuX2lzX21pc21hdGNoX3JlZnRl c3QgPSB0ZXN0X2lucHV0LmlzX21pc21hdGNoCisgICAgICAgICAgICByZXR1cm4KKwogICAgICAg ICByZWZ0ZXN0X2V4cGVjdGVkX2ZpbGVuYW1lID0gcG9ydC5yZWZ0ZXN0X2V4cGVjdGVkX2ZpbGVu YW1lKHNlbGYuX3Rlc3RfbmFtZSkKICAgICAgICAgaWYgZnMuZXhpc3RzKHJlZnRlc3RfZXhwZWN0 ZWRfZmlsZW5hbWUpOgogICAgICAgICAgICAgc2VsZi5faXNfcmVmdGVzdCA9IFRydWUKQEAgLTMw NCw3ICszMTAsNyBAQCBjbGFzcyBTaW5nbGVUZXN0UnVubmVyOgogCiAgICAgICAgIGlmIHNlbGYu X2lzX21pc21hdGNoX3JlZnRlc3Q6CiAgICAgICAgICAgICBpZiBkcml2ZXJfb3V0cHV0MS5pbWFn ZV9oYXNoID09IGRyaXZlcl9vdXRwdXQyLmltYWdlX2hhc2g6Ci0gICAgICAgICAgICAgICAgZmFp bHVyZXMuYXBwZW5kKHRlc3RfZmFpbHVyZXMuRmFpbHVyZVJlZnRlc3RNaXNtYXRjaERpZE5vdE9j Y3VyKCkpCisgICAgICAgICAgICAgICAgZmFpbHVyZXMuYXBwZW5kKHRlc3RfZmFpbHVyZXMuRmFp bHVyZVJlZnRlc3RNaXNtYXRjaERpZE5vdE9jY3VyKHNlbGYuX3JlZmVyZW5jZV9maWxlbmFtZSkp CiAgICAgICAgIGVsaWYgZHJpdmVyX291dHB1dDEuaW1hZ2VfaGFzaCAhPSBkcml2ZXJfb3V0cHV0 Mi5pbWFnZV9oYXNoOgotICAgICAgICAgICAgZmFpbHVyZXMuYXBwZW5kKHRlc3RfZmFpbHVyZXMu RmFpbHVyZVJlZnRlc3RNaXNtYXRjaCgpKQorICAgICAgICAgICAgZmFpbHVyZXMuYXBwZW5kKHRl c3RfZmFpbHVyZXMuRmFpbHVyZVJlZnRlc3RNaXNtYXRjaChzZWxmLl9yZWZlcmVuY2VfZmlsZW5h bWUpKQogICAgICAgICByZXR1cm4gVGVzdFJlc3VsdChzZWxmLl90ZXN0X25hbWUsIGZhaWx1cmVz LCB0b3RhbF90ZXN0X3RpbWUsIGhhc19zdGRlcnIpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X3Jlc3VsdF93cml0ZXIu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90 ZXN0X3Jlc3VsdF93cml0ZXIucHkKaW5kZXggMDNlOTVkODdhZGRlN2Q5MDdjNDVkYTA2YjUxYzcy YWQyNzk0ZWNmNS4uMGEyZWI3OGI1NDk3ZDk4NmU1NGQ2NmM2NGYxMmRkZTRiMThiZDlmNyAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2th Z2UvdGVzdF9yZXN1bHRfd3JpdGVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3RfcmVzdWx0X3dyaXRlci5weQpAQCAtNzMsMTAg KzczLDEwIEBAIGRlZiB3cml0ZV90ZXN0X3Jlc3VsdChwb3J0LCB0ZXN0X25hbWUsIGRyaXZlcl9v dXRwdXQsCiAgICAgICAgICAgICBpbWFnZV9kaWZmID0gcG9ydC5kaWZmX2ltYWdlKGRyaXZlcl9v dXRwdXQuaW1hZ2UsIGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQuaW1hZ2UpWzBdCiAgICAgICAgICAg ICBpZiBpbWFnZV9kaWZmOgogICAgICAgICAgICAgICAgIHdyaXRlci53cml0ZV9pbWFnZV9kaWZm X2ZpbGVzKGltYWdlX2RpZmYpCi0gICAgICAgICAgICB3cml0ZXIuY29weV9maWxlKHBvcnQucmVm dGVzdF9leHBlY3RlZF9maWxlbmFtZSh0ZXN0X25hbWUpLCAnLWV4cGVjdGVkLmh0bWwnKQorICAg ICAgICAgICAgd3JpdGVyLmNvcHlfZmlsZShmYWlsdXJlLnJlZmVyZW5jZV9maWxlbmFtZSkKICAg ICAgICAgZWxpZiBpc2luc3RhbmNlKGZhaWx1cmUsIHRlc3RfZmFpbHVyZXMuRmFpbHVyZVJlZnRl c3RNaXNtYXRjaERpZE5vdE9jY3VyKToKICAgICAgICAgICAgIHdyaXRlci53cml0ZV9pbWFnZV9m aWxlcyhkcml2ZXJfb3V0cHV0LmltYWdlLCBleHBlY3RlZF9pbWFnZT1Ob25lKQotICAgICAgICAg ICAgd3JpdGVyLmNvcHlfZmlsZShwb3J0LnJlZnRlc3RfZXhwZWN0ZWRfbWlzbWF0Y2hfZmlsZW5h bWUodGVzdF9uYW1lKSwgJy1leHBlY3RlZC1taXNtYXRjaC5odG1sJykKKyAgICAgICAgICAgIHdy aXRlci5jb3B5X2ZpbGUoZmFpbHVyZS5yZWZlcmVuY2VfZmlsZW5hbWUpCiAgICAgICAgIGVsc2U6 CiAgICAgICAgICAgICBhc3NlcnQgaXNpbnN0YW5jZShmYWlsdXJlLCAodGVzdF9mYWlsdXJlcy5G YWlsdXJlVGltZW91dCwpKQogCkBAIC0yNjQsOSArMjY0LDEwIEBAIERpZmZlcmVuY2UgYmV0d2Vl biBpbWFnZXM6IDxhIGhyZWY9IiUoZGlmZl9maWxlbmFtZSlzIj5kaWZmPC9hPjxicj4KICAgICAg ICAgIyBGSVhNRTogVGhpcyBzZWVtcyBsaWtlIGEgdGV4dCBmaWxlLCBub3QgYSBiaW5hcnkgZmls ZS4KICAgICAgICAgc2VsZi5fcG9ydC5fZmlsZXN5c3RlbS53cml0ZV9iaW5hcnlfZmlsZShkaWZm c19odG1sX2ZpbGVuYW1lLCBodG1sKQogCi0gICAgZGVmIGNvcHlfZmlsZShzZWxmLCBzcmNfZmls ZXBhdGgsIGRzdF9leHRlbnNpb24pOgorICAgIGRlZiBjb3B5X2ZpbGUoc2VsZiwgc3JjX2ZpbGVw YXRoKToKICAgICAgICAgZnMgPSBzZWxmLl9wb3J0Ll9maWxlc3lzdGVtCiAgICAgICAgIGFzc2Vy dCBmcy5leGlzdHMoc3JjX2ZpbGVwYXRoKSwgJ3NyY19maWxlcGF0aDogJXMnICUgc3JjX2ZpbGVw YXRoCi0gICAgICAgIGRzdF9maWxlbmFtZSA9IHNlbGYub3V0cHV0X2ZpbGVuYW1lKGRzdF9leHRl bnNpb24pCisgICAgICAgIGRzdF9maWxlcGF0aCA9IGZzLmpvaW4oc2VsZi5fcm9vdF9vdXRwdXRf ZGlyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3BvcnQucmVsYXRpdmVf dGVzdF9maWxlbmFtZShzcmNfZmlsZXBhdGgpKQogICAgICAgICBzZWxmLl9tYWtlX291dHB1dF9k aXJlY3RvcnkoKQotICAgICAgICBmcy5jb3B5ZmlsZShzcmNfZmlsZXBhdGgsIGRzdF9maWxlbmFt ZSkKKyAgICAgICAgZnMuY29weWZpbGUoc3JjX2ZpbGVwYXRoLCBkc3RfZmlsZXBhdGgpCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9m YWlsdXJlcy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90 ZXN0X2ZhaWx1cmVzLnB5CmluZGV4IDhhYmRlMzVhNjc1ODFjYjA4NTNkZmRhZDllYTY4MmFiYzUw ZmI3OTEuLmMzNTIxZWM5OTk0MTFmNjE3OGYxMDZmN2M1ZjVmZjM5MjgzYzUzYzkgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2ZhaWx1 cmVzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90 ZXN0X2ZhaWx1cmVzLnB5CkBAIC0xODYsNiArMTg2LDkgQEAgY2xhc3MgRmFpbHVyZUltYWdlSGFz aEluY29ycmVjdChUZXN0RmFpbHVyZSk6CiBjbGFzcyBGYWlsdXJlUmVmdGVzdE1pc21hdGNoKFRl c3RGYWlsdXJlKToKICAgICAiIiJUaGUgcmVzdWx0IGRpZG4ndCBtYXRjaCB0aGUgcmVmZXJlbmNl IHJlbmRlcmluZy4iIiIKIAorICAgIGRlZiBfX2luaXRfXyhzZWxmLCByZWZlcmVuY2VfZmlsZW5h bWUpOgorICAgICAgICBzZWxmLnJlZmVyZW5jZV9maWxlbmFtZSA9IHJlZmVyZW5jZV9maWxlbmFt ZQorCiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBtZXNzYWdlKCk6CiAgICAgICAgIHJldHVy biAiTWlzbWF0Y2ggd2l0aCByZWZlcmVuY2UiCkBAIC0xOTQsNiArMTk3LDkgQEAgY2xhc3MgRmFp bHVyZVJlZnRlc3RNaXNtYXRjaChUZXN0RmFpbHVyZSk6CiBjbGFzcyBGYWlsdXJlUmVmdGVzdE1p c21hdGNoRGlkTm90T2NjdXIoVGVzdEZhaWx1cmUpOgogICAgICIiIlVuZXhwZWN0ZWQgbWF0Y2gg YmV0d2VlbiB0aGUgcmVzdWx0IGFuZCB0aGUgcmVmZXJlbmNlIHJlbmRlcmluZy4iIiIKIAorICAg IGRlZiBfX2luaXRfXyhzZWxmLCByZWZlcmVuY2VfZmlsZW5hbWUpOgorICAgICAgICBzZWxmLnJl ZmVyZW5jZV9maWxlbmFtZSA9IHJlZmVyZW5jZV9maWxlbmFtZQorCiAgICAgQHN0YXRpY21ldGhv ZAogICAgIGRlZiBtZXNzYWdlKCk6CiAgICAgICAgIHJldHVybiAiTWlzbWF0Y2ggd2l0aCB0aGUg cmVmZXJlbmNlIGRpZCBub3Qgb2NjdXIiCg== 114202 2011-11-08 21:09:04 -0800 2011-11-08 21:15:59 -0800 aware test_input.ref_file bug-71567-20111109140902.patch text/plain 7362 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogOTkxODAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhOWVkNWViYzhiNWRiZDVhNDNiOTgwNDQ2ZDk0OGM3MWJh MDhlZGFmLi41ZTMyZTk3NGE4ZGEwZDNlOWE4ZTk1ZTk3MmM4NGQ5NzkzMGExYmIxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMTEtMDggIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFtOUldUXSBNYWtlIHNpbmdsZV90ZXN0X3J1bm5lciBhd2FyZSBvZiByZWZlcmVuY2UgZmls ZW5hbWUgb2YgdGVzdF9pbnB1dC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTcxNTY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTWFrZSBzaW5nbGVfdGVzdF9ydW5uZXIgaG9ub3IgYSByZWZlcmVuY2UgZmls ZW5hbWUgb2YgZ2l2ZW4gdGVzdF9pbnB1dCBzbyB0aGF0CisgICAgICAgIHdlIGNhbiB1c2UgYW55 IGZpbGUgYXMgcmVmZXJlbmNlIGh0bWwsIGluc3RlYWQgb2YgZGVwZW5kaW5nIG9uIGltcGxpY2l0 IG5hbWluZyBjb252ZW50aW9uLgorICAgICAgICBUaGUgdHlwaWNhbCB1c2UgY2FzZSBpcyB0byBz dXBwb3J0IHczYyByZWZ0ZXN0cy4KKworICAgICAgICBObyB0ZXN0cyBzaW5jZSBubyBmdW5jdGlv bmFsIGNoYW5nZXMgdW50aWwgdGhlcmUgaXMgYSBjbGllbnQuCisgICAgICAgIFRlc3Qgc2hvdWxk IGJlIGVhc2lseSB3cml0dGVuIHdpdGggZnV0dXJlIGNsaWVudHMuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIu cHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2th Z2UvdGVzdF9yZXN1bHRfd3JpdGVyLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL21vZGVscy90ZXN0X2ZhaWx1cmVzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2lucHV0LnB5OgorCiAyMDExLTExLTAzICBQ aGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBb V0syXSB0dGYtbGliZXJhdGlvbiBmb250cyBtb3ZlZCB0byBhIG5ldyBsb2NhdGlvbiAoaW4gRGVi aWFuKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CmluZGV4IDE3Njcz NzNiYzg0ZWUyN2ZiM2UwODQ1MzRjMDRjNmVmN2U1NTIyMGUuLmM0OWZhM2QyODFiYTRkMTViMTkw M2VkNWVkNDlmZTE0MmVlYWJhOWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9y dW5uZXIucHkKQEAgLTYxLDYgKzYxLDEyIEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXI6CiAgICAg ICAgIHNlbGYuX3JlZmVyZW5jZV9maWxlbmFtZSA9IE5vbmUKIAogICAgICAgICBmcyA9IHBvcnQu X2ZpbGVzeXN0ZW0KKyAgICAgICAgaWYgdGVzdF9pbnB1dC5yZWZfZmlsZToKKyAgICAgICAgICAg IHNlbGYuX2lzX3JlZnRlc3QgPSBUcnVlCisgICAgICAgICAgICBzZWxmLl9yZWZlcmVuY2VfZmls ZW5hbWUgPSBmcy5qb2luKHNlbGYuX3BvcnQubGF5b3V0X3Rlc3RzX2RpcigpLCB0ZXN0X2lucHV0 LnJlZl9maWxlKQorICAgICAgICAgICAgc2VsZi5faXNfbWlzbWF0Y2hfcmVmdGVzdCA9IHRlc3Rf aW5wdXQuaXNfbWlzbWF0Y2hfcmVmdGVzdAorICAgICAgICAgICAgcmV0dXJuCisKICAgICAgICAg cmVmdGVzdF9leHBlY3RlZF9maWxlbmFtZSA9IHBvcnQucmVmdGVzdF9leHBlY3RlZF9maWxlbmFt ZShzZWxmLl90ZXN0X25hbWUpCiAgICAgICAgIGlmIGZzLmV4aXN0cyhyZWZ0ZXN0X2V4cGVjdGVk X2ZpbGVuYW1lKToKICAgICAgICAgICAgIHNlbGYuX2lzX3JlZnRlc3QgPSBUcnVlCkBAIC0zMDQs NyArMzEwLDcgQEAgY2xhc3MgU2luZ2xlVGVzdFJ1bm5lcjoKIAogICAgICAgICBpZiBzZWxmLl9p c19taXNtYXRjaF9yZWZ0ZXN0OgogICAgICAgICAgICAgaWYgZHJpdmVyX291dHB1dDEuaW1hZ2Vf aGFzaCA9PSBkcml2ZXJfb3V0cHV0Mi5pbWFnZV9oYXNoOgotICAgICAgICAgICAgICAgIGZhaWx1 cmVzLmFwcGVuZCh0ZXN0X2ZhaWx1cmVzLkZhaWx1cmVSZWZ0ZXN0TWlzbWF0Y2hEaWROb3RPY2N1 cigpKQorICAgICAgICAgICAgICAgIGZhaWx1cmVzLmFwcGVuZCh0ZXN0X2ZhaWx1cmVzLkZhaWx1 cmVSZWZ0ZXN0TWlzbWF0Y2hEaWROb3RPY2N1cihzZWxmLl9yZWZlcmVuY2VfZmlsZW5hbWUpKQog ICAgICAgICBlbGlmIGRyaXZlcl9vdXRwdXQxLmltYWdlX2hhc2ggIT0gZHJpdmVyX291dHB1dDIu aW1hZ2VfaGFzaDoKLSAgICAgICAgICAgIGZhaWx1cmVzLmFwcGVuZCh0ZXN0X2ZhaWx1cmVzLkZh aWx1cmVSZWZ0ZXN0TWlzbWF0Y2goKSkKKyAgICAgICAgICAgIGZhaWx1cmVzLmFwcGVuZCh0ZXN0 X2ZhaWx1cmVzLkZhaWx1cmVSZWZ0ZXN0TWlzbWF0Y2goc2VsZi5fcmVmZXJlbmNlX2ZpbGVuYW1l KSkKICAgICAgICAgcmV0dXJuIFRlc3RSZXN1bHQoc2VsZi5fdGVzdF9uYW1lLCBmYWlsdXJlcywg dG90YWxfdGVzdF90aW1lLCBoYXNfc3RkZXJyKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9yZXN1bHRfd3JpdGVyLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVz dF9yZXN1bHRfd3JpdGVyLnB5CmluZGV4IDAzZTk1ZDg3YWRkZTdkOTA3YzQ1ZGEwNmI1MWM3MmFk Mjc5NGVjZjUuLjhhNWUxODBlOTE2ODJiY2NkYTk2NjViZDJhOGM4NTExYjdjMWI5MTkgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdl L3Rlc3RfcmVzdWx0X3dyaXRlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X3Jlc3VsdF93cml0ZXIucHkKQEAgLTczLDEwICs3 MywxMCBAQCBkZWYgd3JpdGVfdGVzdF9yZXN1bHQocG9ydCwgdGVzdF9uYW1lLCBkcml2ZXJfb3V0 cHV0LAogICAgICAgICAgICAgaW1hZ2VfZGlmZiA9IHBvcnQuZGlmZl9pbWFnZShkcml2ZXJfb3V0 cHV0LmltYWdlLCBleHBlY3RlZF9kcml2ZXJfb3V0cHV0LmltYWdlKVswXQogICAgICAgICAgICAg aWYgaW1hZ2VfZGlmZjoKICAgICAgICAgICAgICAgICB3cml0ZXIud3JpdGVfaW1hZ2VfZGlmZl9m aWxlcyhpbWFnZV9kaWZmKQotICAgICAgICAgICAgd3JpdGVyLmNvcHlfZmlsZShwb3J0LnJlZnRl c3RfZXhwZWN0ZWRfZmlsZW5hbWUodGVzdF9uYW1lKSwgJy1leHBlY3RlZC5odG1sJykKKyAgICAg ICAgICAgIHdyaXRlci5jb3B5X2ZpbGUoZmFpbHVyZS5yZWZlcmVuY2VfZmlsZW5hbWUpCiAgICAg ICAgIGVsaWYgaXNpbnN0YW5jZShmYWlsdXJlLCB0ZXN0X2ZhaWx1cmVzLkZhaWx1cmVSZWZ0ZXN0 TWlzbWF0Y2hEaWROb3RPY2N1cik6CiAgICAgICAgICAgICB3cml0ZXIud3JpdGVfaW1hZ2VfZmls ZXMoZHJpdmVyX291dHB1dC5pbWFnZSwgZXhwZWN0ZWRfaW1hZ2U9Tm9uZSkKLSAgICAgICAgICAg IHdyaXRlci5jb3B5X2ZpbGUocG9ydC5yZWZ0ZXN0X2V4cGVjdGVkX21pc21hdGNoX2ZpbGVuYW1l KHRlc3RfbmFtZSksICctZXhwZWN0ZWQtbWlzbWF0Y2guaHRtbCcpCisgICAgICAgICAgICB3cml0 ZXIuY29weV9maWxlKGZhaWx1cmUucmVmZXJlbmNlX2ZpbGVuYW1lKQogICAgICAgICBlbHNlOgog ICAgICAgICAgICAgYXNzZXJ0IGlzaW5zdGFuY2UoZmFpbHVyZSwgKHRlc3RfZmFpbHVyZXMuRmFp bHVyZVRpbWVvdXQsKSkKIApAQCAtMjY0LDkgKzI2NCw5IEBAIERpZmZlcmVuY2UgYmV0d2VlbiBp bWFnZXM6IDxhIGhyZWY9IiUoZGlmZl9maWxlbmFtZSlzIj5kaWZmPC9hPjxicj4KICAgICAgICAg IyBGSVhNRTogVGhpcyBzZWVtcyBsaWtlIGEgdGV4dCBmaWxlLCBub3QgYSBiaW5hcnkgZmlsZS4K ICAgICAgICAgc2VsZi5fcG9ydC5fZmlsZXN5c3RlbS53cml0ZV9iaW5hcnlfZmlsZShkaWZmc19o dG1sX2ZpbGVuYW1lLCBodG1sKQogCi0gICAgZGVmIGNvcHlfZmlsZShzZWxmLCBzcmNfZmlsZXBh dGgsIGRzdF9leHRlbnNpb24pOgorICAgIGRlZiBjb3B5X2ZpbGUoc2VsZiwgc3JjX2ZpbGVwYXRo KToKICAgICAgICAgZnMgPSBzZWxmLl9wb3J0Ll9maWxlc3lzdGVtCiAgICAgICAgIGFzc2VydCBm cy5leGlzdHMoc3JjX2ZpbGVwYXRoKSwgJ3NyY19maWxlcGF0aDogJXMnICUgc3JjX2ZpbGVwYXRo Ci0gICAgICAgIGRzdF9maWxlbmFtZSA9IHNlbGYub3V0cHV0X2ZpbGVuYW1lKGRzdF9leHRlbnNp b24pCisgICAgICAgIGRzdF9maWxlcGF0aCA9IGZzLmpvaW4oc2VsZi5fcm9vdF9vdXRwdXRfZGly LCBzZWxmLl9wb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUoc3JjX2ZpbGVwYXRoKSkKICAgICAg ICAgc2VsZi5fbWFrZV9vdXRwdXRfZGlyZWN0b3J5KCkKLSAgICAgICAgZnMuY29weWZpbGUoc3Jj X2ZpbGVwYXRoLCBkc3RfZmlsZW5hbWUpCisgICAgICAgIGZzLmNvcHlmaWxlKHNyY19maWxlcGF0 aCwgZHN0X2ZpbGVwYXRoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbW9kZWxzL3Rlc3RfZmFpbHVyZXMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9mYWlsdXJlcy5weQppbmRleCA4YWJkZTM1YTY3NTgx Y2IwODUzZGZkYWQ5ZWE2ODJhYmM1MGZiNzkxLi5jMzUyMWVjOTk5NDExZjYxNzhmMTA2ZjdjNWY1 ZmYzOTI4M2M1M2M5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9tb2RlbHMvdGVzdF9mYWlsdXJlcy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9mYWlsdXJlcy5weQpAQCAtMTg2LDYgKzE4Niw5IEBA IGNsYXNzIEZhaWx1cmVJbWFnZUhhc2hJbmNvcnJlY3QoVGVzdEZhaWx1cmUpOgogY2xhc3MgRmFp bHVyZVJlZnRlc3RNaXNtYXRjaChUZXN0RmFpbHVyZSk6CiAgICAgIiIiVGhlIHJlc3VsdCBkaWRu J3QgbWF0Y2ggdGhlIHJlZmVyZW5jZSByZW5kZXJpbmcuIiIiCiAKKyAgICBkZWYgX19pbml0X18o c2VsZiwgcmVmZXJlbmNlX2ZpbGVuYW1lKToKKyAgICAgICAgc2VsZi5yZWZlcmVuY2VfZmlsZW5h bWUgPSByZWZlcmVuY2VfZmlsZW5hbWUKKwogICAgIEBzdGF0aWNtZXRob2QKICAgICBkZWYgbWVz c2FnZSgpOgogICAgICAgICByZXR1cm4gIk1pc21hdGNoIHdpdGggcmVmZXJlbmNlIgpAQCAtMTk0 LDYgKzE5Nyw5IEBAIGNsYXNzIEZhaWx1cmVSZWZ0ZXN0TWlzbWF0Y2goVGVzdEZhaWx1cmUpOgog Y2xhc3MgRmFpbHVyZVJlZnRlc3RNaXNtYXRjaERpZE5vdE9jY3VyKFRlc3RGYWlsdXJlKToKICAg ICAiIiJVbmV4cGVjdGVkIG1hdGNoIGJldHdlZW4gdGhlIHJlc3VsdCBhbmQgdGhlIHJlZmVyZW5j ZSByZW5kZXJpbmcuIiIiCiAKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcmVmZXJlbmNlX2ZpbGVu YW1lKToKKyAgICAgICAgc2VsZi5yZWZlcmVuY2VfZmlsZW5hbWUgPSByZWZlcmVuY2VfZmlsZW5h bWUKKwogICAgIEBzdGF0aWNtZXRob2QKICAgICBkZWYgbWVzc2FnZSgpOgogICAgICAgICByZXR1 cm4gIk1pc21hdGNoIHdpdGggdGhlIHJlZmVyZW5jZSBkaWQgbm90IG9jY3VyIgpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfaW5wdXQu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9pbnB1 dC5weQppbmRleCBkNTYwMmQ2MWE0OTA5NWY3NDliY2ZlNTlhMGY2YzY0MTU3YjUyN2Y2Li5lZWVm MGVhMDQ3ZTc5MGVmY2QwZWVjYmU0YTZlMmY1NGU0ZGE0MDAzIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9pbnB1dC5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9pbnB1dC5weQpA QCAtMzIsMTQgKzMyLDIzIEBACiBjbGFzcyBUZXN0SW5wdXQ6CiAgICAgIiIiR3JvdXBzIGluZm9y bWF0aW9uIGFib3V0IGEgdGVzdCBmb3IgZWFzeSBwYXNzaW5nIG9mIGRhdGEuIiIiCiAKLSAgICBk ZWYgX19pbml0X18oc2VsZiwgdGVzdF9uYW1lLCB0aW1lb3V0KToKKyAgICAjIFRvIHNhdmUgZm9v dHByaW50cyBzaW5jZSBtb3N0IFRlc3RJbnB1dCBpbnN0YW5jZXMgZG9uJ3QgaGF2ZSB0byBoYXZl IHRoZXNlIGZpZWxkcy4KKyAgICByZWZfZmlsZSA9IE5vbmUKKyAgICByZWZfaXNfbWlzbWF0Y2hf cmVmdGVzdCA9IE5vbmUKKworICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0ZXN0X25hbWUsIHRpbWVv dXQsIHJlZl9maWxlPU5vbmUsIGlzX21pc21hdGNoX3JlZnRlc3Q9RmFsc2UpOgogICAgICAgICAi IiJIb2xkcyB0aGUgaW5wdXQgcGFyYW1ldGVycyBmb3IgYSB0ZXN0LgogICAgICAgICBBcmdzOgog ICAgICAgICAgIHRlc3Q6IG5hbWUgb2YgdGVzdCAobm90IGFuIGFic29sdXRlIHBhdGghKQogICAg ICAgICAgIHRpbWVvdXQ6IFRpbWVvdXQgaW4gbXNlY3MgdGhlIGRyaXZlciBzaG91bGQgdXNlIHdo aWxlIHJ1bm5pbmcgdGhlIHRlc3QKKyAgICAgICAgICByZWZfZmlsZTogbmFtZSBvZiByZWZlcmVu Y2VfZmlsZW5hbWUgKG5vdCBhbiBhYnNvbHV0ZSBwYXRoISkKKyAgICAgICAgICBpc19taXNtYXRj aF90ZXN0OiB0cnVlIHdoZW4gdGhlIHRlc3QgaXMgYSBtaXNtYXRjaCByZWZ0ZXN0LgogICAgICAg ICAgICIiIgogICAgICAgICBzZWxmLnRlc3RfbmFtZSA9IHRlc3RfbmFtZQogICAgICAgICBzZWxm LnRpbWVvdXQgPSB0aW1lb3V0CisgICAgICAgIGlmIHJlZl9maWxlOgorICAgICAgICAgICAgc2Vs Zi5yZWZfZmlsZSA9IHJlZl9maWxlCisgICAgICAgICAgICBzZWxmLmlzX21pc21hdGNoX3JlZnRl c3QgPSBpc19taXNtYXRjaF9yZWZ0ZXN0CiAKICAgICBkZWYgX19yZXByX18oc2VsZik6CiAgICAg ICAgIHJldHVybiAiVGVzdElucHV0KCclcycsICVkKSIgJSAoc2VsZi50ZXN0X25hbWUsIHNlbGYu dGltZW91dCkK