91289 2012-07-13 15:04:41 -0700 test-webkitpy: move printing-related code out of the runner 2012-07-13 16:39:21 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 91282 76022 91292 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 669472 0 dpranke 2012-07-13 15:04:41 -0700 test-webkitpy: move printing-related code out of the runner 669473 1 152348 dpranke 2012-07-13 15:05:36 -0700 Created attachment 152348 Patch 669508 2 152356 dpranke 2012-07-13 15:38:02 -0700 Created attachment 152356 -mfix names of print_* routines 669514 3 152356 rniwa 2012-07-13 15:42:18 -0700 Comment on attachment 152356 -mfix names of print_* routines rs=me. 669583 4 dpranke 2012-07-13 16:39:21 -0700 Committed r122645: <http://trac.webkit.org/changeset/122645> 152348 2012-07-13 15:05:36 -0700 2012-07-13 15:37:58 -0700 Patch bug-91289-20120713150535.patch text/plain 11337 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNjMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWM3MjE2ZTBkM2U2OTBkMDFhZGUyNzczMzczZDI1NDMz NjEzODU3OC4uNWE3NzVjMWE4ZDBjYmUxNmE5ZDdkMTFlNTM5MDYxZjBhZDJhYWExZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1 IEBACiAyMDEyLTA3LTEzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHRlc3Qtd2Via2l0cHk6IG1vdmUgcHJpbnRpbmctcmVsYXRlZCBjb2RlIG91dCBvZiB0 aGUgcnVubmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05MTI4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE1vcmUgcmVmYWN0b3JpbmcgLi4uIHRoaXMgbW92ZXMgYWxsIHByaW50aW5nLXJlbGF0ZWQgc3R1 ZmYgb3V0CisgICAgICAgIG9mIHJ1bm5lci5weSBhbmQgaW50byBwcmludGVyLnB5LgorCisgICAg ICAgIE5vIGZ1bmN0aW9uYWwgY2hhbmdlczsgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5OgorICAgICAgICAoVGVzdGVy Ll9ydW5fdGVzdHMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGVzdC9wcmludGVyLnB5 OgorICAgICAgICAoUHJpbnRlci5fX2luaXRfXyk6CisgICAgICAgIChQcmludGVyKToKKyAgICAg ICAgKFByaW50ZXIudGVzdF9uYW1lKToKKyAgICAgICAgKFByaW50ZXIucHJpbnRfdGVzdF9zdGFy dGVkKToKKyAgICAgICAgKFByaW50ZXIucHJpbnRfdGVzdF9maW5pc2hlZCk6CisgICAgICAgIChQ cmludGVyLnByaW50X3Jlc3VsdCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90ZXN0L3J1 bm5lci5weToKKyAgICAgICAgKFJ1bm5lci5fX2luaXRfXyk6CisgICAgICAgIChSdW5uZXIuYWxs X3Rlc3RfbmFtZXMpOgorICAgICAgICAoUnVubmVyLnJ1bik6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS90ZXN0L3J1bm5lcl91bml0dGVzdC5weToKKyAgICAgICAgKFJ1bm5lclRlc3QudGVz dF9yZWd1bGFyKToKKyAgICAgICAgKFJ1bm5lclRlc3QudGVzdF92ZXJib3NlKToKKyAgICAgICAg KFJ1bm5lclRlc3QudGVzdF90aW1pbmcpOgorCisyMDEyLTA3LTEzICBEaXJrIFByYW5rZSAgPGRw cmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIHdlYmtpdHB5OiBzcGxpdCBwcmludGluZy9s b2dnaW5nIGNvZGUgZm9yIHRlc3Qtd2Via2l0cHkgb3V0IGludG8gYSBuZXcgY2xhc3MKICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxMjgyCiAKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90ZXN0L21haW4ucHkKaW5kZXggNzA3ZmFjMmNmNjNmZjYyYjQ0ZjY0N2YwNTM2 ZGIyNzljNzkzM2VkMy4uMjA0OGQ5ZTU5N2M0MmZhMWU1ZWUwMWVkMGY4ZjZhNDE3NTg1YTJkMSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkKQEAgLTExNCw3ICsxMTQsNyBAQCBjbGFz cyBUZXN0ZXIob2JqZWN0KToKICAgICAgICAgICAgIHN1aXRlcy5hcHBlbmQobG9hZGVyLmxvYWRU ZXN0c0Zyb21OYW1lKG5hbWUsIE5vbmUpKQogCiAgICAgICAgIHRlc3Rfc3VpdGUgPSB1bml0dGVz dC5UZXN0U3VpdGUoc3VpdGVzKQotICAgICAgICB0ZXN0X3J1bm5lciA9IFJ1bm5lcihzZWxmLnBy aW50ZXIuc3RyZWFtLCBzZWxmLl9vcHRpb25zLCBsb2FkZXIpCisgICAgICAgIHRlc3RfcnVubmVy ID0gUnVubmVyKHNlbGYucHJpbnRlciwgc2VsZi5fb3B0aW9ucywgbG9hZGVyKQogCiAgICAgICAg IF9sb2cuZGVidWcoIlJ1bm5pbmcgdGhlIHRlc3RzLiIpCiAgICAgICAgIHJlc3VsdCA9IHRlc3Rf cnVubmVyLnJ1bih0ZXN0X3N1aXRlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90ZXN0L3ByaW50ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvcHJpbnRlci5w eQppbmRleCBiNDhkMzM3N2UzYmUzMGIwYmI5Njk5OThkMDUwNzJhOTZiOWIxNWViLi43YjcwNDZi ODAxMTRjMDc2MzY4MzAwNzA1ZWNkNDdkMTk1NjI4ODAyIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rlc3QvcHJpbnRlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rlc3QvcHJpbnRlci5weQpAQCAtMjIsNiArMjIsNyBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBv cnQgbG9nZ2luZworaW1wb3J0IHJlCiBpbXBvcnQgU3RyaW5nSU8KIAogZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtIGltcG9ydCBvdXRwdXRjYXB0dXJlCkBAIC0zMyw2ICszNCwxMSBAQCBjbGFz cyBQcmludGVyKG9iamVjdCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHN0cmVhbSwgb3B0aW9u cz1Ob25lKToKICAgICAgICAgc2VsZi5zdHJlYW0gPSBzdHJlYW0KICAgICAgICAgc2VsZi5vcHRp b25zID0gb3B0aW9ucworICAgICAgICBzZWxmLnRlc3RfZGVzY3JpcHRpb24gPSByZS5jb21waWxl KCIoXHcrKSBcKChbXHcuXSspXCkiKQorCisgICAgZGVmIHRlc3RfbmFtZShzZWxmLCB0ZXN0KToK KyAgICAgICAgbSA9IHNlbGYudGVzdF9kZXNjcmlwdGlvbi5tYXRjaChzdHIodGVzdCkpCisgICAg ICAgIHJldHVybiAiJXMuJXMiICUgKG0uZ3JvdXAoMiksIG0uZ3JvdXAoMSkpCiAKICAgICBkZWYg Y29uZmlndXJlKHNlbGYsIG9wdGlvbnMpOgogICAgICAgICBzZWxmLm9wdGlvbnMgPSBvcHRpb25z CkBAIC05Miw2ICs5OCw2MCBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgIGlmIHNl bGYub3B0aW9ucy5wYXNzX3Rocm91Z2g6CiAgICAgICAgICAgICBvdXRwdXRjYXB0dXJlLk91dHB1 dENhcHR1cmUuc3RyZWFtX3dyYXBwZXIgPSBfQ2FwdHVyZUFuZFBhc3NUaHJvdWdoU3RyZWFtCiAK KyAgICBkZWYgcHJpbnRfdGVzdF9zdGFydGVkKHNlbGYsIHRlc3RfbmFtZSk6CisgICAgICAgIGlm IHNlbGYub3B0aW9ucy52ZXJib3NlOgorICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUodGVz dF9uYW1lKQorCisgICAgZGVmIHByaW50X3Rlc3RfZmluaXNoZWQoc2VsZiwgcmVzdWx0LCB0ZXN0 X25hbWUsIHRlc3RfdGltZSwgZmFpbHVyZSwgZXJyKToKKyAgICAgICAgdGltaW5nID0gJycKKyAg ICAgICAgaWYgc2VsZi5vcHRpb25zLnRpbWluZzoKKyAgICAgICAgICAgIHRpbWluZyA9ICcgJS40 ZnMnICUgdGVzdF90aW1lCisgICAgICAgIGlmIHNlbGYub3B0aW9ucy52ZXJib3NlOgorICAgICAg ICAgICAgaWYgZmFpbHVyZToKKyAgICAgICAgICAgICAgICBtc2cgPSAnIGZhaWxlZCcKKyAgICAg ICAgICAgIGVsaWYgZXJyOgorICAgICAgICAgICAgICAgIG1zZyA9ICcgZXJyZWQnCisgICAgICAg ICAgICBlbHNlOgorICAgICAgICAgICAgICAgIG1zZyA9ICcgcGFzc2VkJworICAgICAgICAgICAg c2VsZi5zdHJlYW0ud3JpdGUobXNnICsgdGltaW5nICsgJ1xuJykKKyAgICAgICAgZWxzZToKKyAg ICAgICAgICAgIGlmIGZhaWx1cmU6CisgICAgICAgICAgICAgICAgbXNnID0gJ0YnCisgICAgICAg ICAgICBlbGlmIGVycjoKKyAgICAgICAgICAgICAgICBtc2cgPSAnRScKKyAgICAgICAgICAgIGVs c2U6CisgICAgICAgICAgICAgICAgbXNnID0gJy4nCisgICAgICAgICAgICBzZWxmLnN0cmVhbS53 cml0ZShtc2cpCisKKyAgICBkZWYgcHJpbnRfcmVzdWx0KHNlbGYsIHJlc3VsdCwgcnVuX3RpbWUp OgorICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgnXG4nKQorCisgICAgICAgIGZvciAodGVzdCwg ZXJyKSBpbiByZXN1bHQuZXJyb3JzOgorICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIj0i ICogODAgKyAnXG4nKQorICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIkVSUk9SOiAiICsg c2VsZi50ZXN0X25hbWUodGVzdCkgKyAnXG4nKQorICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3Jp dGUoIi0iICogODAgKyAnXG4nKQorICAgICAgICAgICAgZm9yIGxpbmUgaW4gZXJyLnNwbGl0bGlu ZXMoKToKKyAgICAgICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZShsaW5lICsgJ1xuJykKKyAg ICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKCdcbicpCisKKyAgICAgICAgZm9yICh0ZXN0LCBm YWlsdXJlKSBpbiByZXN1bHQuZmFpbHVyZXM6CisgICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0 ZSgiPSIgKiA4MCArICdcbicpCisgICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgiRkFJTFVS RTogIiArIHNlbGYudGVzdF9uYW1lKHRlc3QpICsgJ1xuJykKKyAgICAgICAgICAgIHNlbGYuc3Ry ZWFtLndyaXRlKCItIiAqIDgwICsgJ1xuJykKKyAgICAgICAgICAgIGZvciBsaW5lIGluIGZhaWx1 cmUuc3BsaXRsaW5lcygpOgorICAgICAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKGxpbmUg KyAnXG4nKQorICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoJ1xuJykKKworICAgICAgICBz ZWxmLnN0cmVhbS53cml0ZSgnLScgKiA4MCArICdcbicpCisgICAgICAgIHNlbGYuc3RyZWFtLndy aXRlKCdSYW4gJWQgdGVzdCVzIGluICUuM2ZzXG4nICUKKyAgICAgICAgICAgIChyZXN1bHQudGVz dHNSdW4sIHJlc3VsdC50ZXN0c1J1biAhPSAxIGFuZCAicyIgb3IgIiIsIHJ1bl90aW1lKSkKKwor ICAgICAgICBpZiByZXN1bHQud2FzU3VjY2Vzc2Z1bCgpOgorICAgICAgICAgICAgc2VsZi5zdHJl YW0ud3JpdGUoJ1xuT0tcbicpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzZWxmLnN0cmVh bS53cml0ZSgnRkFJTEVEIChmYWlsdXJlcz0lZCwgZXJyb3JzPSVkKVxuJyAlCisgICAgICAgICAg ICAgICAgKGxlbihyZXN1bHQuZmFpbHVyZXMpLCBsZW4ocmVzdWx0LmVycm9ycykpKQorCiAKIGNs YXNzIF9DYXB0dXJlQW5kUGFzc1Rocm91Z2hTdHJlYW0ob2JqZWN0KToKICAgICBkZWYgX19pbml0 X18oc2VsZiwgc3RyZWFtKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVz dC9ydW5uZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvcnVubmVyLnB5CmluZGV4 IDM5NDE0ZDg2YzMyZDI1YmIxMGU5NTJkNzcwMGNlNzVjOGY4OGQwZDkuLjNlNGE5NTJiOTlkYzk2 YjBjZTkyMjFjNWVlZTAzNmQxYmYwZmJhODYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdGVzdC9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L3J1 bm5lci5weQpAQCAtMjMsNyArMjMsNiBAQAogIiIiY29kZSB0byBhY3R1YWxseSBydW4gYSBsaXN0 IG9mIHB5dGhvbiB0ZXN0cy4iIiIKIAogaW1wb3J0IGxvZ2dpbmcKLWltcG9ydCByZQogaW1wb3J0 IHRpbWUKIGltcG9ydCB1bml0dGVzdAogCkBAIC0zMiwxNSArMzEsMTAgQEAgX2xvZyA9IGxvZ2dp bmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiAKIGNsYXNzIFJ1bm5lcihvYmplY3QpOgotICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBzdHJlYW0sIG9wdGlvbnMsIGxvYWRlcik6CisgICAgZGVmIF9faW5p dF9fKHNlbGYsIHByaW50ZXIsIG9wdGlvbnMsIGxvYWRlcik6CiAgICAgICAgIHNlbGYub3B0aW9u cyA9IG9wdGlvbnMKLSAgICAgICAgc2VsZi5zdHJlYW0gPSBzdHJlYW0KKyAgICAgICAgc2VsZi5w cmludGVyID0gcHJpbnRlcgogICAgICAgICBzZWxmLmxvYWRlciA9IGxvYWRlcgotICAgICAgICBz ZWxmLnRlc3RfZGVzY3JpcHRpb24gPSByZS5jb21waWxlKCIoXHcrKSBcKChbXHcuXSspXCkiKQot Ci0gICAgZGVmIHRlc3RfbmFtZShzZWxmLCB0ZXN0KToKLSAgICAgICAgbSA9IHNlbGYudGVzdF9k ZXNjcmlwdGlvbi5tYXRjaChzdHIodGVzdCkpCi0gICAgICAgIHJldHVybiAiJXMuJXMiICUgKG0u Z3JvdXAoMiksIG0uZ3JvdXAoMSkpCiAKICAgICBkZWYgYWxsX3Rlc3RfbmFtZXMoc2VsZiwgc3Vp dGUpOgogICAgICAgICBuYW1lcyA9IFtdCkBAIC00OCw3ICs0Miw3IEBAIGNsYXNzIFJ1bm5lcihv YmplY3QpOgogICAgICAgICAgICAgZm9yIHQgaW4gc3VpdGUuX3Rlc3RzOgogICAgICAgICAgICAg ICAgIG5hbWVzLmV4dGVuZChzZWxmLmFsbF90ZXN0X25hbWVzKHQpKQogICAgICAgICBlbHNlOgot ICAgICAgICAgICAgbmFtZXMuYXBwZW5kKHNlbGYudGVzdF9uYW1lKHN1aXRlKSkKKyAgICAgICAg ICAgIG5hbWVzLmFwcGVuZChzZWxmLnByaW50ZXIudGVzdF9uYW1lKHN1aXRlKSkKICAgICAgICAg cmV0dXJuIG5hbWVzCiAKICAgICBkZWYgcnVuKHNlbGYsIHN1aXRlKToKQEAgLTU3LDggKzUxLDcg QEAgY2xhc3MgUnVubmVyKG9iamVjdCk6CiAgICAgICAgIHJlc3VsdCA9IHVuaXR0ZXN0LlRlc3RS ZXN1bHQoKQogICAgICAgICBzdG9wID0gcnVuX3N0YXJ0X3RpbWUKICAgICAgICAgZm9yIHRlc3Rf bmFtZSBpbiBhbGxfdGVzdF9uYW1lczoKLSAgICAgICAgICAgIGlmIHNlbGYub3B0aW9ucy52ZXJi b3NlOgotICAgICAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKHRlc3RfbmFtZSkKKyAgICAg ICAgICAgIHNlbGYucHJpbnRlci5wcmludF90ZXN0X3N0YXJ0ZWQodGVzdF9uYW1lKQogICAgICAg ICAgICAgbnVtX2ZhaWx1cmVzID0gbGVuKHJlc3VsdC5mYWlsdXJlcykKICAgICAgICAgICAgIG51 bV9lcnJvcnMgPSBsZW4ocmVzdWx0LmVycm9ycykKIApAQCAtNzUsNTggKzY4LDggQEAgY2xhc3Mg UnVubmVyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgZmFpbHVyZSA9IHJlc3VsdC5mYWlsdXJl c1tudW1fZmFpbHVyZXNdWzFdCiAgICAgICAgICAgICBlbGlmIGxlbihyZXN1bHQuZXJyb3JzKSA+ IG51bV9lcnJvcnM6CiAgICAgICAgICAgICAgICAgZXJyID0gcmVzdWx0LmVycm9yc1tudW1fZXJy b3JzXVsxXQotICAgICAgICAgICAgc2VsZi53cml0ZV9yZXN1bHQocmVzdWx0LCB0ZXN0X25hbWUs IHN0b3AgLSBzdGFydCwgZmFpbHVyZSwgZXJyKQorICAgICAgICAgICAgc2VsZi5wcmludGVyLnBy aW50X3Rlc3RfZmluaXNoZWQocmVzdWx0LCB0ZXN0X25hbWUsIHN0b3AgLSBzdGFydCwgZmFpbHVy ZSwgZXJyKQogCi0gICAgICAgIHNlbGYud3JpdGVfc3VtbWFyeShyZXN1bHQsIHN0b3AgLSBydW5f c3RhcnRfdGltZSkKKyAgICAgICAgc2VsZi5wcmludGVyLnByaW50X3Jlc3VsdChyZXN1bHQsIHN0 b3AgLSBydW5fc3RhcnRfdGltZSkKIAogICAgICAgICByZXR1cm4gcmVzdWx0Ci0KLSAgICBkZWYg d3JpdGVfcmVzdWx0KHNlbGYsIHJlc3VsdCwgdGVzdF9uYW1lLCB0ZXN0X3RpbWUsIGZhaWx1cmU9 Tm9uZSwgZXJyPU5vbmUpOgotICAgICAgICB0aW1pbmcgPSAnJwotICAgICAgICBpZiBzZWxmLm9w dGlvbnMudGltaW5nOgotICAgICAgICAgICAgdGltaW5nID0gJyAlLjRmcycgJSB0ZXN0X3RpbWUK LSAgICAgICAgaWYgc2VsZi5vcHRpb25zLnZlcmJvc2U6Ci0gICAgICAgICAgICBpZiBmYWlsdXJl OgotICAgICAgICAgICAgICAgIG1zZyA9ICcgZmFpbGVkJwotICAgICAgICAgICAgZWxpZiBlcnI6 Ci0gICAgICAgICAgICAgICAgbXNnID0gJyBlcnJlZCcKLSAgICAgICAgICAgIGVsc2U6Ci0gICAg ICAgICAgICAgICAgbXNnID0gJyBwYXNzZWQnCi0gICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0 ZShtc2cgKyB0aW1pbmcgKyAnXG4nKQotICAgICAgICBlbHNlOgotICAgICAgICAgICAgaWYgZmFp bHVyZToKLSAgICAgICAgICAgICAgICBtc2cgPSAnRicKLSAgICAgICAgICAgIGVsaWYgZXJyOgot ICAgICAgICAgICAgICAgIG1zZyA9ICdFJwotICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAg ICAgICBtc2cgPSAnLicKLSAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKG1zZykKLQotICAg IGRlZiB3cml0ZV9zdW1tYXJ5KHNlbGYsIHJlc3VsdCwgcnVuX3RpbWUpOgotICAgICAgICBzZWxm LnN0cmVhbS53cml0ZSgnXG4nKQotCi0gICAgICAgIGZvciAodGVzdCwgZXJyKSBpbiByZXN1bHQu ZXJyb3JzOgotICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIj0iICogODAgKyAnXG4nKQot ICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIkVSUk9SOiAiICsgc2VsZi50ZXN0X25hbWUo dGVzdCkgKyAnXG4nKQotICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIi0iICogODAgKyAn XG4nKQotICAgICAgICAgICAgZm9yIGxpbmUgaW4gZXJyLnNwbGl0bGluZXMoKToKLSAgICAgICAg ICAgICAgICBzZWxmLnN0cmVhbS53cml0ZShsaW5lICsgJ1xuJykKLSAgICAgICAgICAgIHNlbGYu c3RyZWFtLndyaXRlKCdcbicpCi0KLSAgICAgICAgZm9yICh0ZXN0LCBmYWlsdXJlKSBpbiByZXN1 bHQuZmFpbHVyZXM6Ci0gICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgiPSIgKiA4MCArICdc bicpCi0gICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgiRkFJTFVSRTogIiArIHNlbGYudGVz dF9uYW1lKHRlc3QpICsgJ1xuJykKLSAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKCItIiAq IDgwICsgJ1xuJykKLSAgICAgICAgICAgIGZvciBsaW5lIGluIGZhaWx1cmUuc3BsaXRsaW5lcygp OgotICAgICAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKGxpbmUgKyAnXG4nKQotICAgICAg ICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoJ1xuJykKLQotICAgICAgICBzZWxmLnN0cmVhbS53cml0 ZSgnLScgKiA4MCArICdcbicpCi0gICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKCdSYW4gJWQgdGVz dCVzIGluICUuM2ZzXG4nICUKLSAgICAgICAgICAgIChyZXN1bHQudGVzdHNSdW4sIHJlc3VsdC50 ZXN0c1J1biAhPSAxIGFuZCAicyIgb3IgIiIsIHJ1bl90aW1lKSkKLQotICAgICAgICBpZiByZXN1 bHQud2FzU3VjY2Vzc2Z1bCgpOgotICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoJ1xuT0tc bicpCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgnRkFJTEVE IChmYWlsdXJlcz0lZCwgZXJyb3JzPSVkKVxuJyAlCi0gICAgICAgICAgICAgICAgKGxlbihyZXN1 bHQuZmFpbHVyZXMpLCBsZW4ocmVzdWx0LmVycm9ycykpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90ZXN0L3J1bm5lcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdGVzdC9ydW5uZXJfdW5pdHRlc3QucHkKaW5kZXggMjJjZWY4ODIzMzU4OTkxYzI5MjFj YTNlN2Q4NDMxN2Y3N2U4NTgyNi4uMWNmMDE0NmZiNGM4YzcwZDQ0OTA5YWU0MmYxMWEwODI0ZDJj MTVkMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L3J1bm5lcl91bml0 dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvcnVubmVyX3VuaXR0ZXN0 LnB5CkBAIC0yNSw2ICsyNSw3IEBAIGltcG9ydCBTdHJpbmdJTwogaW1wb3J0IHVuaXR0ZXN0CiAK IGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQgTW9ja09wdGlvbnMKK2Zyb20gd2Vi a2l0cHkudGVzdC5wcmludGVyIGltcG9ydCBQcmludGVyCiBmcm9tIHdlYmtpdHB5LnRlc3QucnVu bmVyIGltcG9ydCBSdW5uZXIKIAogCkBAIC03NCw3ICs3NSw3IEBAIGNsYXNzIFJ1bm5lclRlc3Qo dW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBsb2FkZXIgPSBGYWtlTG9hZGVyKCgndGVzdDEg KEZvbyknLCAnLicsICcnKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoJ3Rlc3QyIChG b28pJywgJ0YnLCAndGVzdDJcbmZhaWxlZCcpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICgndGVzdDMgKEZvbyknLCAnRScsICd0ZXN0M1xuZXJyZWQnKSkKLSAgICAgICAgcmVzdWx0ID0g UnVubmVyKHN0cmVhbSwgb3B0aW9ucywgbG9hZGVyKS5ydW4obG9hZGVyLnRvcF9zdWl0ZSgpKQor ICAgICAgICByZXN1bHQgPSBSdW5uZXIoUHJpbnRlcihzdHJlYW0sIG9wdGlvbnMpLCBvcHRpb25z LCBsb2FkZXIpLnJ1bihsb2FkZXIudG9wX3N1aXRlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFs c2UocmVzdWx0Lndhc1N1Y2Nlc3NmdWwoKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocmVz dWx0LnRlc3RzUnVuLCAzKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhsZW4ocmVzdWx0LmZh aWx1cmVzKSwgMSkKQEAgLTg3LDcgKzg4LDcgQEAgY2xhc3MgUnVubmVyVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgIGxvYWRlciA9IEZha2VMb2FkZXIoKCd0ZXN0MSAoRm9vKScsICcu JywgJycpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICgndGVzdDIgKEZvbyknLCAnRics ICd0ZXN0MlxuZmFpbGVkJyksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCd0ZXN0MyAo Rm9vKScsICdFJywgJ3Rlc3QzXG5lcnJlZCcpKQotICAgICAgICByZXN1bHQgPSBSdW5uZXIoc3Ry ZWFtLCBvcHRpb25zLCBsb2FkZXIpLnJ1bihsb2FkZXIudG9wX3N1aXRlKCkpCisgICAgICAgIHJl c3VsdCA9IFJ1bm5lcihQcmludGVyKHN0cmVhbSwgb3B0aW9ucyksIG9wdGlvbnMsIGxvYWRlciku cnVuKGxvYWRlci50b3Bfc3VpdGUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShyZXN1bHQu d2FzU3VjY2Vzc2Z1bCgpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhyZXN1bHQudGVzdHNS dW4sIDMpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGxlbihyZXN1bHQuZmFpbHVyZXMpLCAx KQpAQCAtMTAwLDcgKzEwMSw3IEBAIGNsYXNzIFJ1bm5lclRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICBsb2FkZXIgPSBGYWtlTG9hZGVyKCgndGVzdDEgKEZvbyknLCAnLicsICcnKSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoJ3Rlc3QyIChGb28pJywgJ0YnLCAndGVzdDJc bmZhaWxlZCcpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICgndGVzdDMgKEZvbyknLCAn RScsICd0ZXN0M1xuZXJyZWQnKSkKLSAgICAgICAgcmVzdWx0ID0gUnVubmVyKHN0cmVhbSwgb3B0 aW9ucywgbG9hZGVyKS5ydW4obG9hZGVyLnRvcF9zdWl0ZSgpKQorICAgICAgICByZXN1bHQgPSBS dW5uZXIoUHJpbnRlcihzdHJlYW0sIG9wdGlvbnMpLCBvcHRpb25zLCBsb2FkZXIpLnJ1bihsb2Fk ZXIudG9wX3N1aXRlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UocmVzdWx0Lndhc1N1Y2Nl c3NmdWwoKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocmVzdWx0LnRlc3RzUnVuLCAzKQog ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhsZW4ocmVzdWx0LmZhaWx1cmVzKSwgMSkK 152356 2012-07-13 15:38:02 -0700 2012-07-13 15:42:18 -0700 -mfix names of print_* routines bug-91289-20120713153801.patch text/plain 11337 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNjMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWM3MjE2ZTBkM2U2OTBkMDFhZGUyNzczMzczZDI1NDMz NjEzODU3OC4uMDNmMmZiMDIzNGQ4M2JhMTE1ZjQxZWYxNTZhMjUyZGM1MzFjNWEyMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1 IEBACiAyMDEyLTA3LTEzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHRlc3Qtd2Via2l0cHk6IG1vdmUgcHJpbnRpbmctcmVsYXRlZCBjb2RlIG91dCBvZiB0 aGUgcnVubmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05MTI4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE1vcmUgcmVmYWN0b3JpbmcgLi4uIHRoaXMgbW92ZXMgYWxsIHByaW50aW5nLXJlbGF0ZWQgc3R1 ZmYgb3V0CisgICAgICAgIG9mIHJ1bm5lci5weSBhbmQgaW50byBwcmludGVyLnB5LgorCisgICAg ICAgIE5vIGZ1bmN0aW9uYWwgY2hhbmdlczsgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5OgorICAgICAgICAoVGVzdGVy Ll9ydW5fdGVzdHMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGVzdC9wcmludGVyLnB5 OgorICAgICAgICAoUHJpbnRlci5fX2luaXRfXyk6CisgICAgICAgIChQcmludGVyKToKKyAgICAg ICAgKFByaW50ZXIudGVzdF9uYW1lKToKKyAgICAgICAgKFByaW50ZXIucHJpbnRfc3RhcnRlZF90 ZXN0KToKKyAgICAgICAgKFByaW50ZXIucHJpbnRfZmluaXNoZWRfdGVzdCk6CisgICAgICAgIChQ cmludGVyLnByaW50X3Jlc3VsdCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90ZXN0L3J1 bm5lci5weToKKyAgICAgICAgKFJ1bm5lci5fX2luaXRfXyk6CisgICAgICAgIChSdW5uZXIuYWxs X3Rlc3RfbmFtZXMpOgorICAgICAgICAoUnVubmVyLnJ1bik6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS90ZXN0L3J1bm5lcl91bml0dGVzdC5weToKKyAgICAgICAgKFJ1bm5lclRlc3QudGVz dF9yZWd1bGFyKToKKyAgICAgICAgKFJ1bm5lclRlc3QudGVzdF92ZXJib3NlKToKKyAgICAgICAg KFJ1bm5lclRlc3QudGVzdF90aW1pbmcpOgorCisyMDEyLTA3LTEzICBEaXJrIFByYW5rZSAgPGRw cmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIHdlYmtpdHB5OiBzcGxpdCBwcmludGluZy9s b2dnaW5nIGNvZGUgZm9yIHRlc3Qtd2Via2l0cHkgb3V0IGludG8gYSBuZXcgY2xhc3MKICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxMjgyCiAKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90ZXN0L21haW4ucHkKaW5kZXggNzA3ZmFjMmNmNjNmZjYyYjQ0ZjY0N2YwNTM2 ZGIyNzljNzkzM2VkMy4uMjA0OGQ5ZTU5N2M0MmZhMWU1ZWUwMWVkMGY4ZjZhNDE3NTg1YTJkMSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkKQEAgLTExNCw3ICsxMTQsNyBAQCBjbGFz cyBUZXN0ZXIob2JqZWN0KToKICAgICAgICAgICAgIHN1aXRlcy5hcHBlbmQobG9hZGVyLmxvYWRU ZXN0c0Zyb21OYW1lKG5hbWUsIE5vbmUpKQogCiAgICAgICAgIHRlc3Rfc3VpdGUgPSB1bml0dGVz dC5UZXN0U3VpdGUoc3VpdGVzKQotICAgICAgICB0ZXN0X3J1bm5lciA9IFJ1bm5lcihzZWxmLnBy aW50ZXIuc3RyZWFtLCBzZWxmLl9vcHRpb25zLCBsb2FkZXIpCisgICAgICAgIHRlc3RfcnVubmVy ID0gUnVubmVyKHNlbGYucHJpbnRlciwgc2VsZi5fb3B0aW9ucywgbG9hZGVyKQogCiAgICAgICAg IF9sb2cuZGVidWcoIlJ1bm5pbmcgdGhlIHRlc3RzLiIpCiAgICAgICAgIHJlc3VsdCA9IHRlc3Rf cnVubmVyLnJ1bih0ZXN0X3N1aXRlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90ZXN0L3ByaW50ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvcHJpbnRlci5w eQppbmRleCBiNDhkMzM3N2UzYmUzMGIwYmI5Njk5OThkMDUwNzJhOTZiOWIxNWViLi43N2UyOGI4 ZDExY2ViZWM4ZmI0ZTUzMTllMTE0MDE2NzUwMDFkY2M5IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rlc3QvcHJpbnRlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rlc3QvcHJpbnRlci5weQpAQCAtMjIsNiArMjIsNyBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBv cnQgbG9nZ2luZworaW1wb3J0IHJlCiBpbXBvcnQgU3RyaW5nSU8KIAogZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtIGltcG9ydCBvdXRwdXRjYXB0dXJlCkBAIC0zMyw2ICszNCwxMSBAQCBjbGFz cyBQcmludGVyKG9iamVjdCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHN0cmVhbSwgb3B0aW9u cz1Ob25lKToKICAgICAgICAgc2VsZi5zdHJlYW0gPSBzdHJlYW0KICAgICAgICAgc2VsZi5vcHRp b25zID0gb3B0aW9ucworICAgICAgICBzZWxmLnRlc3RfZGVzY3JpcHRpb24gPSByZS5jb21waWxl KCIoXHcrKSBcKChbXHcuXSspXCkiKQorCisgICAgZGVmIHRlc3RfbmFtZShzZWxmLCB0ZXN0KToK KyAgICAgICAgbSA9IHNlbGYudGVzdF9kZXNjcmlwdGlvbi5tYXRjaChzdHIodGVzdCkpCisgICAg ICAgIHJldHVybiAiJXMuJXMiICUgKG0uZ3JvdXAoMiksIG0uZ3JvdXAoMSkpCiAKICAgICBkZWYg Y29uZmlndXJlKHNlbGYsIG9wdGlvbnMpOgogICAgICAgICBzZWxmLm9wdGlvbnMgPSBvcHRpb25z CkBAIC05Miw2ICs5OCw2MCBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgIGlmIHNl bGYub3B0aW9ucy5wYXNzX3Rocm91Z2g6CiAgICAgICAgICAgICBvdXRwdXRjYXB0dXJlLk91dHB1 dENhcHR1cmUuc3RyZWFtX3dyYXBwZXIgPSBfQ2FwdHVyZUFuZFBhc3NUaHJvdWdoU3RyZWFtCiAK KyAgICBkZWYgcHJpbnRfc3RhcnRlZF90ZXN0KHNlbGYsIHRlc3RfbmFtZSk6CisgICAgICAgIGlm IHNlbGYub3B0aW9ucy52ZXJib3NlOgorICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUodGVz dF9uYW1lKQorCisgICAgZGVmIHByaW50X2ZpbmlzaGVkX3Rlc3Qoc2VsZiwgcmVzdWx0LCB0ZXN0 X25hbWUsIHRlc3RfdGltZSwgZmFpbHVyZSwgZXJyKToKKyAgICAgICAgdGltaW5nID0gJycKKyAg ICAgICAgaWYgc2VsZi5vcHRpb25zLnRpbWluZzoKKyAgICAgICAgICAgIHRpbWluZyA9ICcgJS40 ZnMnICUgdGVzdF90aW1lCisgICAgICAgIGlmIHNlbGYub3B0aW9ucy52ZXJib3NlOgorICAgICAg ICAgICAgaWYgZmFpbHVyZToKKyAgICAgICAgICAgICAgICBtc2cgPSAnIGZhaWxlZCcKKyAgICAg ICAgICAgIGVsaWYgZXJyOgorICAgICAgICAgICAgICAgIG1zZyA9ICcgZXJyZWQnCisgICAgICAg ICAgICBlbHNlOgorICAgICAgICAgICAgICAgIG1zZyA9ICcgcGFzc2VkJworICAgICAgICAgICAg c2VsZi5zdHJlYW0ud3JpdGUobXNnICsgdGltaW5nICsgJ1xuJykKKyAgICAgICAgZWxzZToKKyAg ICAgICAgICAgIGlmIGZhaWx1cmU6CisgICAgICAgICAgICAgICAgbXNnID0gJ0YnCisgICAgICAg ICAgICBlbGlmIGVycjoKKyAgICAgICAgICAgICAgICBtc2cgPSAnRScKKyAgICAgICAgICAgIGVs c2U6CisgICAgICAgICAgICAgICAgbXNnID0gJy4nCisgICAgICAgICAgICBzZWxmLnN0cmVhbS53 cml0ZShtc2cpCisKKyAgICBkZWYgcHJpbnRfcmVzdWx0KHNlbGYsIHJlc3VsdCwgcnVuX3RpbWUp OgorICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgnXG4nKQorCisgICAgICAgIGZvciAodGVzdCwg ZXJyKSBpbiByZXN1bHQuZXJyb3JzOgorICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIj0i ICogODAgKyAnXG4nKQorICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIkVSUk9SOiAiICsg c2VsZi50ZXN0X25hbWUodGVzdCkgKyAnXG4nKQorICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3Jp dGUoIi0iICogODAgKyAnXG4nKQorICAgICAgICAgICAgZm9yIGxpbmUgaW4gZXJyLnNwbGl0bGlu ZXMoKToKKyAgICAgICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZShsaW5lICsgJ1xuJykKKyAg ICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKCdcbicpCisKKyAgICAgICAgZm9yICh0ZXN0LCBm YWlsdXJlKSBpbiByZXN1bHQuZmFpbHVyZXM6CisgICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0 ZSgiPSIgKiA4MCArICdcbicpCisgICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgiRkFJTFVS RTogIiArIHNlbGYudGVzdF9uYW1lKHRlc3QpICsgJ1xuJykKKyAgICAgICAgICAgIHNlbGYuc3Ry ZWFtLndyaXRlKCItIiAqIDgwICsgJ1xuJykKKyAgICAgICAgICAgIGZvciBsaW5lIGluIGZhaWx1 cmUuc3BsaXRsaW5lcygpOgorICAgICAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKGxpbmUg KyAnXG4nKQorICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoJ1xuJykKKworICAgICAgICBz ZWxmLnN0cmVhbS53cml0ZSgnLScgKiA4MCArICdcbicpCisgICAgICAgIHNlbGYuc3RyZWFtLndy aXRlKCdSYW4gJWQgdGVzdCVzIGluICUuM2ZzXG4nICUKKyAgICAgICAgICAgIChyZXN1bHQudGVz dHNSdW4sIHJlc3VsdC50ZXN0c1J1biAhPSAxIGFuZCAicyIgb3IgIiIsIHJ1bl90aW1lKSkKKwor ICAgICAgICBpZiByZXN1bHQud2FzU3VjY2Vzc2Z1bCgpOgorICAgICAgICAgICAgc2VsZi5zdHJl YW0ud3JpdGUoJ1xuT0tcbicpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzZWxmLnN0cmVh bS53cml0ZSgnRkFJTEVEIChmYWlsdXJlcz0lZCwgZXJyb3JzPSVkKVxuJyAlCisgICAgICAgICAg ICAgICAgKGxlbihyZXN1bHQuZmFpbHVyZXMpLCBsZW4ocmVzdWx0LmVycm9ycykpKQorCiAKIGNs YXNzIF9DYXB0dXJlQW5kUGFzc1Rocm91Z2hTdHJlYW0ob2JqZWN0KToKICAgICBkZWYgX19pbml0 X18oc2VsZiwgc3RyZWFtKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVz dC9ydW5uZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvcnVubmVyLnB5CmluZGV4 IDM5NDE0ZDg2YzMyZDI1YmIxMGU5NTJkNzcwMGNlNzVjOGY4OGQwZDkuLjljOTUyMDc1ZWFmNWM0 MTFmMTFiY2NjMzgwZGU0NjBlNzRhZWRkMzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdGVzdC9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L3J1 bm5lci5weQpAQCAtMjMsNyArMjMsNiBAQAogIiIiY29kZSB0byBhY3R1YWxseSBydW4gYSBsaXN0 IG9mIHB5dGhvbiB0ZXN0cy4iIiIKIAogaW1wb3J0IGxvZ2dpbmcKLWltcG9ydCByZQogaW1wb3J0 IHRpbWUKIGltcG9ydCB1bml0dGVzdAogCkBAIC0zMiwxNSArMzEsMTAgQEAgX2xvZyA9IGxvZ2dp bmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiAKIGNsYXNzIFJ1bm5lcihvYmplY3QpOgotICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBzdHJlYW0sIG9wdGlvbnMsIGxvYWRlcik6CisgICAgZGVmIF9faW5p dF9fKHNlbGYsIHByaW50ZXIsIG9wdGlvbnMsIGxvYWRlcik6CiAgICAgICAgIHNlbGYub3B0aW9u cyA9IG9wdGlvbnMKLSAgICAgICAgc2VsZi5zdHJlYW0gPSBzdHJlYW0KKyAgICAgICAgc2VsZi5w cmludGVyID0gcHJpbnRlcgogICAgICAgICBzZWxmLmxvYWRlciA9IGxvYWRlcgotICAgICAgICBz ZWxmLnRlc3RfZGVzY3JpcHRpb24gPSByZS5jb21waWxlKCIoXHcrKSBcKChbXHcuXSspXCkiKQot Ci0gICAgZGVmIHRlc3RfbmFtZShzZWxmLCB0ZXN0KToKLSAgICAgICAgbSA9IHNlbGYudGVzdF9k ZXNjcmlwdGlvbi5tYXRjaChzdHIodGVzdCkpCi0gICAgICAgIHJldHVybiAiJXMuJXMiICUgKG0u Z3JvdXAoMiksIG0uZ3JvdXAoMSkpCiAKICAgICBkZWYgYWxsX3Rlc3RfbmFtZXMoc2VsZiwgc3Vp dGUpOgogICAgICAgICBuYW1lcyA9IFtdCkBAIC00OCw3ICs0Miw3IEBAIGNsYXNzIFJ1bm5lcihv YmplY3QpOgogICAgICAgICAgICAgZm9yIHQgaW4gc3VpdGUuX3Rlc3RzOgogICAgICAgICAgICAg ICAgIG5hbWVzLmV4dGVuZChzZWxmLmFsbF90ZXN0X25hbWVzKHQpKQogICAgICAgICBlbHNlOgot ICAgICAgICAgICAgbmFtZXMuYXBwZW5kKHNlbGYudGVzdF9uYW1lKHN1aXRlKSkKKyAgICAgICAg ICAgIG5hbWVzLmFwcGVuZChzZWxmLnByaW50ZXIudGVzdF9uYW1lKHN1aXRlKSkKICAgICAgICAg cmV0dXJuIG5hbWVzCiAKICAgICBkZWYgcnVuKHNlbGYsIHN1aXRlKToKQEAgLTU3LDggKzUxLDcg QEAgY2xhc3MgUnVubmVyKG9iamVjdCk6CiAgICAgICAgIHJlc3VsdCA9IHVuaXR0ZXN0LlRlc3RS ZXN1bHQoKQogICAgICAgICBzdG9wID0gcnVuX3N0YXJ0X3RpbWUKICAgICAgICAgZm9yIHRlc3Rf bmFtZSBpbiBhbGxfdGVzdF9uYW1lczoKLSAgICAgICAgICAgIGlmIHNlbGYub3B0aW9ucy52ZXJi b3NlOgotICAgICAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKHRlc3RfbmFtZSkKKyAgICAg ICAgICAgIHNlbGYucHJpbnRlci5wcmludF9zdGFydGVkX3Rlc3QodGVzdF9uYW1lKQogICAgICAg ICAgICAgbnVtX2ZhaWx1cmVzID0gbGVuKHJlc3VsdC5mYWlsdXJlcykKICAgICAgICAgICAgIG51 bV9lcnJvcnMgPSBsZW4ocmVzdWx0LmVycm9ycykKIApAQCAtNzUsNTggKzY4LDggQEAgY2xhc3Mg UnVubmVyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgZmFpbHVyZSA9IHJlc3VsdC5mYWlsdXJl c1tudW1fZmFpbHVyZXNdWzFdCiAgICAgICAgICAgICBlbGlmIGxlbihyZXN1bHQuZXJyb3JzKSA+ IG51bV9lcnJvcnM6CiAgICAgICAgICAgICAgICAgZXJyID0gcmVzdWx0LmVycm9yc1tudW1fZXJy b3JzXVsxXQotICAgICAgICAgICAgc2VsZi53cml0ZV9yZXN1bHQocmVzdWx0LCB0ZXN0X25hbWUs IHN0b3AgLSBzdGFydCwgZmFpbHVyZSwgZXJyKQorICAgICAgICAgICAgc2VsZi5wcmludGVyLnBy aW50X2ZpbmlzaGVkX3Rlc3QocmVzdWx0LCB0ZXN0X25hbWUsIHN0b3AgLSBzdGFydCwgZmFpbHVy ZSwgZXJyKQogCi0gICAgICAgIHNlbGYud3JpdGVfc3VtbWFyeShyZXN1bHQsIHN0b3AgLSBydW5f c3RhcnRfdGltZSkKKyAgICAgICAgc2VsZi5wcmludGVyLnByaW50X3Jlc3VsdChyZXN1bHQsIHN0 b3AgLSBydW5fc3RhcnRfdGltZSkKIAogICAgICAgICByZXR1cm4gcmVzdWx0Ci0KLSAgICBkZWYg d3JpdGVfcmVzdWx0KHNlbGYsIHJlc3VsdCwgdGVzdF9uYW1lLCB0ZXN0X3RpbWUsIGZhaWx1cmU9 Tm9uZSwgZXJyPU5vbmUpOgotICAgICAgICB0aW1pbmcgPSAnJwotICAgICAgICBpZiBzZWxmLm9w dGlvbnMudGltaW5nOgotICAgICAgICAgICAgdGltaW5nID0gJyAlLjRmcycgJSB0ZXN0X3RpbWUK LSAgICAgICAgaWYgc2VsZi5vcHRpb25zLnZlcmJvc2U6Ci0gICAgICAgICAgICBpZiBmYWlsdXJl OgotICAgICAgICAgICAgICAgIG1zZyA9ICcgZmFpbGVkJwotICAgICAgICAgICAgZWxpZiBlcnI6 Ci0gICAgICAgICAgICAgICAgbXNnID0gJyBlcnJlZCcKLSAgICAgICAgICAgIGVsc2U6Ci0gICAg ICAgICAgICAgICAgbXNnID0gJyBwYXNzZWQnCi0gICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0 ZShtc2cgKyB0aW1pbmcgKyAnXG4nKQotICAgICAgICBlbHNlOgotICAgICAgICAgICAgaWYgZmFp bHVyZToKLSAgICAgICAgICAgICAgICBtc2cgPSAnRicKLSAgICAgICAgICAgIGVsaWYgZXJyOgot ICAgICAgICAgICAgICAgIG1zZyA9ICdFJwotICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAg ICAgICBtc2cgPSAnLicKLSAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKG1zZykKLQotICAg IGRlZiB3cml0ZV9zdW1tYXJ5KHNlbGYsIHJlc3VsdCwgcnVuX3RpbWUpOgotICAgICAgICBzZWxm LnN0cmVhbS53cml0ZSgnXG4nKQotCi0gICAgICAgIGZvciAodGVzdCwgZXJyKSBpbiByZXN1bHQu ZXJyb3JzOgotICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIj0iICogODAgKyAnXG4nKQot ICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIkVSUk9SOiAiICsgc2VsZi50ZXN0X25hbWUo dGVzdCkgKyAnXG4nKQotICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIi0iICogODAgKyAn XG4nKQotICAgICAgICAgICAgZm9yIGxpbmUgaW4gZXJyLnNwbGl0bGluZXMoKToKLSAgICAgICAg ICAgICAgICBzZWxmLnN0cmVhbS53cml0ZShsaW5lICsgJ1xuJykKLSAgICAgICAgICAgIHNlbGYu c3RyZWFtLndyaXRlKCdcbicpCi0KLSAgICAgICAgZm9yICh0ZXN0LCBmYWlsdXJlKSBpbiByZXN1 bHQuZmFpbHVyZXM6Ci0gICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgiPSIgKiA4MCArICdc bicpCi0gICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgiRkFJTFVSRTogIiArIHNlbGYudGVz dF9uYW1lKHRlc3QpICsgJ1xuJykKLSAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKCItIiAq IDgwICsgJ1xuJykKLSAgICAgICAgICAgIGZvciBsaW5lIGluIGZhaWx1cmUuc3BsaXRsaW5lcygp OgotICAgICAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKGxpbmUgKyAnXG4nKQotICAgICAg ICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoJ1xuJykKLQotICAgICAgICBzZWxmLnN0cmVhbS53cml0 ZSgnLScgKiA4MCArICdcbicpCi0gICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKCdSYW4gJWQgdGVz dCVzIGluICUuM2ZzXG4nICUKLSAgICAgICAgICAgIChyZXN1bHQudGVzdHNSdW4sIHJlc3VsdC50 ZXN0c1J1biAhPSAxIGFuZCAicyIgb3IgIiIsIHJ1bl90aW1lKSkKLQotICAgICAgICBpZiByZXN1 bHQud2FzU3VjY2Vzc2Z1bCgpOgotICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoJ1xuT0tc bicpCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgnRkFJTEVE IChmYWlsdXJlcz0lZCwgZXJyb3JzPSVkKVxuJyAlCi0gICAgICAgICAgICAgICAgKGxlbihyZXN1 bHQuZmFpbHVyZXMpLCBsZW4ocmVzdWx0LmVycm9ycykpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90ZXN0L3J1bm5lcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdGVzdC9ydW5uZXJfdW5pdHRlc3QucHkKaW5kZXggMjJjZWY4ODIzMzU4OTkxYzI5MjFj YTNlN2Q4NDMxN2Y3N2U4NTgyNi4uMWNmMDE0NmZiNGM4YzcwZDQ0OTA5YWU0MmYxMWEwODI0ZDJj MTVkMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L3J1bm5lcl91bml0 dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvcnVubmVyX3VuaXR0ZXN0 LnB5CkBAIC0yNSw2ICsyNSw3IEBAIGltcG9ydCBTdHJpbmdJTwogaW1wb3J0IHVuaXR0ZXN0CiAK IGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQgTW9ja09wdGlvbnMKK2Zyb20gd2Vi a2l0cHkudGVzdC5wcmludGVyIGltcG9ydCBQcmludGVyCiBmcm9tIHdlYmtpdHB5LnRlc3QucnVu bmVyIGltcG9ydCBSdW5uZXIKIAogCkBAIC03NCw3ICs3NSw3IEBAIGNsYXNzIFJ1bm5lclRlc3Qo dW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBsb2FkZXIgPSBGYWtlTG9hZGVyKCgndGVzdDEg KEZvbyknLCAnLicsICcnKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoJ3Rlc3QyIChG b28pJywgJ0YnLCAndGVzdDJcbmZhaWxlZCcpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICgndGVzdDMgKEZvbyknLCAnRScsICd0ZXN0M1xuZXJyZWQnKSkKLSAgICAgICAgcmVzdWx0ID0g UnVubmVyKHN0cmVhbSwgb3B0aW9ucywgbG9hZGVyKS5ydW4obG9hZGVyLnRvcF9zdWl0ZSgpKQor ICAgICAgICByZXN1bHQgPSBSdW5uZXIoUHJpbnRlcihzdHJlYW0sIG9wdGlvbnMpLCBvcHRpb25z LCBsb2FkZXIpLnJ1bihsb2FkZXIudG9wX3N1aXRlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFs c2UocmVzdWx0Lndhc1N1Y2Nlc3NmdWwoKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocmVz dWx0LnRlc3RzUnVuLCAzKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhsZW4ocmVzdWx0LmZh aWx1cmVzKSwgMSkKQEAgLTg3LDcgKzg4LDcgQEAgY2xhc3MgUnVubmVyVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgIGxvYWRlciA9IEZha2VMb2FkZXIoKCd0ZXN0MSAoRm9vKScsICcu JywgJycpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICgndGVzdDIgKEZvbyknLCAnRics ICd0ZXN0MlxuZmFpbGVkJyksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCd0ZXN0MyAo Rm9vKScsICdFJywgJ3Rlc3QzXG5lcnJlZCcpKQotICAgICAgICByZXN1bHQgPSBSdW5uZXIoc3Ry ZWFtLCBvcHRpb25zLCBsb2FkZXIpLnJ1bihsb2FkZXIudG9wX3N1aXRlKCkpCisgICAgICAgIHJl c3VsdCA9IFJ1bm5lcihQcmludGVyKHN0cmVhbSwgb3B0aW9ucyksIG9wdGlvbnMsIGxvYWRlciku cnVuKGxvYWRlci50b3Bfc3VpdGUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShyZXN1bHQu d2FzU3VjY2Vzc2Z1bCgpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhyZXN1bHQudGVzdHNS dW4sIDMpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGxlbihyZXN1bHQuZmFpbHVyZXMpLCAx KQpAQCAtMTAwLDcgKzEwMSw3IEBAIGNsYXNzIFJ1bm5lclRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICBsb2FkZXIgPSBGYWtlTG9hZGVyKCgndGVzdDEgKEZvbyknLCAnLicsICcnKSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoJ3Rlc3QyIChGb28pJywgJ0YnLCAndGVzdDJc bmZhaWxlZCcpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICgndGVzdDMgKEZvbyknLCAn RScsICd0ZXN0M1xuZXJyZWQnKSkKLSAgICAgICAgcmVzdWx0ID0gUnVubmVyKHN0cmVhbSwgb3B0 aW9ucywgbG9hZGVyKS5ydW4obG9hZGVyLnRvcF9zdWl0ZSgpKQorICAgICAgICByZXN1bHQgPSBS dW5uZXIoUHJpbnRlcihzdHJlYW0sIG9wdGlvbnMpLCBvcHRpb25zLCBsb2FkZXIpLnJ1bihsb2Fk ZXIudG9wX3N1aXRlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UocmVzdWx0Lndhc1N1Y2Nl c3NmdWwoKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocmVzdWx0LnRlc3RzUnVuLCAzKQog ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhsZW4ocmVzdWx0LmZhaWx1cmVzKSwgMSkK