64990 2011-07-21 16:01:23 -0700 simplify gtest display now that we strip modifiers from the JSON 2011-07-21 17:48:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth eric tony oldest_to_newest 440691 0 ojan 2011-07-21 16:01:23 -0700 simplify gtest display now that we strip modifiers from the JSON 440695 1 101657 ojan 2011-07-21 16:03:59 -0700 Created attachment 101657 Patch 440713 2 101663 ojan 2011-07-21 16:40:17 -0700 Created attachment 101663 Patch 440731 3 101663 abarth 2011-07-21 17:03:32 -0700 Comment on attachment 101663 Patch In which I noodle you about qunit. 440755 4 ojan 2011-07-21 17:48:16 -0700 Committed r91541: <http://trac.webkit.org/changeset/91541> 101657 2011-07-21 16:03:59 -0700 2011-07-21 16:40:14 -0700 Patch bug-64990-20110721160358.patch text/plain 6459 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogOTE1MTgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNGYzNTFhMzllMjAzNTYyYmMyYTNlNjUzY2FhYTA2Mzg3 YzNhN2RiLi43Y2U1MWZmOWRlMDNkZDhmMmY1OTM0NGU5NDE5ZDBiNTg3YzgwMDcwIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTEtMDctMjEgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAg ICBzaW1wbGlmeSBndGVzdCBkaXNwbGF5IG5vdyB0aGF0IHdlIHN0cmlwIG1vZGlmaWVycyBmcm9t IHRoZSBKU09OCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02NDk5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vdyB0aGF0IG5hbWVzIGFyZSBub3JtYWxpemVkLCB3ZSBjYW4gcmVtb3ZlIGFsbCB0aGUgY29k ZSB0aGF0CisgICAgICAgIGhhbmRsZXMgZ3Rlc3QgbmFtZSBjaGFuZ2VzIChlLmcuIGZvciBhZGRp bmcgbW9kaWZpZXJzIGxpa2UgRElTQUJMRURfKS4KKyAgICAgICAgSW5zdGVhZCwgaWYgeW91IHRy eSB0byBsaXN0IGEgdGVzdCB3aXRoIGEgbW9kaWZpZXIgaW4gaXQsIHdlIG5lZWQKKyAgICAgICAg dG8gc3RyaXAgdGhlIG1vZGlmaWVyIHNvIHdlIGdldCB0aGUgbm9ybWFsaXplZCB2YWx1ZS4KKwor ICAgICAgICBXZSBhbHNvIGdldCByaWQgb2YgdGhlIGNvbmNlcHQgb2YgZXh0cmEvbWlzc2luZyBl eHBlY3RhdGlvbnMgZm9yIGd0ZXN0cy4KKyAgICAgICAgSW4gYSBwYXRjaCBzb29uLCB3ZSdsbCBz dG9wIHNob3dpbmcgZXh0cmEvbWlzc2luZyBleHBlY3RhdGlvbnMgZnJvbSB0aGUgVUkKKyAgICAg ICAgZW50aXJlbHkgYW5kIG9ubHkgbGVhdmUgaXQgZm9yIHRoZSBzcGVjaWFsIHVwZGF0aW5nIHRl c3RfZXhwZWN0YXRpb25zLnR4dAorICAgICAgICB2aWV3IG9mIHRoZSBkYXNoYm9hcmQsIHdoaWNo IGRvZXNuJ3QgYXBwbHkgdG8gZ3Rlc3RzLgorCisgICAgICAgICogVGVzdFJlc3VsdFNlcnZlci9z dGF0aWMtZGFzaGJvYXJkcy9mbGFraW5lc3NfZGFzaGJvYXJkLmh0bWw6CisgICAgICAgICogVGVz dFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9mbGFraW5lc3NfZGFzaGJvYXJkX3Rlc3Rz LmpzOgorCiAyMDExLTA3LTE5ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgZml4IGxpbmtzIG9uIHRoZSBmbGFraW5lc3MgZGFzaGJvYXJkCmRpZmYgLS1naXQgYS9U b29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2ZsYWtpbmVzc19kYXNoYm9h cmQuaHRtbCBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvZmxha2lu ZXNzX2Rhc2hib2FyZC5odG1sCmluZGV4IDc2Nzc1OWU0ZWQwMGMxZDZhMzFhNWMxZTVjNzgwMGYw ZTg5YWY0NDQuLjUwNmQ1ZjE5NDYyN2NhMDlhN2E3NzMyMTBjZGEyZDgyMDQzMDNkZWIgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvZmxha2luZXNz X2Rhc2hib2FyZC5odG1sCisrKyBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hi b2FyZHMvZmxha2luZXNzX2Rhc2hib2FyZC5odG1sCkBAIC0zMTQsOCArMzE0LDcgQEAgcHJlLmV4 cGVjdGF0aW9uIHsKIHZhciBBTEwgPSAnQUxMJzsKIHZhciBGT1JXQVJEID0gJ2ZvcndhcmQnOwog dmFyIEJBQ0tXQVJEID0gJ2JhY2t3YXJkJzsKLXZhciBHVEVTVF9GTEFLWV9NQVJLRVIgPSAnXC5G TEFLWV8nOwotdmFyIEdURVNUX0ZBSUxTX01BUktFUiA9ICdcLkZBSUxTXyc7Cit2YXIgR1RFU1Rf TU9ESUZJRVJTID0gWydGTEFLWScsICdGQUlMUycsICdNQVlCRScsICdESVNBQkxFRCddOwogdmFy IFRFU1RfVVJMX0JBU0VfUEFUSF9UUkFDID0gJ2h0dHA6Ly90cmFjLndlYmtpdC5vcmcvYnJvd3Nl ci90cnVuay9MYXlvdXRUZXN0cy8nOwogdmFyIFRFU1RfVVJMX0JBU0VfUEFUSCA9ICJodHRwOi8v c3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQvdHJ1bmsvTGF5b3V0VGVzdHMvIjsKIHZh ciBURVNUX1JFU1VMVFNfQkFTRV9QQVRIID0gJ2h0dHA6Ly9idWlsZC5jaHJvbWl1bS5vcmcvZi9j aHJvbWl1bS9sYXlvdXRfdGVzdF9yZXN1bHRzLyc7CkBAIC02MTEsMjggKzYxMCwyOSBAQCBmdW5j dGlvbiBpbmRpdmlkdWFsVGVzdHMoKQogICAgIHJldHVybiBpbmRpdmlkdWFsVGVzdHNGb3JTdWJz dHJpbmdMaXN0KCk7CiB9CiAKLWZ1bmN0aW9uIGluZGl2aWR1YWxUZXN0c0ZvclN1YnN0cmluZ0xp c3QoKQorZnVuY3Rpb24gc3Vic3RyaW5nTGlzdCgpCiB7CiAgICAgLy8gQ29udmVydCB3aW5kb3dz IHNsYXNoZXMgdG8gdW5peCBzbGFzaGVzLgogICAgIHZhciB0ZXN0cyA9IGdfY3VycmVudFN0YXRl LnRlc3RzLnJlcGxhY2UoL1xcL2csICcvJyk7CiAgICAgdmFyIHNlcGFyYXRvciA9IHN0cmluZ0Nv bnRhaW5zKHRlc3RzLCAnICcpID8gJyAnIDogJywnOwogICAgIHZhciB0ZXN0TGlzdCA9IHRlc3Rz LnNwbGl0KHNlcGFyYXRvcik7CiAKLSAgICBpZiAoIWlzTGF5b3V0VGVzdFJlc3VsdHMoKSkgewot ICAgICAgICB0ZXN0TGlzdC5mb3JFYWNoKGZ1bmN0aW9uKGVsZW1lbnQpIHsKLSAgICAgICAgICAg IC8vIE1ha2Ugc3VyZSB0byBzZWFyY2ggZm9yIHRoZSBmbGFreS9mYWlscyBhbmQgbm9uLWZsYWt5 L25vbi1mYWlscwotICAgICAgICAgICAgLy8gbmFtZXMgZm9yIGEgdGVzdC4KLSAgICAgICAgICAg IC8vIGUuZy4gZm9yIHRlc3QgRm9vLkJhciwgYWxzbyBzZWFyY2ggZm9yIEZvby5GTEFLWV9CYXIu Ci0gICAgICAgICAgICBpZiAoc3RyaW5nQ29udGFpbnMoZWxlbWVudCwgR1RFU1RfRkxBS1lfTUFS S0VSKSkKLSAgICAgICAgICAgICAgICB0ZXN0TGlzdC5wdXNoKGVsZW1lbnQucmVwbGFjZShHVEVT VF9GTEFLWV9NQVJLRVIsICcuJykpOwotICAgICAgICAgICAgZWxzZSBpZiAoc3RyaW5nQ29udGFp bnMoZWxlbWVudCwgR1RFU1RfRkFJTFNfTUFSS0VSKSkKLSAgICAgICAgICAgICAgICB0ZXN0TGlz dC5wdXNoKGVsZW1lbnQucmVwbGFjZShHVEVTVF9GQUlMU19NQVJLRVIsICcuJykpOwotICAgICAg ICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgdGVzdExpc3QucHVzaChlbGVtZW50LnJlcGxh Y2UoJy4nLCBHVEVTVF9GTEFLWV9NQVJLRVIpKTsKLSAgICAgICAgICAgICAgICB0ZXN0TGlzdC5w dXNoKGVsZW1lbnQucmVwbGFjZSgnLicsIEdURVNUX0ZBSUxTX01BUktFUikpOwotICAgICAgICAg ICAgfQorICAgIGlmIChpc0xheW91dFRlc3RSZXN1bHRzKCkpCisgICAgICAgIHJldHVybiB0ZXN0 TGlzdDsKKworICAgIHZhciB0ZXN0TGlzdFdpdGhvdXRNb2RpZmllcnMgPSBbXTsKKyAgICB0ZXN0 TGlzdC5mb3JFYWNoKGZ1bmN0aW9uKHBhdGgpIHsKKyAgICAgICAgR1RFU1RfTU9ESUZJRVJTLmZv ckVhY2goZnVuY3Rpb24obW9kaWZpZXIpIHsKKyAgICAgICAgICAgIHBhdGggPSBwYXRoLnJlcGxh Y2UoJy4nICsgbW9kaWZpZXIgKyAnXycsICcuJyk7CiAgICAgICAgIH0pOwotICAgIH0KKyAgICAg ICAgdGVzdExpc3RXaXRob3V0TW9kaWZpZXJzLnB1c2gocGF0aCk7CisgICAgfSk7CisgICAgcmV0 dXJuIHRlc3RMaXN0V2l0aG91dE1vZGlmaWVyczsKK30KKworZnVuY3Rpb24gaW5kaXZpZHVhbFRl c3RzRm9yU3Vic3RyaW5nTGlzdCgpCit7CisgICAgdmFyIHRlc3RMaXN0ID0gc3Vic3RyaW5nTGlz dCgpOwogCiAgICAgLy8gUHV0IHRoZSB0ZXN0cyBpbnRvIGFuIG9iamVjdCBmaXJzdCBhbmQgdGhl biBtb3ZlIHRoZW0gaW50byBhbiBhcnJheQogICAgIC8vIGFzIGEgd2F5IG9mIGRlZHVwaW5nLgpA QCAtMTE2MSwxMiArMTE2MSw2IEBAIGZ1bmN0aW9uIHByb2Nlc3NNaXNzaW5nQW5kRXh0cmFFeHBl Y3RhdGlvbnMocmVzdWx0c0ZvclRlc3QpCiAgICAgICAgICAgICAgICAgZXh0cmFFeHBlY3RhdGlv bnMucHVzaCgnUEFTUycpOwogICAgICAgICB9CiAKLSAgICB9IGVsc2UgewotICAgICAgICB2YXIg aXNNYXJrZWRGbGFreSA9IHN0cmluZ0NvbnRhaW5zKHJlc3VsdHNGb3JUZXN0LnRlc3QsIEdURVNU X0ZMQUtZX01BUktFUik7Ci0gICAgICAgIGlmIChyZXN1bHRzRm9yVGVzdC5pc0ZsYWt5ICYmICFp c01hcmtlZEZsYWt5KQotICAgICAgICAgICAgbWlzc2luZ0V4cGVjdGF0aW9ucy5wdXNoKCdGTEFL WScpOwotICAgICAgICBlbHNlIGlmICghcmVzdWx0c0ZvclRlc3QuaXNGbGFreSAmJiBpc01hcmtl ZEZsYWt5KQotICAgICAgICAgICAgZXh0cmFFeHBlY3RhdGlvbnMucHVzaCgnRkxBS1knKTsKICAg ICB9CiAKICAgICByZXN1bHRzRm9yVGVzdC5tZWV0c0V4cGVjdGF0aW9ucyA9ICFtaXNzaW5nRXhw ZWN0YXRpb25zLmxlbmd0aCAmJiAhZXh0cmFFeHBlY3RhdGlvbnMubGVuZ3RoOwpAQCAtMTU1Mywx OSArMTU0Nyw2IEBAIGZ1bmN0aW9uIGFscGhhbnVtZXJpY0NvbXBhcmUoY29sdW1uLCByZXZlcnNl KQogICAgICAgICB2YXIgYSA9IGFbY29sdW1uXSA/IFN0cmluZyhhW2NvbHVtbl0pIDogJ3onOwog ICAgICAgICB2YXIgYiA9IGJbY29sdW1uXSA/IFN0cmluZyhiW2NvbHVtbl0pIDogJ3onOwogCi0g ICAgICAgIC8vIEZvciBndGVzdCB0ZXN0cywgd2UgbWFrZSB0aGVtIGFzIGZsYWt5L2ZhaWxpbmcg YnkgcHJlZml4aW5nIHRoZQotICAgICAgICAvLyB0ZXN0IG5hbWUgd2l0aCBGTEFLWV8gb3IgRkFJ TFNfLCByZXN1bHRpbmcgaW4gdGhyZWUgcG9zc2libGUgZW50cmllcwotICAgICAgICAvLyBmb3Ig dGhlIHRlc3QuCi0gICAgICAgIC8vIFBsYWNlIGZsYWt5L2ZhaWxzIHRlc3RzIG5leHQgdG8gdGhl aXIgbm9uLWZsYWt5IGNvdW50ZXJwYXJ0cy4KLSAgICAgICAgLy8gRklYTUU6IE1lcmdlIHRoZSBu b24tZmxha3kvbm9uLWZhaWxzIHRlc3Qgd2l0aCB0aGUgZmxha3kvZmFpbHMKLSAgICAgICAgLy8g b25lIHNvIHRoZXJlJ3Mgb25seSBhIHNpbmdsZSBlbnRyeSBwZXIgdGVzdC4KLSAgICAgICAgaWYg KCFpc0xheW91dFRlc3RSZXN1bHRzKCkpIHsKLSAgICAgICAgICAgIGEgPSBhLnJlcGxhY2UoR1RF U1RfRkxBS1lfTUFSS0VSLCAnLicpOwotICAgICAgICAgICAgYiA9IGIucmVwbGFjZShHVEVTVF9G TEFLWV9NQVJLRVIsICcuJyk7Ci0gICAgICAgICAgICBhID0gYS5yZXBsYWNlKEdURVNUX0ZBSUxT X01BUktFUiwgJy4nKTsKLSAgICAgICAgICAgIGIgPSBiLnJlcGxhY2UoR1RFU1RfRkFJTFNfTUFS S0VSLCAnLicpOwotICAgICAgICB9Ci0KICAgICAgICAgaWYgKGEgPCBiKQogICAgICAgICAgICAg cmV0dXJuIC0xOwogICAgICAgICBlbHNlIGlmIChhID09IGIpCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2ZsYWtpbmVzc19kYXNoYm9hcmRfdGVz dHMuanMgYi9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2ZsYWtpbmVz c19kYXNoYm9hcmRfdGVzdHMuanMKaW5kZXggNzFiYTcyNzhjYTg2ZTU0ZTdiOGI5MWIzZjFlOTM3 NTg4N2Y1OWZjMS4uYTY0NzgwMzNhNDk1MzBlMGQ0OTY2Mjc3ZGE3NzhlMGZjMjdiZGYzMCAxMDA2 NDQKLS0tIGEvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9mbGFraW5l c3NfZGFzaGJvYXJkX3Rlc3RzLmpzCisrKyBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGlj LWRhc2hib2FyZHMvZmxha2luZXNzX2Rhc2hib2FyZF90ZXN0cy5qcwpAQCAtMzAyLDYgKzMwMiwx OCBAQCBmdW5jdGlvbiB0ZXN0R2V0RXhwZWN0YXRpb25zKCkKICAgICBhc3NlcnRFcXVhbHMoSlNP Ti5zdHJpbmdpZnkoZXhwZWN0YXRpb25zKSwgJ3sibW9kaWZpZXJzIjoiTUFDIExJTlVYIFhQIFZJ U1RBIiwiZXhwZWN0YXRpb25zIjoiRkFJTCJ9Jyk7CiB9CiAKK2Z1bmN0aW9uIHRlc3RTdWJzdHJp bmdMaXN0KCkKK3sKKyAgICBnX2N1cnJlbnRTdGF0ZS50ZXN0VHlwZSA9ICdndGVzdCc7CisgICAg Z19jdXJyZW50U3RhdGUudGVzdHMgPSAndGVzdC5GTEFLWV9mb28gdGVzdC5GQUlMU19mb28xIHRl c3QuRElTQUJMRURfZm9vMiB0ZXN0Lk1BWUJFX2ZvbzMgdGVzdC5mb280JzsKKyAgICBhc3NlcnRF cXVhbHMoc3Vic3RyaW5nTGlzdCgpLnRvU3RyaW5nKCksICd0ZXN0LmZvbyx0ZXN0LmZvbzEsdGVz dC5mb28yLHRlc3QuZm9vMyx0ZXN0LmZvbzQnKTsKKworICAgIGdfY3VycmVudFN0YXRlLnRlc3RU eXBlID0gJ2xheW91dC10ZXN0cyc7CisgICAgZ19jdXJyZW50U3RhdGUudGVzdHMgPSAnZm9vL2Jh ci5GTEFLWV9mb28uaHRtbCc7CisgICAgYXNzZXJ0RXF1YWxzKHN1YnN0cmluZ0xpc3QoKS50b1N0 cmluZygpLCAnZm9vL2Jhci5GTEFLWV9mb28uaHRtbCcpOworCit9CisKIGZ1bmN0aW9uIHJ1blRl c3RzKCkKIHsKICAgICBkb2N1bWVudC5ib2R5LmlubmVySFRNTCA9ICc8cHJlIGlkPXVuaXR0ZXN0 LXJlc3VsdHM+PC9wcmU+JzsK 101663 2011-07-21 16:40:17 -0700 2011-07-21 17:03:32 -0700 Patch bug-64990-20110721164016.patch text/plain 7061 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogOTE1MTgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzNGYzNTFhMzllMjAzNTYyYmMyYTNlNjUzY2FhYTA2Mzg3 YzNhN2RiLi43Y2U1MWZmOWRlMDNkZDhmMmY1OTM0NGU5NDE5ZDBiNTg3YzgwMDcwIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTEtMDctMjEgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAg ICBzaW1wbGlmeSBndGVzdCBkaXNwbGF5IG5vdyB0aGF0IHdlIHN0cmlwIG1vZGlmaWVycyBmcm9t IHRoZSBKU09OCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02NDk5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vdyB0aGF0IG5hbWVzIGFyZSBub3JtYWxpemVkLCB3ZSBjYW4gcmVtb3ZlIGFsbCB0aGUgY29k ZSB0aGF0CisgICAgICAgIGhhbmRsZXMgZ3Rlc3QgbmFtZSBjaGFuZ2VzIChlLmcuIGZvciBhZGRp bmcgbW9kaWZpZXJzIGxpa2UgRElTQUJMRURfKS4KKyAgICAgICAgSW5zdGVhZCwgaWYgeW91IHRy eSB0byBsaXN0IGEgdGVzdCB3aXRoIGEgbW9kaWZpZXIgaW4gaXQsIHdlIG5lZWQKKyAgICAgICAg dG8gc3RyaXAgdGhlIG1vZGlmaWVyIHNvIHdlIGdldCB0aGUgbm9ybWFsaXplZCB2YWx1ZS4KKwor ICAgICAgICBXZSBhbHNvIGdldCByaWQgb2YgdGhlIGNvbmNlcHQgb2YgZXh0cmEvbWlzc2luZyBl eHBlY3RhdGlvbnMgZm9yIGd0ZXN0cy4KKyAgICAgICAgSW4gYSBwYXRjaCBzb29uLCB3ZSdsbCBz dG9wIHNob3dpbmcgZXh0cmEvbWlzc2luZyBleHBlY3RhdGlvbnMgZnJvbSB0aGUgVUkKKyAgICAg ICAgZW50aXJlbHkgYW5kIG9ubHkgbGVhdmUgaXQgZm9yIHRoZSBzcGVjaWFsIHVwZGF0aW5nIHRl c3RfZXhwZWN0YXRpb25zLnR4dAorICAgICAgICB2aWV3IG9mIHRoZSBkYXNoYm9hcmQsIHdoaWNo IGRvZXNuJ3QgYXBwbHkgdG8gZ3Rlc3RzLgorCisgICAgICAgICogVGVzdFJlc3VsdFNlcnZlci9z dGF0aWMtZGFzaGJvYXJkcy9mbGFraW5lc3NfZGFzaGJvYXJkLmh0bWw6CisgICAgICAgICogVGVz dFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9mbGFraW5lc3NfZGFzaGJvYXJkX3Rlc3Rz LmpzOgorCiAyMDExLTA3LTE5ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgZml4IGxpbmtzIG9uIHRoZSBmbGFraW5lc3MgZGFzaGJvYXJkCmRpZmYgLS1naXQgYS9U b29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2ZsYWtpbmVzc19kYXNoYm9h cmQuaHRtbCBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvZmxha2lu ZXNzX2Rhc2hib2FyZC5odG1sCmluZGV4IDc2Nzc1OWU0ZWQwMGMxZDZhMzFhNWMxZTVjNzgwMGYw ZTg5YWY0NDQuLmNjNmIxZmMwYjlhNTMwNWRkMTIzMmRmNmVjNGUzZWVhYmQ4NDAyNDEgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvZmxha2luZXNz X2Rhc2hib2FyZC5odG1sCisrKyBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hi b2FyZHMvZmxha2luZXNzX2Rhc2hib2FyZC5odG1sCkBAIC0zMTQsOCArMzE0LDcgQEAgcHJlLmV4 cGVjdGF0aW9uIHsKIHZhciBBTEwgPSAnQUxMJzsKIHZhciBGT1JXQVJEID0gJ2ZvcndhcmQnOwog dmFyIEJBQ0tXQVJEID0gJ2JhY2t3YXJkJzsKLXZhciBHVEVTVF9GTEFLWV9NQVJLRVIgPSAnXC5G TEFLWV8nOwotdmFyIEdURVNUX0ZBSUxTX01BUktFUiA9ICdcLkZBSUxTXyc7Cit2YXIgR1RFU1Rf TU9ESUZJRVJTID0gWydGTEFLWScsICdGQUlMUycsICdNQVlCRScsICdESVNBQkxFRCddOwogdmFy IFRFU1RfVVJMX0JBU0VfUEFUSF9UUkFDID0gJ2h0dHA6Ly90cmFjLndlYmtpdC5vcmcvYnJvd3Nl ci90cnVuay9MYXlvdXRUZXN0cy8nOwogdmFyIFRFU1RfVVJMX0JBU0VfUEFUSCA9ICJodHRwOi8v c3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQvdHJ1bmsvTGF5b3V0VGVzdHMvIjsKIHZh ciBURVNUX1JFU1VMVFNfQkFTRV9QQVRIID0gJ2h0dHA6Ly9idWlsZC5jaHJvbWl1bS5vcmcvZi9j aHJvbWl1bS9sYXlvdXRfdGVzdF9yZXN1bHRzLyc7CkBAIC02MTEsMjggKzYxMCwyOSBAQCBmdW5j dGlvbiBpbmRpdmlkdWFsVGVzdHMoKQogICAgIHJldHVybiBpbmRpdmlkdWFsVGVzdHNGb3JTdWJz dHJpbmdMaXN0KCk7CiB9CiAKLWZ1bmN0aW9uIGluZGl2aWR1YWxUZXN0c0ZvclN1YnN0cmluZ0xp c3QoKQorZnVuY3Rpb24gc3Vic3RyaW5nTGlzdCgpCiB7CiAgICAgLy8gQ29udmVydCB3aW5kb3dz IHNsYXNoZXMgdG8gdW5peCBzbGFzaGVzLgogICAgIHZhciB0ZXN0cyA9IGdfY3VycmVudFN0YXRl LnRlc3RzLnJlcGxhY2UoL1xcL2csICcvJyk7CiAgICAgdmFyIHNlcGFyYXRvciA9IHN0cmluZ0Nv bnRhaW5zKHRlc3RzLCAnICcpID8gJyAnIDogJywnOwogICAgIHZhciB0ZXN0TGlzdCA9IHRlc3Rz LnNwbGl0KHNlcGFyYXRvcik7CiAKLSAgICBpZiAoIWlzTGF5b3V0VGVzdFJlc3VsdHMoKSkgewot ICAgICAgICB0ZXN0TGlzdC5mb3JFYWNoKGZ1bmN0aW9uKGVsZW1lbnQpIHsKLSAgICAgICAgICAg IC8vIE1ha2Ugc3VyZSB0byBzZWFyY2ggZm9yIHRoZSBmbGFreS9mYWlscyBhbmQgbm9uLWZsYWt5 L25vbi1mYWlscwotICAgICAgICAgICAgLy8gbmFtZXMgZm9yIGEgdGVzdC4KLSAgICAgICAgICAg IC8vIGUuZy4gZm9yIHRlc3QgRm9vLkJhciwgYWxzbyBzZWFyY2ggZm9yIEZvby5GTEFLWV9CYXIu Ci0gICAgICAgICAgICBpZiAoc3RyaW5nQ29udGFpbnMoZWxlbWVudCwgR1RFU1RfRkxBS1lfTUFS S0VSKSkKLSAgICAgICAgICAgICAgICB0ZXN0TGlzdC5wdXNoKGVsZW1lbnQucmVwbGFjZShHVEVT VF9GTEFLWV9NQVJLRVIsICcuJykpOwotICAgICAgICAgICAgZWxzZSBpZiAoc3RyaW5nQ29udGFp bnMoZWxlbWVudCwgR1RFU1RfRkFJTFNfTUFSS0VSKSkKLSAgICAgICAgICAgICAgICB0ZXN0TGlz dC5wdXNoKGVsZW1lbnQucmVwbGFjZShHVEVTVF9GQUlMU19NQVJLRVIsICcuJykpOwotICAgICAg ICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgdGVzdExpc3QucHVzaChlbGVtZW50LnJlcGxh Y2UoJy4nLCBHVEVTVF9GTEFLWV9NQVJLRVIpKTsKLSAgICAgICAgICAgICAgICB0ZXN0TGlzdC5w dXNoKGVsZW1lbnQucmVwbGFjZSgnLicsIEdURVNUX0ZBSUxTX01BUktFUikpOwotICAgICAgICAg ICAgfQorICAgIGlmIChpc0xheW91dFRlc3RSZXN1bHRzKCkpCisgICAgICAgIHJldHVybiB0ZXN0 TGlzdDsKKworICAgIHZhciB0ZXN0TGlzdFdpdGhvdXRNb2RpZmllcnMgPSBbXTsKKyAgICB0ZXN0 TGlzdC5mb3JFYWNoKGZ1bmN0aW9uKHBhdGgpIHsKKyAgICAgICAgR1RFU1RfTU9ESUZJRVJTLmZv ckVhY2goZnVuY3Rpb24obW9kaWZpZXIpIHsKKyAgICAgICAgICAgIHBhdGggPSBwYXRoLnJlcGxh Y2UoJy4nICsgbW9kaWZpZXIgKyAnXycsICcuJyk7CiAgICAgICAgIH0pOwotICAgIH0KKyAgICAg ICAgdGVzdExpc3RXaXRob3V0TW9kaWZpZXJzLnB1c2gocGF0aCk7CisgICAgfSk7CisgICAgcmV0 dXJuIHRlc3RMaXN0V2l0aG91dE1vZGlmaWVyczsKK30KKworZnVuY3Rpb24gaW5kaXZpZHVhbFRl c3RzRm9yU3Vic3RyaW5nTGlzdCgpCit7CisgICAgdmFyIHRlc3RMaXN0ID0gc3Vic3RyaW5nTGlz dCgpOwogCiAgICAgLy8gUHV0IHRoZSB0ZXN0cyBpbnRvIGFuIG9iamVjdCBmaXJzdCBhbmQgdGhl biBtb3ZlIHRoZW0gaW50byBhbiBhcnJheQogICAgIC8vIGFzIGEgd2F5IG9mIGRlZHVwaW5nLgpA QCAtMTE2MSwxMiArMTE2MSw2IEBAIGZ1bmN0aW9uIHByb2Nlc3NNaXNzaW5nQW5kRXh0cmFFeHBl Y3RhdGlvbnMocmVzdWx0c0ZvclRlc3QpCiAgICAgICAgICAgICAgICAgZXh0cmFFeHBlY3RhdGlv bnMucHVzaCgnUEFTUycpOwogICAgICAgICB9CiAKLSAgICB9IGVsc2UgewotICAgICAgICB2YXIg aXNNYXJrZWRGbGFreSA9IHN0cmluZ0NvbnRhaW5zKHJlc3VsdHNGb3JUZXN0LnRlc3QsIEdURVNU X0ZMQUtZX01BUktFUik7Ci0gICAgICAgIGlmIChyZXN1bHRzRm9yVGVzdC5pc0ZsYWt5ICYmICFp c01hcmtlZEZsYWt5KQotICAgICAgICAgICAgbWlzc2luZ0V4cGVjdGF0aW9ucy5wdXNoKCdGTEFL WScpOwotICAgICAgICBlbHNlIGlmICghcmVzdWx0c0ZvclRlc3QuaXNGbGFreSAmJiBpc01hcmtl ZEZsYWt5KQotICAgICAgICAgICAgZXh0cmFFeHBlY3RhdGlvbnMucHVzaCgnRkxBS1knKTsKICAg ICB9CiAKICAgICByZXN1bHRzRm9yVGVzdC5tZWV0c0V4cGVjdGF0aW9ucyA9ICFtaXNzaW5nRXhw ZWN0YXRpb25zLmxlbmd0aCAmJiAhZXh0cmFFeHBlY3RhdGlvbnMubGVuZ3RoOwpAQCAtMTU1Mywx OSArMTU0Nyw2IEBAIGZ1bmN0aW9uIGFscGhhbnVtZXJpY0NvbXBhcmUoY29sdW1uLCByZXZlcnNl KQogICAgICAgICB2YXIgYSA9IGFbY29sdW1uXSA/IFN0cmluZyhhW2NvbHVtbl0pIDogJ3onOwog ICAgICAgICB2YXIgYiA9IGJbY29sdW1uXSA/IFN0cmluZyhiW2NvbHVtbl0pIDogJ3onOwogCi0g ICAgICAgIC8vIEZvciBndGVzdCB0ZXN0cywgd2UgbWFrZSB0aGVtIGFzIGZsYWt5L2ZhaWxpbmcg YnkgcHJlZml4aW5nIHRoZQotICAgICAgICAvLyB0ZXN0IG5hbWUgd2l0aCBGTEFLWV8gb3IgRkFJ TFNfLCByZXN1bHRpbmcgaW4gdGhyZWUgcG9zc2libGUgZW50cmllcwotICAgICAgICAvLyBmb3Ig dGhlIHRlc3QuCi0gICAgICAgIC8vIFBsYWNlIGZsYWt5L2ZhaWxzIHRlc3RzIG5leHQgdG8gdGhl aXIgbm9uLWZsYWt5IGNvdW50ZXJwYXJ0cy4KLSAgICAgICAgLy8gRklYTUU6IE1lcmdlIHRoZSBu b24tZmxha3kvbm9uLWZhaWxzIHRlc3Qgd2l0aCB0aGUgZmxha3kvZmFpbHMKLSAgICAgICAgLy8g b25lIHNvIHRoZXJlJ3Mgb25seSBhIHNpbmdsZSBlbnRyeSBwZXIgdGVzdC4KLSAgICAgICAgaWYg KCFpc0xheW91dFRlc3RSZXN1bHRzKCkpIHsKLSAgICAgICAgICAgIGEgPSBhLnJlcGxhY2UoR1RF U1RfRkxBS1lfTUFSS0VSLCAnLicpOwotICAgICAgICAgICAgYiA9IGIucmVwbGFjZShHVEVTVF9G TEFLWV9NQVJLRVIsICcuJyk7Ci0gICAgICAgICAgICBhID0gYS5yZXBsYWNlKEdURVNUX0ZBSUxT X01BUktFUiwgJy4nKTsKLSAgICAgICAgICAgIGIgPSBiLnJlcGxhY2UoR1RFU1RfRkFJTFNfTUFS S0VSLCAnLicpOwotICAgICAgICB9Ci0KICAgICAgICAgaWYgKGEgPCBiKQogICAgICAgICAgICAg cmV0dXJuIC0xOwogICAgICAgICBlbHNlIGlmIChhID09IGIpCkBAIC0yMTgxLDYgKzIxNjIsOCBA QCBmdW5jdGlvbiBsb2FkTm9uV2ViS2l0UmVzdWx0c0ZvckJ1aWxkZXIoYnVpbGRlciwgdGVzdCwg ZXhwZWN0YXRpb25zQ29udGFpbmVyKQogICAgIGNvbnRhaW5lci5pbm5lckhUTUwgPSAnPGRpdj48 Yj4nICsgYnVpbGRlciArICc8L2I+PC9kaXY+JzsKICAgICBleHBlY3RhdGlvbnNDb250YWluZXIu YXBwZW5kQ2hpbGQoY29udGFpbmVyKTsKICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGZhaWx1cmVz Lmxlbmd0aDsgaSsrKSB7CisgICAgICAgIC8vIEZJWE1FOiBUaGlzIGRvZXNuJ3Qgc2VlbSB0byB3 b3JrIGFueW1vcmUuIERpZCB0aGUgcGF0aHMgY2hhbmdlPworICAgICAgICAvLyBPbmNlIHRoYXQn cyByZXNvbHZlZCwgc2VlIGlmIHdlIG5lZWQgdG8gdHJ5IGVhY2ggR1RFU1RfTU9ESUZJRVJTIHBy ZWZpeCBhcyB3ZWxsLgogICAgICAgICB2YXIgcGF0aFRvTG9nID0gYnVpbGRlck1hc3RlcihidWls ZGVyKS5nZXRMb2dQYXRoKGJ1aWxkZXIsIGZhaWx1cmVzW2ldKSArIHBhdGhUb0ZhaWx1cmVMb2co dGVzdCk7CiAgICAgICAgIGFwcGVuZE5vbldlYktpdFJlc3VsdHMoY29udGFpbmVyLCBwYXRoVG9M b2cpOwogICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRh c2hib2FyZHMvZmxha2luZXNzX2Rhc2hib2FyZF90ZXN0cy5qcyBiL1Rvb2xzL1Rlc3RSZXN1bHRT ZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvZmxha2luZXNzX2Rhc2hib2FyZF90ZXN0cy5qcwppbmRl eCA3MWJhNzI3OGNhODZlNTRlN2I4YjkxYjNmMWU5Mzc1ODg3ZjU5ZmMxLi5hNjQ3ODAzM2E0OTUz MGUwZDQ5NjYyNzdkYTc3OGUwZmMyN2JkZjMwIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0UmVzdWx0 U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2ZsYWtpbmVzc19kYXNoYm9hcmRfdGVzdHMuanMKKysr IGIvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9mbGFraW5lc3NfZGFz aGJvYXJkX3Rlc3RzLmpzCkBAIC0zMDIsNiArMzAyLDE4IEBAIGZ1bmN0aW9uIHRlc3RHZXRFeHBl Y3RhdGlvbnMoKQogICAgIGFzc2VydEVxdWFscyhKU09OLnN0cmluZ2lmeShleHBlY3RhdGlvbnMp LCAneyJtb2RpZmllcnMiOiJNQUMgTElOVVggWFAgVklTVEEiLCJleHBlY3RhdGlvbnMiOiJGQUlM In0nKTsKIH0KIAorZnVuY3Rpb24gdGVzdFN1YnN0cmluZ0xpc3QoKQoreworICAgIGdfY3VycmVu dFN0YXRlLnRlc3RUeXBlID0gJ2d0ZXN0JzsKKyAgICBnX2N1cnJlbnRTdGF0ZS50ZXN0cyA9ICd0 ZXN0LkZMQUtZX2ZvbyB0ZXN0LkZBSUxTX2ZvbzEgdGVzdC5ESVNBQkxFRF9mb28yIHRlc3QuTUFZ QkVfZm9vMyB0ZXN0LmZvbzQnOworICAgIGFzc2VydEVxdWFscyhzdWJzdHJpbmdMaXN0KCkudG9T dHJpbmcoKSwgJ3Rlc3QuZm9vLHRlc3QuZm9vMSx0ZXN0LmZvbzIsdGVzdC5mb28zLHRlc3QuZm9v NCcpOworCisgICAgZ19jdXJyZW50U3RhdGUudGVzdFR5cGUgPSAnbGF5b3V0LXRlc3RzJzsKKyAg ICBnX2N1cnJlbnRTdGF0ZS50ZXN0cyA9ICdmb28vYmFyLkZMQUtZX2Zvby5odG1sJzsKKyAgICBh c3NlcnRFcXVhbHMoc3Vic3RyaW5nTGlzdCgpLnRvU3RyaW5nKCksICdmb28vYmFyLkZMQUtZX2Zv by5odG1sJyk7CisKK30KKwogZnVuY3Rpb24gcnVuVGVzdHMoKQogewogICAgIGRvY3VtZW50LmJv ZHkuaW5uZXJIVE1MID0gJzxwcmUgaWQ9dW5pdHRlc3QtcmVzdWx0cz48L3ByZT4nOwo=