89894 2012-06-25 10:40:39 -0700 run-webkit-test outputs the wrong number of tests executed when some are skipped. 2012-07-13 20:46:06 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac (Intel) OS X 10.7 RESOLVED FIXED NRWT P2 Normal --- 1 menard dpranke abarth dpranke eric ojan rniwa tony webkit.review.bot oldest_to_newest 656699 0 menard 2012-06-25 10:40:39 -0700 On Mac OS Lion if I run : darktears@AlexisMenard:~/Development/troll/webkit:WEBKITOUTPUTDIR=/Users/darktears/Development/troll/webkit-mac/ Tools/Scripts/run-webkit-tests -2 --release --platform="mac-lion" --no-build LayoutTests/fast/box-decoration-break/ All 2 tests ran as expected. The directory LayoutTests/fast/box-decoration-break/ contains 2 tests. One of them is skipped but it claims that two were run which is incorrect to me. Running it with WEBKITOUTPUTDIR=/Users/darktears/Development/troll/webkit-mac/ Tools/Scripts/run-webkit-tests -2 --release --platform="mac-lion" --no-build --force LayoutTests/fast/box-decoration-break/ shows 1 test ran as expected, 1 didn't: which is expected. 656731 1 dpranke 2012-06-25 11:13:30 -0700 (In reply to comment #0) > On Mac OS Lion if I run : > > darktears@AlexisMenard:~/Development/troll/webkit:WEBKITOUTPUTDIR=/Users/darktears/Development/troll/webkit-mac/ Tools/Scripts/run-webkit-tests -2 --release --platform="mac-lion" --no-build LayoutTests/fast/box-decoration-break/ > All 2 tests ran as expected. > > The directory LayoutTests/fast/box-decoration-break/ contains 2 tests. One of them is skipped but it claims that two were run which is incorrect to me. > This is actually by design; the thinking was that it was "skipped as expected". That said, it was a dumb design :) The output should be changed to make it clear that some tests are being skipped, not run. > Running it with WEBKITOUTPUTDIR=/Users/darktears/Development/troll/webkit-mac/ Tools/Scripts/run-webkit-tests -2 --release --platform="mac-lion" --no-build --force LayoutTests/fast/box-decoration-break/ > > shows 1 test ran as expected, 1 didn't: which is expected. I assume the skipped test failed here? i.e., both tests ran? That would be correct, agreed. 656746 2 menard 2012-06-25 11:27:35 -0700 (In reply to comment #1) > (In reply to comment #0) > > On Mac OS Lion if I run : > > > > darktears@AlexisMenard:~/Development/troll/webkit:WEBKITOUTPUTDIR=/Users/darktears/Development/troll/webkit-mac/ Tools/Scripts/run-webkit-tests -2 --release --platform="mac-lion" --no-build LayoutTests/fast/box-decoration-break/ > > All 2 tests ran as expected. > > > > The directory LayoutTests/fast/box-decoration-break/ contains 2 tests. One of them is skipped but it claims that two were run which is incorrect to me. > > > > This is actually by design; the thinking was that it was "skipped as expected". That said, it was a dumb design :) True. > > The output should be changed to make it clear that some tests are being skipped, not run. Something like "All 2 tests ran as expected (1 was Skipped)". > > > Running it with WEBKITOUTPUTDIR=/Users/darktears/Development/troll/webkit-mac/ Tools/Scripts/run-webkit-tests -2 --release --platform="mac-lion" --no-build --force LayoutTests/fast/box-decoration-break/ > > > > shows 1 test ran as expected, 1 didn't: which is expected. > > I assume the skipped test failed here? i.e., both tests ran? That would be correct, agreed. Yes ;), I was trying to fix the failure. 669659 3 152395 dpranke 2012-07-13 18:36:19 -0700 Created attachment 152395 Patch 669701 4 152395 webkit.review.bot 2012-07-13 20:46:01 -0700 Comment on attachment 152395 Patch Clearing flags on attachment: 152395 Committed r122659: <http://trac.webkit.org/changeset/122659> 669702 5 webkit.review.bot 2012-07-13 20:46:06 -0700 All reviewed patches have been landed. Closing bug. 152395 2012-07-13 18:36:19 -0700 2012-07-13 20:46:01 -0700 Patch bug-89894-20120713183619.patch text/plain 11309 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNjQ2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTBhY2EwOWFkMDc3ZjZhNmRkNzVmODgxNGY4OGI4YzMw ODNmMGUzYi4uYWU2NDYzZWM5NDQ5OWUyYjIyMjBkOTJmMmY2ZWM0ZmQ3MWI2OGI1MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0 IEBACiAyMDEyLTA3LTEzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHJ1bi13ZWJraXQtdGVzdCBvdXRwdXRzIHRoZSB3cm9uZyBudW1iZXIgb2YgdGVzdHMg ZXhlY3V0ZWQgd2hlbiBzb21lIGFyZSBza2lwcGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk4OTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXggdGhlIGxvZ2dpbmcgb2YgdGhlIGFjdHVhbCBudW1i ZXIgb2YgdGVzdHMgcnVuIHNvIHRoYXQgdGVzdHMKKyAgICAgICAgdGhhdCBhcmUgc2tpcHBlZCBh cmVuJ3QgaW5jbHVkZWQuCisKKyAgICAgICAgQWxzbyByZXZhbXAgdGhlICdleHBlY3RlZCcgb3V0 cHV0IHNvIHdlIGRpc3Rpbmd1aXNoIHRoZSBudW1iZXIKKyAgICAgICAgb2YgdGVzdHMgZm91bmQg ZnJvbSB0aGUgbnVtYmVyIG9mIHRlc3RzIHJ1biAodG8gYWNjb3VudCBmb3IKKyAgICAgICAgLS1y ZXBlYXQtZWFjaCBhbmQgLS1pdGVyYXRpb25zKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0 aW5nIHRlc3RzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKE1hbmFnZXIucHJlcGFyZV9saXN0c19hbmRf cHJpbnRfb3V0cHV0KToKKyAgICAgICAgKE1hbmFnZXIuX2xvZ19udW1fd29ya2Vycyk6CisgICAg ICAgIChNYW5hZ2VyLnJ1bik6CisgICAgICAgIChNYW5hZ2VyLl9wcmludF9yZXN1bHRfc3VtbWFy eSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Jlc3Vs dF9zdW1tYXJ5LnB5OgorICAgICAgICAoUmVzdWx0U3VtbWFyeS5fX2luaXRfXyk6CisgICAgICAg IChSZXN1bHRTdW1tYXJ5LmFkZCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvdmlld3MvcHJpbnRpbmcucHk6CisgICAgICAgIChQcmludGVyLnByaW50X29uZV9saW5l X3N1bW1hcnkpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdz L3ByaW50aW5nX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdHByaW50ZXIudGVzdF9wcmludF9v bmVfbGluZV9zdW1tYXJ5KToKKworMjAxMi0wNy0xMyAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNo cm9taXVtLm9yZz4KKwogICAgICAgICB0ZXN0LXdlYmtpdHB5OiBtb3ZlIHByaW50aW5nLXJlbGF0 ZWQgY29kZSBvdXQgb2YgdGhlIHJ1bm5lcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTEyODkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKaW5kZXggMTE2OTRl MjZhODBkNzRkOGVlOWRhODU4OTE1NTg1N2JlY2UwNTBiZi4uN2FlZTBjMmZiMWU3MGNhZWExZjZm NjMwYTdlM2IzODk2MzA3NDE4MSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CkBAIC00ODAsMjAgKzQ4 MCwxMyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICMgbm93IG1ha2Ugc3VyZSB3 ZSdyZSBleHBsaWNpdGx5IHJ1bm5pbmcgYW55IHRlc3RzIHBhc3NlZCBvbiB0aGUgY29tbWFuZCBs aW5lLgogICAgICAgICBzZWxmLl90ZXN0X2ZpbGVzLnVwZGF0ZShmb3VuZF90ZXN0X2ZpbGVzLmlu dGVyc2VjdGlvbihzZWxmLl9wYXRocykpCiAKLSAgICAgICAgaWYgbm90IG51bV9hbGxfdGVzdF9m aWxlczoKKyAgICAgICAgbnVtX3RvX3J1biA9IGxlbihzZWxmLl90ZXN0X2ZpbGVzKQorICAgICAg ICBudW1fc2tpcHBlZCA9IG51bV9hbGxfdGVzdF9maWxlcyAtIG51bV90b19ydW4KKworICAgICAg ICBpZiBub3QgbnVtX3RvX3J1bjoKICAgICAgICAgICAgIF9sb2cuY3JpdGljYWwoJ05vIHRlc3Rz IHRvIHJ1bi4nKQogICAgICAgICAgICAgcmV0dXJuIE5vbmUKIAotICAgICAgICBudW1fc2tpcHBl ZCA9IG51bV9hbGxfdGVzdF9maWxlcyAtIGxlbihzZWxmLl90ZXN0X2ZpbGVzKQotICAgICAgICBp ZiBudW1fc2tpcHBlZDoKLSAgICAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0ZWQo IlJ1bm5pbmcgJXMgKGZvdW5kICVkLCBza2lwcGluZyAlZCkuIiAlICgKLSAgICAgICAgICAgICAg ICBncmFtbWFyLnBsdXJhbGl6ZSgndGVzdCcsIG51bV9hbGxfdGVzdF9maWxlcyAtIG51bV9za2lw cGVkKSwKLSAgICAgICAgICAgICAgICBudW1fYWxsX3Rlc3RfZmlsZXMsIG51bV9za2lwcGVkKSkK LSAgICAgICAgZWxpZiBsZW4oc2VsZi5fdGVzdF9maWxlcykgPiAxOgotICAgICAgICAgICAgc2Vs Zi5fcHJpbnRlci5wcmludF9leHBlY3RlZCgiUnVubmluZyBhbGwgJWQgdGVzdHMuIiAlIGxlbihz ZWxmLl90ZXN0X2ZpbGVzKSkKLSAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHNlbGYuX3ByaW50 ZXIucHJpbnRfZXhwZWN0ZWQoIlJ1bm5pbmcgMSB0ZXN0LiIpCi0KICAgICAgICAgIyBDcmVhdGUg YSBzb3J0ZWQgbGlzdCBvZiB0ZXN0IGZpbGVzIHNvIHRoZSBzdWJzZXQgY2h1bmssCiAgICAgICAg ICMgaWYgdXNlZCwgY29udGFpbnMgYWxwaGFiZXRpY2FsbHkgY29uc2VjdXRpdmUgdGVzdHMuCiAg ICAgICAgIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCA9IGxpc3Qoc2VsZi5fdGVzdF9maWxlcykKQEAg LTUxOCw2ICs1MTEsOCBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICAoc2Vs Zi5fb3B0aW9ucy5yZXBlYXRfZWFjaCBpZiBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoIGVsc2Ug MSkgKiBcCiAgICAgICAgICAgICAoc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zIGlmIHNlbGYuX29w dGlvbnMuaXRlcmF0aW9ucyBlbHNlIDEpCiAgICAgICAgIHJlc3VsdF9zdW1tYXJ5ID0gUmVzdWx0 U3VtbWFyeShzZWxmLl9leHBlY3RhdGlvbnMsIHNlbGYuX3Rlc3RfZmlsZXMgfCBza2lwcGVkLCBp dGVyYXRpb25zKQorCisgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0ZWQoJ0ZvdW5k ICVzLicgJSBncmFtbWFyLnBsdXJhbGl6ZSgndGVzdCcsIG51bV9hbGxfdGVzdF9maWxlcykpCiAg ICAgICAgIHNlbGYuX3ByaW50X2V4cGVjdGVkX3Jlc3VsdHNfb2ZfdHlwZShyZXN1bHRfc3VtbWFy eSwgdGVzdF9leHBlY3RhdGlvbnMuUEFTUywgInBhc3NlcyIpCiAgICAgICAgIHNlbGYuX3ByaW50 X2V4cGVjdGVkX3Jlc3VsdHNfb2ZfdHlwZShyZXN1bHRfc3VtbWFyeSwgdGVzdF9leHBlY3RhdGlv bnMuRkFJTCwgImZhaWx1cmVzIikKICAgICAgICAgc2VsZi5fcHJpbnRfZXhwZWN0ZWRfcmVzdWx0 c19vZl90eXBlKHJlc3VsdF9zdW1tYXJ5LCB0ZXN0X2V4cGVjdGF0aW9ucy5GTEFLWSwgImZsYWt5 IikKQEAgLTUzMCwxNyArNTI1LDE2IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAg ICAgIGZvciB0ZXN0IGluIHNraXBwZWQ6CiAgICAgICAgICAgICAgICAgcmVzdWx0ID0gdGVzdF9y ZXN1bHRzLlRlc3RSZXN1bHQodGVzdCkKICAgICAgICAgICAgICAgICByZXN1bHQudHlwZSA9IHRl c3RfZXhwZWN0YXRpb25zLlNLSVAKLSAgICAgICAgICAgICAgICBpdGVyYXRpb25zID0gIFwKLSAg ICAgICAgICAgICAgICAgICAgKHNlbGYuX29wdGlvbnMucmVwZWF0X2VhY2ggaWYgc2VsZi5fb3B0 aW9ucy5yZXBlYXRfZWFjaCBlbHNlIDEpICogXAotICAgICAgICAgICAgICAgICAgICAoc2VsZi5f b3B0aW9ucy5pdGVyYXRpb25zIGlmIHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucyBlbHNlIDEpCiAg ICAgICAgICAgICAgICAgZm9yIGl0ZXJhdGlvbiBpbiByYW5nZShpdGVyYXRpb25zKToKICAgICAg ICAgICAgICAgICAgICAgcmVzdWx0X3N1bW1hcnkuYWRkKHJlc3VsdCwgZXhwZWN0ZWQ9VHJ1ZSkK ICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9leHBlY3RlZCgnJykKIAotICAgICAgICAjIENo ZWNrIHRvIG1ha2Ugc3VyZSB3ZSBkaWRuJ3QgZmlsdGVyIG91dCBhbGwgb2YgdGhlIHRlc3RzLgot ICAgICAgICBpZiBub3QgbGVuKHNlbGYuX3Rlc3RfZmlsZXMpOgotICAgICAgICAgICAgX2xvZy5p bmZvKCJBbGwgdGVzdHMgYXJlIGJlaW5nIHNraXBwZWQiKQotICAgICAgICAgICAgcmV0dXJuIE5v bmUKKyAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCA+IDE6CisgICAgICAgICAg ICBzZWxmLl9wcmludGVyLnByaW50X2V4cGVjdGVkKCdSdW5uaW5nIGVhY2ggdGVzdCAlZCB0aW1l cy4nICUgc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCkKKyAgICAgICAgaWYgc2VsZi5fb3B0aW9u cy5pdGVyYXRpb25zID4gMToKKyAgICAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0 ZWQoJ1J1bm5pbmcgJWQgaXRlcmF0aW9ucyBvZiB0aGUgdGVzdHMuJyAlIHNlbGYuX29wdGlvbnMu aXRlcmF0aW9ucykKKyAgICAgICAgaWYgaXRlcmF0aW9ucyA+IDE6CisgICAgICAgICAgICBzZWxm Ll9wcmludGVyLnByaW50X2V4cGVjdGVkKCcnKQogCiAgICAgICAgIHJldHVybiByZXN1bHRfc3Vt bWFyeQogCkBAIC03MTUsMTEgKzcwOSwxMiBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAg ZGVmIF9sb2dfbnVtX3dvcmtlcnMoc2VsZiwgbnVtX3dvcmtlcnMsIG51bV9zaGFyZHMsIG51bV9s b2NrZWRfc2hhcmRzKToKICAgICAgICAgZHJpdmVyX25hbWUgPSBzZWxmLl9wb3J0LmRyaXZlcl9u YW1lKCkKICAgICAgICAgaWYgbnVtX3dvcmtlcnMgPT0gMToKLSAgICAgICAgICAgIHNlbGYuX3By aW50ZXIucHJpbnRfY29uZmlnKCJSdW5uaW5nIDEgJXMgb3ZlciAlcyIgJQorICAgICAgICAgICAg c2VsZi5fcHJpbnRlci5wcmludF9jb25maWcoIlJ1bm5pbmcgMSAlcyBvdmVyICVzLiIgJQogICAg ICAgICAgICAgICAgIChkcml2ZXJfbmFtZSwgZ3JhbW1hci5wbHVyYWxpemUoJ3NoYXJkJywgbnVt X3NoYXJkcykpKQogICAgICAgICBlbHNlOgotICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmlu dF9jb25maWcoIlJ1bm5pbmcgJWQgJXNzIGluIHBhcmFsbGVsIG92ZXIgJWQgc2hhcmRzICglZCBs b2NrZWQpIiAlCisgICAgICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X2NvbmZpZygiUnVubmlu ZyAlZCAlc3MgaW4gcGFyYWxsZWwgb3ZlciAlZCBzaGFyZHMgKCVkIGxvY2tlZCkuIiAlCiAgICAg ICAgICAgICAgICAgKG51bV93b3JrZXJzLCBkcml2ZXJfbmFtZSwgbnVtX3NoYXJkcywgbnVtX2xv Y2tlZF9zaGFyZHMpKQorICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X2NvbmZpZygnJykKIAog ICAgIGRlZiBfcnVuX3Rlc3RzKHNlbGYsIGZpbGVfbGlzdCwgcmVzdWx0X3N1bW1hcnksIG51bV93 b3JrZXJzKToKICAgICAgICAgIiIiUnVucyB0aGUgdGVzdHMgaW4gdGhlIGZpbGVfbGlzdC4KQEAg LTg5MCw3ICs4ODUsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3By aW50X3RpbWluZ19zdGF0aXN0aWNzKGVuZF90aW1lIC0gc3RhcnRfdGltZSwgdGhyZWFkX3RpbWlu Z3MsIHRlc3RfdGltaW5ncywgaW5kaXZpZHVhbF90ZXN0X3RpbWluZ3MsIHJlc3VsdF9zdW1tYXJ5 KQogICAgICAgICBzZWxmLl9wcmludF9yZXN1bHRfc3VtbWFyeShyZXN1bHRfc3VtbWFyeSkKIAot ICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X29uZV9saW5lX3N1bW1hcnkocmVzdWx0X3N1bW1h cnkudG90YWwsIHJlc3VsdF9zdW1tYXJ5LmV4cGVjdGVkLCByZXN1bHRfc3VtbWFyeS51bmV4cGVj dGVkKQorICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X29uZV9saW5lX3N1bW1hcnkocmVzdWx0 X3N1bW1hcnkudG90YWwgLSByZXN1bHRfc3VtbWFyeS5leHBlY3RlZF9za2lwcywgcmVzdWx0X3N1 bW1hcnkuZXhwZWN0ZWQgLSByZXN1bHRfc3VtbWFyeS5leHBlY3RlZF9za2lwcywgcmVzdWx0X3N1 bW1hcnkudW5leHBlY3RlZCkKIAogICAgICAgICB1bmV4cGVjdGVkX3Jlc3VsdHMgPSBzdW1tYXJp emVfcmVzdWx0cyhzZWxmLl9wb3J0LCBzZWxmLl9leHBlY3RhdGlvbnMsIHJlc3VsdF9zdW1tYXJ5 LCByZXRyeV9zdW1tYXJ5LCBpbmRpdmlkdWFsX3Rlc3RfdGltaW5ncywgb25seV91bmV4cGVjdGVk PVRydWUsIGludGVycnVwdGVkPWludGVycnVwdGVkKQogICAgICAgICBzZWxmLl9wcmludGVyLnBy aW50X3VuZXhwZWN0ZWRfcmVzdWx0cyh1bmV4cGVjdGVkX3Jlc3VsdHMpCkBAIC0xMzMxLDkgKzEz MjYsOCBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgcmVzdWx0X3N1bW1hcnk6 IGluZm9ybWF0aW9uIHRvIGxvZwogICAgICAgICAiIiIKICAgICAgICAgZmFpbGVkID0gcmVzdWx0 X3N1bW1hcnkudG90YWxfZmFpbHVyZXMKLSAgICAgICAgc2tpcHBlZCA9IHJlc3VsdF9zdW1tYXJ5 LnRvdGFsX3Rlc3RzX2J5X2V4cGVjdGF0aW9uW3Rlc3RfZXhwZWN0YXRpb25zLlNLSVBdCi0gICAg ICAgIHRvdGFsID0gcmVzdWx0X3N1bW1hcnkudG90YWwKLSAgICAgICAgcGFzc2VkID0gdG90YWwg LSBmYWlsZWQgLSBza2lwcGVkCisgICAgICAgIHRvdGFsID0gcmVzdWx0X3N1bW1hcnkudG90YWwg LSByZXN1bHRfc3VtbWFyeS5leHBlY3RlZF9za2lwcworICAgICAgICBwYXNzZWQgPSB0b3RhbCAt IGZhaWxlZAogICAgICAgICBwY3RfcGFzc2VkID0gMC4wCiAgICAgICAgIGlmIHRvdGFsID4gMDoK ICAgICAgICAgICAgIHBjdF9wYXNzZWQgPSBmbG9hdChwYXNzZWQpICogMTAwIC8gdG90YWwKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy9yZXN1 bHRfc3VtbWFyeS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy9yZXN1bHRfc3VtbWFyeS5weQppbmRleCAyN2M1NDUyYzAzZDhlOTA0MWFhOWY1OTgzOWQwZTE4 MWIyM2Q4NzhkLi5kNDY3MDNlOGZkZGY2YWU0YTIwNTI3YWM5ODEwODRhOTg3ODViMzRlIDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvcmVzdWx0 X3N1bW1hcnkucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9k ZWxzL3Jlc3VsdF9zdW1tYXJ5LnB5CkBAIC00Nyw2ICs0Nyw3IEBAIGNsYXNzIFJlc3VsdFN1bW1h cnkob2JqZWN0KToKICAgICAgICAgc2VsZi51bmV4cGVjdGVkX3Jlc3VsdHMgPSB7fQogICAgICAg ICBzZWxmLmZhaWx1cmVzID0ge30KICAgICAgICAgc2VsZi50b3RhbF9mYWlsdXJlcyA9IDAKKyAg ICAgICAgc2VsZi5leHBlY3RlZF9za2lwcyA9IDAKICAgICAgICAgc2VsZi50b3RhbF90ZXN0c19i eV9leHBlY3RhdGlvbltTS0lQXSA9IDAKICAgICAgICAgc2VsZi50ZXN0c19ieV9leHBlY3RhdGlv bltTS0lQXSA9IHNldCgpCiAgICAgICAgIGZvciBleHBlY3RhdGlvbiBpbiBUZXN0RXhwZWN0YXRp b25zLkVYUEVDVEFUSU9OUy52YWx1ZXMoKToKQEAgLTY1LDYgKzY2LDggQEAgY2xhc3MgUmVzdWx0 U3VtbWFyeShvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5mYWlsdXJlc1t0ZXN0X3Jlc3VsdC50 ZXN0X25hbWVdID0gdGVzdF9yZXN1bHQuZmFpbHVyZXMKICAgICAgICAgaWYgZXhwZWN0ZWQ6CiAg ICAgICAgICAgICBzZWxmLmV4cGVjdGVkICs9IDEKKyAgICAgICAgICAgIGlmIHRlc3RfcmVzdWx0 LnR5cGUgPT0gU0tJUDoKKyAgICAgICAgICAgICAgICBzZWxmLmV4cGVjdGVkX3NraXBzICs9IDEK ICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNlbGYudW5leHBlY3RlZF9yZXN1bHRzW3Rlc3Rf cmVzdWx0LnRlc3RfbmFtZV0gPSB0ZXN0X3Jlc3VsdAogICAgICAgICAgICAgc2VsZi51bmV4cGVj dGVkICs9IDEKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3ZpZXdzL3ByaW50aW5nLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv dmlld3MvcHJpbnRpbmcucHkKaW5kZXggM2Q5OGM2YzU5NzNhODJhYmI3MjBhZDRlYTNhNDU3OWMz NmJjMTM0MS4uMmRkOTA5OTMwNjkwNGIxYjk5ODk1MTE0MjZmOGUzNjc2Y2NhYmQxMSAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmcu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRp bmcucHkKQEAgLTMxLDYgKzMxLDcgQEAKIAogaW1wb3J0IG9wdHBhcnNlCiAKK2Zyb20gd2Via2l0 cHkudG9vbCBpbXBvcnQgZ3JhbW1hcgogZnJvbSB3ZWJraXRweS5jb21tb24ubmV0IGltcG9ydCBy ZXN1bHRzanNvbnBhcnNlcgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRlc3Rf ZXhwZWN0YXRpb25zIGltcG9ydCBUZXN0RXhwZWN0YXRpb25zCiBmcm9tIHdlYmtpdHB5LmxheW91 dF90ZXN0cy52aWV3cy5tZXRlcmVkX3N0cmVhbSBpbXBvcnQgTWV0ZXJlZFN0cmVhbQpAQCAtMjE3 LDIzICsyMTgsMjEgQEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICAgICAgcmV0dXJu CiAKICAgICAgICAgaW5jb21wbGV0ZSA9IHRvdGFsIC0gZXhwZWN0ZWQgLSB1bmV4cGVjdGVkCisg ICAgICAgIGluY29tcGxldGVfc3RyID0gJycKICAgICAgICAgaWYgaW5jb21wbGV0ZToKICAgICAg ICAgICAgIHNlbGYuX3dyaXRlKCIiKQogICAgICAgICAgICAgaW5jb21wbGV0ZV9zdHIgPSAiICgl ZCBkaWRuJ3QgcnVuKSIgJSBpbmNvbXBsZXRlCi0gICAgICAgICAgICBleHBlY3RlZF9zdHIgPSBz dHIoZXhwZWN0ZWQpCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBpbmNvbXBsZXRlX3N0ciA9 ICIiCi0gICAgICAgICAgICBleHBlY3RlZF9zdHIgPSAiQWxsICVkIiAlIGV4cGVjdGVkCiAKICAg ICAgICAgaWYgdW5leHBlY3RlZCA9PSAwOgotICAgICAgICAgICAgc2VsZi5fd3JpdGUoIiVzIHRl c3RzIHJhbiBhcyBleHBlY3RlZCVzLiIgJQotICAgICAgICAgICAgICAgICAgICAgICAgKGV4cGVj dGVkX3N0ciwgaW5jb21wbGV0ZV9zdHIpKQotICAgICAgICBlbGlmIGV4cGVjdGVkID09IDE6Ci0g ICAgICAgICAgICBzZWxmLl93cml0ZSgiMSB0ZXN0IHJhbiBhcyBleHBlY3RlZCwgJWQgZGlkbid0 JXM6IiAlCi0gICAgICAgICAgICAgICAgICAgICAgICAodW5leHBlY3RlZCwgaW5jb21wbGV0ZV9z dHIpKQorICAgICAgICAgICAgaWYgZXhwZWN0ZWQgPT0gdG90YWw6CisgICAgICAgICAgICAgICAg aWYgZXhwZWN0ZWQgPiAxOgorICAgICAgICAgICAgICAgICAgICBzZWxmLl93cml0ZSgiQWxsICVk IHRlc3RzIHJhbiBhcyBleHBlY3RlZC4iICUgZXhwZWN0ZWQpCisgICAgICAgICAgICAgICAgZWxz ZToKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5fd3JpdGUoIlRoZSB0ZXN0IHJhbiBhcyBleHBl Y3RlZC4iKQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBzZWxmLl93cml0ZSgi JXMgcmFuIGFzIGV4cGVjdGVkJXMuIiAlIChncmFtbWFyLnBsdXJhbGl6ZSgndGVzdCcsIGV4cGVj dGVkKSwgaW5jb21wbGV0ZV9zdHIpKQogICAgICAgICBlbHNlOgotICAgICAgICAgICAgc2VsZi5f d3JpdGUoIiVkIHRlc3RzIHJhbiBhcyBleHBlY3RlZCwgJWQgZGlkbid0JXM6IiAlCi0gICAgICAg ICAgICAgICAgICAgICAgICAoZXhwZWN0ZWQsIHVuZXhwZWN0ZWQsIGluY29tcGxldGVfc3RyKSkK KyAgICAgICAgICAgIHNlbGYuX3dyaXRlKCIlcyByYW4gYXMgZXhwZWN0ZWQsICVkIGRpZG4ndCVz OiIgJSAoZ3JhbW1hci5wbHVyYWxpemUoJ3Rlc3QnLCBleHBlY3RlZCksIHVuZXhwZWN0ZWQsIGlu Y29tcGxldGVfc3RyKSkKICAgICAgICAgc2VsZi5fd3JpdGUoIiIpCiAKICAgICBkZWYgcHJpbnRf dGVzdF9yZXN1bHQoc2VsZiwgcmVzdWx0LCBleHBlY3RlZCwgZXhwX3N0ciwgZ290X3N0cik6CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmlu dGluZ191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Zp ZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5CmluZGV4IDU2OTcwYTg2MzEwY2Y0YmE1OWJlZGNlNzk3 ZWFhMjM0ZjE0MjNiMWQuLjEzMTIwNTBlOTE0ZmUzMGYwYWY3NjIwZjVjOWYxMDlhZGYwZDRlZmUg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3By aW50aW5nX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5CkBAIC0yMDYsMTEgKzIwNiwxMSBAQCBjbGFz cyAgVGVzdHByaW50ZXIodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgICAgIHByaW50ZXIsIGVy ciwgb3V0ID0gc2VsZi5nZXRfcHJpbnRlcihbJy0tcHJpbnQnLCAnb25lLWxpbmUtc3VtbWFyeSdd KQogICAgICAgICBwcmludGVyLnByaW50X29uZV9saW5lX3N1bW1hcnkoMSwgMSwgMCkKLSAgICAg ICAgc2VsZi5hc3NlcnRXcml0dGVuKGVyciwgWyJBbGwgMSB0ZXN0cyByYW4gYXMgZXhwZWN0ZWQu XG4iLCAiXG4iXSkKKyAgICAgICAgc2VsZi5hc3NlcnRXcml0dGVuKGVyciwgWyJUaGUgdGVzdCBy YW4gYXMgZXhwZWN0ZWQuXG4iLCAiXG4iXSkKIAogICAgICAgICBwcmludGVyLCBlcnIsIG91dCA9 IHNlbGYuZ2V0X3ByaW50ZXIoWyctLXByaW50JywgJ2V2ZXJ5dGhpbmcnXSkKICAgICAgICAgcHJp bnRlci5wcmludF9vbmVfbGluZV9zdW1tYXJ5KDEsIDEsIDApCi0gICAgICAgIHNlbGYuYXNzZXJ0 V3JpdHRlbihlcnIsIFsiQWxsIDEgdGVzdHMgcmFuIGFzIGV4cGVjdGVkLlxuIiwgIlxuIl0pCisg ICAgICAgIHNlbGYuYXNzZXJ0V3JpdHRlbihlcnIsIFsiVGhlIHRlc3QgcmFuIGFzIGV4cGVjdGVk LlxuIiwgIlxuIl0pCiAKICAgICAgICAgcHJpbnRlciwgZXJyLCBvdXQgPSBzZWxmLmdldF9wcmlu dGVyKFsnLS1wcmludCcsICdldmVyeXRoaW5nJ10pCiAgICAgICAgIHByaW50ZXIucHJpbnRfb25l X2xpbmVfc3VtbWFyeSgyLCAxLCAxKQo=