52478 2011-01-14 13:58:12 -0800 run-webkit-tests error when running certain subdirectories of layout tests 2011-01-18 12:32:34 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 enne dpranke dpranke enne eric mihaip ojan tony oldest_to_newest 334581 0 enne 2011-01-14 13:58:12 -0800 On Linux, if I run "new-run-webkit-tests --debug --chromium LayoutTests/compositing" then I get the following error: Preparing tests ...Traceback (most recent call last): File "/usr/local/google/home/enne/chrome/src/third_party/WebKit/Tools/Scripts/new-run-webkit-tests", line 38, in <module> sys.exit(run_webkit_tests.main()) File "/usr/local/google/home/enne/chrome/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 430, in main return run(port_obj, options, args) File "/usr/local/google/home/enne/chrome/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 117, in run num_unexpected_results = runner.run(result_summary) File "/usr/local/google/home/enne/chrome/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/layout_package/test_runner.py", line 645, in run assert(len(self._test_files)) AssertionError This does not occur if I run against LayoutTests/fast/canvas/webgl (and any number of other subdirectories). Oddly, if I generate a text list containing all of the html files in the compositing directory (recursively) and then use --test-file to specify it, then I get the same error as above. 334687 1 dpranke 2011-01-14 15:49:06 -0800 This is happening "by design", sort of. You must have lines in your test expectations file that skips the compositing directory. When you list files individually, those skips get overridden. The tool shouldn't crash, though. I'll add a patch to fix that. 334691 2 enne 2011-01-14 15:54:09 -0800 Ah, you're quite right. If I add --force, then tests exist and this doesn't occur. 334692 3 79019 dpranke 2011-01-14 15:55:24 -0800 Created attachment 79019 Patch 334694 4 dpranke 2011-01-14 15:56:53 -0800 Note that passing a directory is different than an explicit list of test files because we assume you still want to skip the files that should be skipped in the directory unless told not to. You can also override the skipping by using --force. 334698 5 enne 2011-01-14 16:01:20 -0800 (In reply to comment #4) > Note that passing a directory is different than an explicit list of test files because we assume you still want to skip the files that should be skipped in the directory unless told not to. Using --test-list had the same behavior as passing a directory for me. Are you saying that's not intended? 334713 6 dpranke 2011-01-14 16:22:24 -0800 Looks like there might be a separate bug as well ... when you specify arguments on the command line we do you the courtesy of stripping off the "LayoutTests/" prefix. We don't for lines listed in --test-file . So you were getting the same result through a slightly different code path, I think. 334715 7 mihaip 2011-01-14 16:26:01 -0800 (In reply to comment #6) > Looks like there might be a separate bug as well ... when you specify arguments on the command line we do you the courtesy of stripping off the "LayoutTests/" prefix. We don't for lines listed in --test-file . So you were getting the same result through a slightly different code path, I think. I thought we had stopped stripping the LayoutTests/ prefix (http://trac.webkit.org/changeset/71160), for consistency with ORWT. 334716 8 79019 mihaip 2011-01-14 16:27:02 -0800 Comment on attachment 79019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=79019&action=review > Tools/Scripts/webkitpy/layout_tests/layout_package/test_runner.py:394 > + if not len(self._test_files): Unit test? 334718 9 dpranke 2011-01-14 16:30:12 -0800 (In reply to comment #7) > (In reply to comment #6) > > Looks like there might be a separate bug as well ... when you specify arguments on the command line we do you the courtesy of stripping off the "LayoutTests/" prefix. We don't for lines listed in --test-file . So you were getting the same result through a slightly different code path, I think. > > I thought we had stopped stripping the LayoutTests/ prefix (http://trac.webkit.org/changeset/71160), for consistency with ORWT. That is the aforementioned bug. Ojan fixed it in one place and missed it in the other. I will fix that and add a couple of unit tests. 334744 10 79030 dpranke 2011-01-14 16:58:58 -0800 Created attachment 79030 Patch 334750 11 mihaip 2011-01-14 17:03:35 -0800 (In reply to comment #9) > That is the aforementioned bug. Ojan fixed it in one place and missed it in the other. I will fix that and add a couple of unit tests. Ah, makes sense now. What about a unit test for the original report (that you get a crash if trying to run only skipped tests)? 335469 12 79030 mihaip 2011-01-17 12:58:38 -0800 Comment on attachment 79030 Patch r- to make it clearer that tests for the bug being fixed would be good to have. 335552 13 79224 dpranke 2011-01-17 15:22:26 -0800 Created attachment 79224 update w/ mihaip's feedback, rebase to tip of tree 336005 14 dpranke 2011-01-18 12:32:34 -0800 Committed r76045: <http://trac.webkit.org/changeset/76045> 79019 2011-01-14 15:55:24 -0800 2011-01-14 16:58:55 -0800 Patch bug-52478-20110114155523.patch text/plain 1491 dpranke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjNmQy MTViODQ2MjhiNDQ0NzFmNDVhNjgwMGI5NTVjNGI0N2MyNGMyLi41MDU1NjNmODY2MzI5MWM0NDM4 ZDYwOTBiMmEwZjg4ZTA2NDY3ZDllIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTcgQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBuZXctcnVuLXdlYmtpdC10ZXN0cyBzaG91bGRuJ3Qg Y3Jhc2ggd2hlbiB5b3UgdHJ5IHRvIHJ1biBhCisgICAgICAgIGRpcmVjdG9yeSBjb250YWluaW5n IG9ubHkgc2tpcHBlZCBmaWxlcy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTI0NzgKKyAgICAgICAgCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHk6CisKKzAxMS0wMS0x NCAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBVcGRhdGUgcmViYXNlbGluZS1jaHJvbWl1 bS13ZWJraXQtdGVzdHMgdW5pdCB0ZXN0cyB0byB1c2UgYSBtb2NrCiAgICAgICAgIGZpbGVzeXN0 ZW0uCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xh eW91dF9wYWNrYWdlL3Rlc3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHkKaW5kZXggNWIwMmEwMDZkOThj NTA0MjRmYjU3NzQ5OWI5MTAzODY4ODk5OTU5YS4uZWZjZTc4OTgwZDg5YTcyOTM5NDkwMWE4Yzlm NDk5ODM1MDBhYTk3MCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHkKQEAgLTM5 MCw2ICszOTAsMTEgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgICAgICAgICByZXN1bHRf c3VtbWFyeS5hZGQocmVzdWx0LCBleHBlY3RlZD1UcnVlKQogICAgICAgICBzZWxmLl9wcmludGVy LnByaW50X2V4cGVjdGVkKCcnKQogCisgICAgICAgICMgQ2hlY2sgdG8gbWFrZSBzdXJlIHdlIGRp ZG4ndCBmaWx0ZXIgb3V0IGFsbCBvZiB0aGUgdGVzdHMuCisgICAgICAgIGlmIG5vdCBsZW4oc2Vs Zi5fdGVzdF9maWxlcyk6CisgICAgICAgICAgICBfbG9nLmluZm8oIkFsbCB0ZXN0cyBhcmUgYmVp bmcgc2tpcHBlZCIpCisgICAgICAgICAgICByZXR1cm4gTm9uZQorCiAgICAgICAgIHJldHVybiBy ZXN1bHRfc3VtbWFyeQogCiAgICAgZGVmIF9nZXRfZGlyX2Zvcl90ZXN0X2ZpbGUoc2VsZiwgdGVz dF9maWxlKToK 79030 2011-01-14 16:58:58 -0800 2011-01-17 15:22:23 -0800 Patch bug-52478-20110114165856.patch text/plain 4751 dpranke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjNmQy MTViODQ2MjhiNDQ0NzFmNDVhNjgwMGI5NTVjNGI0N2MyNGMyLi4yMzU3NTdmYzk0ZWE3ZGM4ZDlm YTdiMTUxNWQ3NzhmMDA3MjM1NjQzIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTkgQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBuZXctcnVuLXdlYmtpdC10ZXN0cyBzaG91bGRuJ3Qg Y3Jhc2ggd2hlbiB5b3UgdHJ5IHRvIHJ1biBhCisgICAgICAgIGRpcmVjdG9yeSBjb250YWluaW5n IG9ubHkgc2tpcHBlZCBmaWxlcy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTI0NzgKKyAgICAgICAgCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHk6 CisKKzAxMS0wMS0xNCAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBVcGRhdGUgcmViYXNl bGluZS1jaHJvbWl1bS13ZWJraXQtdGVzdHMgdW5pdCB0ZXN0cyB0byB1c2UgYSBtb2NrCiAgICAg ICAgIGZpbGVzeXN0ZW0uCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHkKaW5kZXgg NWIwMmEwMDZkOThjNTA0MjRmYjU3NzQ5OWI5MTAzODY4ODk5OTU5YS4uMmY2M2VjODcyYTExMThh YTZhNjBmZjQxOTdjNDViNjI5OTMxZDgxMyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5u ZXIucHkKQEAgLTE5OSwxMiArMTk5LDE1IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgICAg bGFzdF91bmV4cGVjdGVkX3Jlc3VsdHM6IGxpc3Qgb2YgdW5leHBlY3RlZCByZXN1bHRzIHRvIHJl dGVzdCwgaWYgYW55CiAKICAgICAgICAgIiIiCi0gICAgICAgIHBhdGhzID0gW3NlbGYuX3N0cmlw X3Rlc3RfZGlyX3ByZWZpeChhcmcpIGZvciBhcmcgaW4gYXJncyBpZiBhcmcgYW5kIGFyZyAhPSAn J10KKyAgICAgICAgcGF0aHMgPSBzZWxmLl9zdHJpcF90ZXN0X2Rpcl9wcmVmaXhlcyhhcmdzKQog ICAgICAgICBwYXRocyArPSBsYXN0X3VuZXhwZWN0ZWRfcmVzdWx0cwogICAgICAgICBpZiBzZWxm Ll9vcHRpb25zLnRlc3RfbGlzdDoKLSAgICAgICAgICAgIHBhdGhzICs9IHJlYWRfdGVzdF9maWxl cyhzZWxmLl9vcHRpb25zLnRlc3RfbGlzdCkKKyAgICAgICAgICAgIHBhdGhzICs9IHNlbGYuX3N0 cmlwX3Rlc3RfZGlyX3ByZWZpeGVzKHJlYWRfdGVzdF9maWxlcyhzZWxmLl9vcHRpb25zLnRlc3Rf bGlzdCkpCiAgICAgICAgIHNlbGYuX3Rlc3RfZmlsZXMgPSBzZWxmLl9wb3J0LnRlc3RzKHBhdGhz KQogCisgICAgZGVmIF9zdHJpcF90ZXN0X2Rpcl9wcmVmaXhlcyhzZWxmLCBwYXRocyk6CisgICAg ICAgIHJldHVybiBbc2VsZi5fc3RyaXBfdGVzdF9kaXJfcHJlZml4KHBhdGgpIGZvciBwYXRoIGlu IHBhdGhzIGlmIHBhdGhdCisKICAgICBkZWYgX3N0cmlwX3Rlc3RfZGlyX3ByZWZpeChzZWxmLCBw YXRoKToKICAgICAgICAgaWYgcGF0aC5zdGFydHN3aXRoKExBWU9VVF9URVNUU19ESVJFQ1RPUlkp OgogICAgICAgICAgICAgcmV0dXJuIHBhdGhbbGVuKExBWU9VVF9URVNUU19ESVJFQ1RPUlkpOl0K QEAgLTM5MCw2ICszOTMsMTEgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgICAgICAgICBy ZXN1bHRfc3VtbWFyeS5hZGQocmVzdWx0LCBleHBlY3RlZD1UcnVlKQogICAgICAgICBzZWxmLl9w cmludGVyLnByaW50X2V4cGVjdGVkKCcnKQogCisgICAgICAgICMgQ2hlY2sgdG8gbWFrZSBzdXJl IHdlIGRpZG4ndCBmaWx0ZXIgb3V0IGFsbCBvZiB0aGUgdGVzdHMuCisgICAgICAgIGlmIG5vdCBs ZW4oc2VsZi5fdGVzdF9maWxlcyk6CisgICAgICAgICAgICBfbG9nLmluZm8oIkFsbCB0ZXN0cyBh cmUgYmVpbmcgc2tpcHBlZCIpCisgICAgICAgICAgICByZXR1cm4gTm9uZQorCiAgICAgICAgIHJl dHVybiByZXN1bHRfc3VtbWFyeQogCiAgICAgZGVmIF9nZXRfZGlyX2Zvcl90ZXN0X2ZpbGUoc2Vs ZiwgdGVzdF9maWxlKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvdGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvdGVzdC5weQppbmRleCA5MzU4ODFjMjc2YTI3NjQ1NTYyZTQzZTUxMWIyZjRmNmUxY2Nl OTExLi5jOTY0NjZjMWY5NzA1YTQ1MGY2ZmFiOWE1OGEwYTI5YjA3ZDljNzJmIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CkBAIC0yMTMs NyArMjEzLDcgQEAgY2xhc3MgVGVzdFBvcnQoYmFzZS5Qb3J0KToKIAogICAgIGRlZiBsYXlvdXRf dGVzdHNfZGlyKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jh c2UoJ1Rvb2xzJywgJ1NjcmlwdHMnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJ3dlYmtpdHB5JywgJ2xheW91dF90ZXN0cycsICdkYXRhJykKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICd3ZWJraXRweScsICdsYXlvdXRfdGVzdHMn LCAnZGF0YScsICdMYXlvdXRUZXN0cycpCiAKICAgICBkZWYgcGF0aF9pc2RpcihzZWxmLCBwYXRo KToKICAgICAgICAgIyBVc2VkIGJ5IHRlc3RfZXhwZWN0YXRpb25zLnB5CmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0 ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90 ZXN0c191bml0dGVzdC5weQppbmRleCAyYmZhYzJmNGNmNjVkMTM5NTMyODE4MDQ3MTZhYWY4ZjA1 YmQxMzVkLi5iY2Q3YTEzNzE2NDNjNDBiNzA3MGZmZGYwZGZkZDU2MGQ3ZGFiOWY4IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKQEAgLTMxNSw2ICszMTUsMTAgQEAgY2xhc3MgTWFp blRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICB0ZXN0c19ydW4gPSBnZXRfdGVzdHNf cnVuKFsncGFzc2VzL3RleHQuaHRtbCddLCB0ZXN0c19pbmNsdWRlZD1UcnVlLCBmbGF0dGVuX2Jh dGNoZXM9VHJ1ZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoWydwYXNzZXMvdGV4dC5odG1s J10sIHRlc3RzX3J1bikKIAorICAgIGRlZiB0ZXN0X3NpbmdsZV9maWxlX3dpdGhfcHJlZml4KHNl bGYpOgorICAgICAgICB0ZXN0c19ydW4gPSBnZXRfdGVzdHNfcnVuKFsnTGF5b3V0VGVzdHMvcGFz c2VzL3RleHQuaHRtbCddLCB0ZXN0c19pbmNsdWRlZD1UcnVlLCBmbGF0dGVuX2JhdGNoZXM9VHJ1 ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoWydwYXNzZXMvdGV4dC5odG1sJ10sIHRlc3Rz X3J1bikKKwogICAgIGRlZiB0ZXN0X3Rlc3RfbGlzdChzZWxmKToKICAgICAgICAgZmlsZW5hbWUg PSB0ZW1wZmlsZS5ta3RlbXAoKQogICAgICAgICB0bXBmaWxlID0gZmlsZShmaWxlbmFtZSwgbW9k ZT0ndysnKQpAQCAtMzI4LDYgKzMzMiwxNCBAQCBjbGFzcyBNYWluVGVzdCh1bml0dGVzdC5UZXN0 Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVzLCAtMSkKICAgICAgICAgc2VsZi5h c3NlcnRGYWxzZShlcnIuZW1wdHkoKSkKIAorICAgIGRlZiB0ZXN0X3Rlc3RfbGlzdF93aXRoX3By ZWZpeChzZWxmKToKKyAgICAgICAgZmlsZW5hbWUgPSB0ZW1wZmlsZS5ta3RlbXAoKQorICAgICAg ICB0bXBmaWxlID0gZmlsZShmaWxlbmFtZSwgbW9kZT0ndysnKQorICAgICAgICB0bXBmaWxlLndy aXRlKCdMYXlvdXRUZXN0cy9wYXNzZXMvdGV4dC5odG1sJykKKyAgICAgICAgdG1wZmlsZS5jbG9z ZSgpCisgICAgICAgIHRlc3RzX3J1biA9IGdldF90ZXN0c19ydW4oWyctLXRlc3QtbGlzdD0lcycg JSBmaWxlbmFtZV0sIHRlc3RzX2luY2x1ZGVkPVRydWUsIGZsYXR0ZW5fYmF0Y2hlcz1UcnVlKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhbJ3Bhc3Nlcy90ZXh0Lmh0bWwnXSwgdGVzdHNfcnVu KQorCiAgICAgZGVmIHRlc3RfdW5leHBlY3RlZF9mYWlsdXJlcyhzZWxmKToKICAgICAgICAgIyBS dW4gdGVzdHMgaW5jbHVkaW5nIHRoZSB1bmV4cGVjdGVkIGZhaWx1cmVzLgogICAgICAgICBzZWxm Ll91cmxfb3BlbmVkID0gTm9uZQo= 79224 2011-01-17 15:22:26 -0800 2011-01-17 17:38:31 -0800 update w/ mihaip's feedback, rebase to tip of tree bug-52478-20110117152225.patch text/plain 4908 dpranke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5Yzgx YzQ3M2Y3MTRjOTU2ZGIwOTczNGRlY2UwN2MyNjlmOTA3ZjJkLi45ODBmNTVkNzJlMjc1YWIwNDM2 YjM3OTBkZDU5OTM0YTI3M2I4NGFlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzAxMS0wMS0xNCAgRGlyayBQcmFua2Ug IDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBuZXctcnVuLXdlYmtpdC10ZXN0cyBzaG91bGRuJ3QgY3Jhc2ggd2hl biB5b3UgdHJ5IHRvIHJ1biBhCisgICAgICAgIGRpcmVjdG9yeSBjb250YWluaW5nIG9ubHkgc2tp cHBlZCBmaWxlcy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTI0NzgKKyAgICAgICAgCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHk6CisKIDIwMTEt MDEtMTcgIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9ydW5uZXIucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X3J1 bm5lci5weQppbmRleCA1YjAyYTAwNmQ5OGM1MDQyNGZiNTc3NDk5YjkxMDM4Njg4OTk5NTlhLi4y ZjYzZWM4NzJhMTExOGFhNmE2MGZmNDE5N2M0NWI2Mjk5MzFkODEzIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X3J1bm5l ci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFj a2FnZS90ZXN0X3J1bm5lci5weQpAQCAtMTk5LDEyICsxOTksMTUgQEAgY2xhc3MgVGVzdFJ1bm5l cjoKICAgICAgICAgICBsYXN0X3VuZXhwZWN0ZWRfcmVzdWx0czogbGlzdCBvZiB1bmV4cGVjdGVk IHJlc3VsdHMgdG8gcmV0ZXN0LCBpZiBhbnkKIAogICAgICAgICAiIiIKLSAgICAgICAgcGF0aHMg PSBbc2VsZi5fc3RyaXBfdGVzdF9kaXJfcHJlZml4KGFyZykgZm9yIGFyZyBpbiBhcmdzIGlmIGFy ZyBhbmQgYXJnICE9ICcnXQorICAgICAgICBwYXRocyA9IHNlbGYuX3N0cmlwX3Rlc3RfZGlyX3By ZWZpeGVzKGFyZ3MpCiAgICAgICAgIHBhdGhzICs9IGxhc3RfdW5leHBlY3RlZF9yZXN1bHRzCiAg ICAgICAgIGlmIHNlbGYuX29wdGlvbnMudGVzdF9saXN0OgotICAgICAgICAgICAgcGF0aHMgKz0g cmVhZF90ZXN0X2ZpbGVzKHNlbGYuX29wdGlvbnMudGVzdF9saXN0KQorICAgICAgICAgICAgcGF0 aHMgKz0gc2VsZi5fc3RyaXBfdGVzdF9kaXJfcHJlZml4ZXMocmVhZF90ZXN0X2ZpbGVzKHNlbGYu X29wdGlvbnMudGVzdF9saXN0KSkKICAgICAgICAgc2VsZi5fdGVzdF9maWxlcyA9IHNlbGYuX3Bv cnQudGVzdHMocGF0aHMpCiAKKyAgICBkZWYgX3N0cmlwX3Rlc3RfZGlyX3ByZWZpeGVzKHNlbGYs IHBhdGhzKToKKyAgICAgICAgcmV0dXJuIFtzZWxmLl9zdHJpcF90ZXN0X2Rpcl9wcmVmaXgocGF0 aCkgZm9yIHBhdGggaW4gcGF0aHMgaWYgcGF0aF0KKwogICAgIGRlZiBfc3RyaXBfdGVzdF9kaXJf cHJlZml4KHNlbGYsIHBhdGgpOgogICAgICAgICBpZiBwYXRoLnN0YXJ0c3dpdGgoTEFZT1VUX1RF U1RTX0RJUkVDVE9SWSk6CiAgICAgICAgICAgICByZXR1cm4gcGF0aFtsZW4oTEFZT1VUX1RFU1RT X0RJUkVDVE9SWSk6XQpAQCAtMzkwLDYgKzM5MywxMSBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAg ICAgICAgICAgICAgIHJlc3VsdF9zdW1tYXJ5LmFkZChyZXN1bHQsIGV4cGVjdGVkPVRydWUpCiAg ICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0ZWQoJycpCiAKKyAgICAgICAgIyBDaGVj ayB0byBtYWtlIHN1cmUgd2UgZGlkbid0IGZpbHRlciBvdXQgYWxsIG9mIHRoZSB0ZXN0cy4KKyAg ICAgICAgaWYgbm90IGxlbihzZWxmLl90ZXN0X2ZpbGVzKToKKyAgICAgICAgICAgIF9sb2cuaW5m bygiQWxsIHRlc3RzIGFyZSBiZWluZyBza2lwcGVkIikKKyAgICAgICAgICAgIHJldHVybiBOb25l CisKICAgICAgICAgcmV0dXJuIHJlc3VsdF9zdW1tYXJ5CiAKICAgICBkZWYgX2dldF9kaXJfZm9y X3Rlc3RfZmlsZShzZWxmLCB0ZXN0X2ZpbGUpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CmluZGV4IDkzNTg4MWMyNzZhMjc2NDU1NjJlNDNl NTExYjJmNGY2ZTFjY2U5MTEuLmM5NjQ2NmMxZjk3MDVhNDUwZjZmYWI5YTU4YTBhMjliMDdkOWM3 MmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rl c3QucHkKQEAgLTIxMyw3ICsyMTMsNyBAQCBjbGFzcyBUZXN0UG9ydChiYXNlLlBvcnQpOgogCiAg ICAgZGVmIGxheW91dF90ZXN0c19kaXIoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLnBhdGhf ZnJvbV93ZWJraXRfYmFzZSgnVG9vbHMnLCAnU2NyaXB0cycsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnd2Via2l0cHknLCAnbGF5b3V0X3Rlc3RzJywgJ2RhdGEn KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3dlYmtpdHB5Jywg J2xheW91dF90ZXN0cycsICdkYXRhJywgJ0xheW91dFRlc3RzJykKIAogICAgIGRlZiBwYXRoX2lz ZGlyKHNlbGYsIHBhdGgpOgogICAgICAgICAjIFVzZWQgYnkgdGVzdF9leHBlY3RhdGlvbnMucHkK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHNfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CmluZGV4IDJiZmFjMmY0Y2Y2NWQxMzk1MzI4 MTgwNDcxNmFhZjhmMDViZDEzNWQuLmFmMWM2ZTE2YjkwYTUzNTM4MGNjNjk4MjIyOGMyZTM1ZjRl MTMwYWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQpAQCAtMzE1LDYgKzMxNSwx NCBAQCBjbGFzcyBNYWluVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHRlc3RzX3J1 biA9IGdldF90ZXN0c19ydW4oWydwYXNzZXMvdGV4dC5odG1sJ10sIHRlc3RzX2luY2x1ZGVkPVRy dWUsIGZsYXR0ZW5fYmF0Y2hlcz1UcnVlKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhbJ3Bh c3Nlcy90ZXh0Lmh0bWwnXSwgdGVzdHNfcnVuKQogCisgICAgZGVmIHRlc3Rfc2luZ2xlX2ZpbGVf d2l0aF9wcmVmaXgoc2VsZik6CisgICAgICAgIHRlc3RzX3J1biA9IGdldF90ZXN0c19ydW4oWydM YXlvdXRUZXN0cy9wYXNzZXMvdGV4dC5odG1sJ10sIHRlc3RzX2luY2x1ZGVkPVRydWUsIGZsYXR0 ZW5fYmF0Y2hlcz1UcnVlKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhbJ3Bhc3Nlcy90ZXh0 Lmh0bWwnXSwgdGVzdHNfcnVuKQorCisgICAgZGVmIHRlc3Rfc2luZ2xlX3NraXBwZWRfZmlsZShz ZWxmKToKKyAgICAgICAgdGVzdHNfcnVuID0gZ2V0X3Rlc3RzX3J1bihbJ2ZhaWx1cmVzL2V4cGVj dGVkL2tleWJhb3JkLmh0bWwnXSwgdGVzdHNfaW5jbHVkZWQ9VHJ1ZSwgZmxhdHRlbl9iYXRjaGVz PVRydWUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFtdLCB0ZXN0c19ydW4pCisKICAgICBk ZWYgdGVzdF90ZXN0X2xpc3Qoc2VsZik6CiAgICAgICAgIGZpbGVuYW1lID0gdGVtcGZpbGUubWt0 ZW1wKCkKICAgICAgICAgdG1wZmlsZSA9IGZpbGUoZmlsZW5hbWUsIG1vZGU9J3crJykKQEAgLTMy OCw2ICszMzYsMTQgQEAgY2xhc3MgTWFpblRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHJlcywgLTEpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoZXJy LmVtcHR5KCkpCiAKKyAgICBkZWYgdGVzdF90ZXN0X2xpc3Rfd2l0aF9wcmVmaXgoc2VsZik6Cisg ICAgICAgIGZpbGVuYW1lID0gdGVtcGZpbGUubWt0ZW1wKCkKKyAgICAgICAgdG1wZmlsZSA9IGZp bGUoZmlsZW5hbWUsIG1vZGU9J3crJykKKyAgICAgICAgdG1wZmlsZS53cml0ZSgnTGF5b3V0VGVz dHMvcGFzc2VzL3RleHQuaHRtbCcpCisgICAgICAgIHRtcGZpbGUuY2xvc2UoKQorICAgICAgICB0 ZXN0c19ydW4gPSBnZXRfdGVzdHNfcnVuKFsnLS10ZXN0LWxpc3Q9JXMnICUgZmlsZW5hbWVdLCB0 ZXN0c19pbmNsdWRlZD1UcnVlLCBmbGF0dGVuX2JhdGNoZXM9VHJ1ZSkKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbHMoWydwYXNzZXMvdGV4dC5odG1sJ10sIHRlc3RzX3J1bikKKwogICAgIGRlZiB0 ZXN0X3VuZXhwZWN0ZWRfZmFpbHVyZXMoc2VsZik6CiAgICAgICAgICMgUnVuIHRlc3RzIGluY2x1 ZGluZyB0aGUgdW5leHBlY3RlZCBmYWlsdXJlcy4KICAgICAgICAgc2VsZi5fdXJsX29wZW5lZCA9 IE5vbmUK