48547 2010-10-28 12:15:49 -0700 [chromium] add a result-small.json file for the test dashboard 2010-10-28 16:20:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan evan tony victorw oldest_to_newest 301222 0 ojan 2010-10-28 12:15:49 -0700 [chromium] add a result-small.json file for the test dashboard 301226 1 72218 ojan 2010-10-28 12:18:34 -0700 Created attachment 72218 Patch 301234 2 victorw 2010-10-28 12:31:49 -0700 LGTM. Thanks for taking care of this. 301242 3 72218 tony 2010-10-28 12:41:01 -0700 Comment on attachment 72218 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72218&action=review > WebKitTools/TestResultServer/model/jsonresults.py:444 > + (master, builder, test_type, JSON_RESULTS_FILE_SMALL)) filename instead of JSON_RESULTS_FILE_SMALL, right? > WebKitTools/TestResultServer/model/jsonresults_unittest.py:31 > +sys.path.append(sys.path[0] + '/..') os.path.join, but I think you can just do sys.path.append(".."). > WebKitTools/TestResultServer/model/jsonresults_unittest.py:34 > +sys.path.append('/usr/local/google_appengine/') > +sys.path.append('/usr/local/google_appengine/lib/yaml/lib/') tears :( 301337 4 72235 ojan 2010-10-28 14:34:11 -0700 Created attachment 72235 Patch 301338 5 ojan 2010-10-28 14:34:57 -0700 (In reply to comment #3) > (From update of attachment 72218 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=72218&action=review > > > WebKitTools/TestResultServer/model/jsonresults.py:444 > > + (master, builder, test_type, JSON_RESULTS_FILE_SMALL)) > > filename instead of JSON_RESULTS_FILE_SMALL, right? Whoops. > > WebKitTools/TestResultServer/model/jsonresults_unittest.py:31 > > +sys.path.append(sys.path[0] + '/..') > > WebKitTools/TestResultServer/model/jsonresults_unittest.py:34 > > +sys.path.append('/usr/local/google_appengine/') > > +sys.path.append('/usr/local/google_appengine/lib/yaml/lib/') > > tears :( At Evan's suggestion, I just put in an error message if you're missing one of these. 301417 6 ojan 2010-10-28 16:20:10 -0700 Committed r70822: <http://trac.webkit.org/changeset/70822> 72218 2010-10-28 12:18:34 -0700 2010-10-28 14:34:07 -0700 Patch bug-48547-20101028121832.patch text/plain 10392 ojan ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxYTMzYjk5YmMyYzkxMjQzMTczNDdjNDlmMjdkNjE4ZWVmYjI1M2QyLi42NDY5ZGZm MjNmNmVkMzlmMGUxYTlmMzQzN2Y0NjY0N2I2NjQ2MTY4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMTAtMjggIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGFkZCBhIHJl c3VsdC1zbWFsbC5qc29uIGZpbGUgZm9yIHRoZSB0ZXN0IGRhc2hib2FyZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg1NDcKKworICAgICAgICBPdXRw dXQgYm90aCBhIHJlc3VsdHMuanNvbiBmaWxlIGFuZCBhIHJlc3VsdHMtc21hbGwuanNvbiBmaWxl LgorICAgICAgICBUaGUgZGFzaGJvYXJkIHdpbGwgbG9hZCByZXN1bHRzLXNtYWxsLmpzb24gYnkg ZGVmYXVsdCBzbyBpdCBsb2FkcyBmYXN0ZXIuCisKKyAgICAgICAgKiBUZXN0UmVzdWx0U2VydmVy L21vZGVsL2pzb25yZXN1bHRzLnB5OgorICAgICAgICAqIFRlc3RSZXN1bHRTZXJ2ZXIvbW9kZWwv anNvbnJlc3VsdHNfdW5pdHRlc3QucHk6CisgICAgICAgIEFkZGVkIGEgYnVuY2ggb2Ygc3lzLnBh dGggaGFja2VyeS4gVW5mb3J1bmF0ZWx5LCB0aGlzIHVzZXMgaGFyZGNvZGVkCisgICAgICAgIHBh dGhzLiBUaGF0IG9idmlvdXNseSBuZWVkcyB0byBiZSBmaXhlZCwgYnV0IGF0IGxlYXN0IHRoaXMg d2F5IGl0CisgICAgICAgIGNsZWFybHkgZG9jdW1lbnRzIHdoYXQgcGF0aHMgYXJlIG5lY2Vzc2Fy eS4KKwogMjAxMC0xMC0yNyAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9UZXN0 UmVzdWx0U2VydmVyL21vZGVsL2pzb25yZXN1bHRzLnB5IGIvV2ViS2l0VG9vbHMvVGVzdFJlc3Vs dFNlcnZlci9tb2RlbC9qc29ucmVzdWx0cy5weQppbmRleCA4NzljZjc4YjZhMDhjYzU3ODVkYTJl NDA1ZGI1ZmZlNjY1YmM5YjVhLi4yNmFhYjI0MjBiN2Q2ODY0NzY2OWU1YjA5ZTRjOWJmYWJiZTFj YzQyIDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9UZXN0UmVzdWx0U2VydmVyL21vZGVsL2pzb25y ZXN1bHRzLnB5CisrKyBiL1dlYktpdFRvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvbW9kZWwvanNvbnJl c3VsdHMucHkKQEAgLTMzLDYgKzMzLDcgQEAgaW1wb3J0IGxvZ2dpbmcKIGZyb20gbW9kZWwudGVz dGZpbGUgaW1wb3J0IFRlc3RGaWxlCiAKIEpTT05fUkVTVUxUU19GSUxFID0gInJlc3VsdHMuanNv biIKK0pTT05fUkVTVUxUU19GSUxFX1NNQUxMID0gInJlc3VsdHMtc21hbGwuanNvbiIKIEpTT05f UkVTVUxUU19QUkVGSVggPSAiQUREX1JFU1VMVFMoIgogSlNPTl9SRVNVTFRTX1NVRkZJWCA9ICIp OyIKIEpTT05fUkVTVUxUU19WRVJTSU9OX0tFWSA9ICJ2ZXJzaW9uIgpAQCAtNDUsNiArNDYsNyBA QCBKU09OX1JFU1VMVFNfTk9fREFUQSA9ICJOIgogSlNPTl9SRVNVTFRTX01JTl9USU1FID0gMQog SlNPTl9SRVNVTFRTX1ZFUlNJT04gPSAzCiBKU09OX1JFU1VMVFNfTUFYX0JVSUxEUyA9IDE1MDAK K0pTT05fUkVTVUxUU19NQVhfQlVJTERTX1NNQUxMID0gMjAwCiAKIAogY2xhc3MgSnNvblJlc3Vs dHMob2JqZWN0KToKQEAgLTEwNiw3ICsxMDgsNyBAQCBjbGFzcyBKc29uUmVzdWx0cyhvYmplY3Qp OgogICAgICAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBf bWVyZ2VfanNvbihjbHMsIGFnZ3JlZ2F0ZWRfanNvbiwgaW5jcmVtZW50YWxfanNvbik6CisgICAg ZGVmIF9tZXJnZV9qc29uKGNscywgYWdncmVnYXRlZF9qc29uLCBpbmNyZW1lbnRhbF9qc29uLCBu dW1fcnVucyk6CiAgICAgICAgICIiIk1lcmdlIGluY3JlbWVudGFsIGpzb24gaW50byBhZ2dyZWdh dGVkIGpzb24gcmVzdWx0cy4KIAogICAgICAgICBBcmdzOgpAQCAtMTIwLDE5ICsxMjIsMTkgQEAg Y2xhc3MgSnNvblJlc3VsdHMob2JqZWN0KToKIAogICAgICAgICAjIE1lcmdlIG5vbiB0ZXN0cyBw cm9wZXJ0eSBkYXRhLgogICAgICAgICAjIFRlc3RzIHByb3BlcnRpZXMgYXJlIG1lcmdlZCBpbiBf bWVyZ2VfdGVzdHMuCi0gICAgICAgIGlmIG5vdCBjbHMuX21lcmdlX25vbl90ZXN0X2RhdGEoYWdn cmVnYXRlZF9qc29uLCBpbmNyZW1lbnRhbF9qc29uKToKKyAgICAgICAgaWYgbm90IGNscy5fbWVy Z2Vfbm9uX3Rlc3RfZGF0YShhZ2dyZWdhdGVkX2pzb24sIGluY3JlbWVudGFsX2pzb24sIG51bV9y dW5zKToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogCiAgICAgICAgICMgTWVyZ2UgdGVzdHMg cmVzdWx0cyBhbmQgdGltZXMKICAgICAgICAgaW5jcmVtZW50YWxfdGVzdHMgPSBpbmNyZW1lbnRh bF9qc29uW0pTT05fUkVTVUxUU19URVNUU10KICAgICAgICAgaWYgaW5jcmVtZW50YWxfdGVzdHM6 CiAgICAgICAgICAgICBhZ2dyZWdhdGVkX3Rlc3RzID0gYWdncmVnYXRlZF9qc29uW0pTT05fUkVT VUxUU19URVNUU10KLSAgICAgICAgICAgIGNscy5fbWVyZ2VfdGVzdHMoYWdncmVnYXRlZF90ZXN0 cywgaW5jcmVtZW50YWxfdGVzdHMpCisgICAgICAgICAgICBjbHMuX21lcmdlX3Rlc3RzKGFnZ3Jl Z2F0ZWRfdGVzdHMsIGluY3JlbWVudGFsX3Rlc3RzLCBudW1fcnVucykKIAogICAgICAgICByZXR1 cm4gVHJ1ZQogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIF9tZXJnZV9ub25fdGVzdF9kYXRh KGNscywgYWdncmVnYXRlZF9qc29uLCBpbmNyZW1lbnRhbF9qc29uKToKKyAgICBkZWYgX21lcmdl X25vbl90ZXN0X2RhdGEoY2xzLCBhZ2dyZWdhdGVkX2pzb24sIGluY3JlbWVudGFsX2pzb24sIG51 bV9ydW5zKToKICAgICAgICAgIiIiTWVyZ2UgaW5jcmVtZW50YWwgbm9uIHRlc3RzIHByb3BlcnR5 IGRhdGEgaW50byBhZ2dyZWdhdGVkIGpzb24gcmVzdWx0cy4KIAogICAgICAgICBBcmdzOgpAQCAt MTczLDEzICsxNzUsMTMgQEAgY2xhc3MgSnNvblJlc3VsdHMob2JqZWN0KToKICAgICAgICAgICAg ICAgICByZXR1cm4gRmFsc2UKIAogICAgICAgICAgICAgIyBNZXJnZSB0aGlzIGJ1aWxkIGludG8g YWdncmVhZ2F0ZWQgcmVzdWx0cy4KLSAgICAgICAgICAgIGNscy5fbWVyZ2Vfb25lX2J1aWxkKGFn Z3JlZ2F0ZWRfanNvbiwgaW5jcmVtZW50YWxfanNvbiwgaW5kZXgpCisgICAgICAgICAgICBjbHMu X21lcmdlX29uZV9idWlsZChhZ2dyZWdhdGVkX2pzb24sIGluY3JlbWVudGFsX2pzb24sIGluZGV4 LCBudW1fcnVucykKIAogICAgICAgICByZXR1cm4gVHJ1ZQogCiAgICAgQGNsYXNzbWV0aG9kCiAg ICAgZGVmIF9tZXJnZV9vbmVfYnVpbGQoY2xzLCBhZ2dyZWdhdGVkX2pzb24sIGluY3JlbWVudGFs X2pzb24sCi0gICAgICAgICAgICAgICAgICAgICAgICAgaW5jcmVtZW50YWxfaW5kZXgpOgorICAg ICAgICAgICAgICAgICAgICAgICAgIGluY3JlbWVudGFsX2luZGV4LCBudW1fcnVucyk6CiAgICAg ICAgICIiIk1lcmdlIG9uZSBidWlsZCBvZiBpbmNyZW1lbnRhbCBqc29uIGludG8gYWdncmVnYXRl ZCBqc29uIHJlc3VsdHMuCiAKICAgICAgICAgQXJnczoKQEAgLTE5OCwxMiArMjAwLDEyIEBAIGNs YXNzIEpzb25SZXN1bHRzKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgYWdncmVnYXRlZF9qc29u W2tleV0uaW5zZXJ0KAogICAgICAgICAgICAgICAgICAgICAwLCBpbmNyZW1lbnRhbF9qc29uW2tl eV1baW5jcmVtZW50YWxfaW5kZXhdKQogICAgICAgICAgICAgICAgIGFnZ3JlZ2F0ZWRfanNvbltr ZXldID0gXAotICAgICAgICAgICAgICAgICAgICBhZ2dyZWdhdGVkX2pzb25ba2V5XVs6SlNPTl9S RVNVTFRTX01BWF9CVUlMRFNdCisgICAgICAgICAgICAgICAgICAgIGFnZ3JlZ2F0ZWRfanNvbltr ZXldWzpudW1fcnVuc10KICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgYWdncmVn YXRlZF9qc29uW2tleV0gPSBpbmNyZW1lbnRhbF9qc29uW2tleV0KIAogICAgIEBjbGFzc21ldGhv ZAotICAgIGRlZiBfbWVyZ2VfdGVzdHMoY2xzLCBhZ2dyZWdhdGVkX2pzb24sIGluY3JlbWVudGFs X2pzb24pOgorICAgIGRlZiBfbWVyZ2VfdGVzdHMoY2xzLCBhZ2dyZWdhdGVkX2pzb24sIGluY3Jl bWVudGFsX2pzb24sIG51bV9ydW5zKToKICAgICAgICAgIiIiTWVyZ2UgInRlc3RzIiBwcm9wZXJ0 aWVzOnJlc3VsdHMsIHRpbWVzLgogCiAgICAgICAgIEFyZ3M6CkBAIC0yMjUsMTUgKzIyNywxNSBA QCBjbGFzcyBKc29uUmVzdWx0cyhvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICB0aW1lcyA9 IFtbMSwgMF1dCiAKICAgICAgICAgICAgICAgICBjbHMuX2luc2VydF9pdGVtX3J1bl9sZW5ndGhf ZW5jb2RlZCgKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0cywgYWdncmVnYXRlZF90ZXN0W0pT T05fUkVTVUxUU19SRVNVTFRTXSkKKyAgICAgICAgICAgICAgICAgICAgcmVzdWx0cywgYWdncmVn YXRlZF90ZXN0W0pTT05fUkVTVUxUU19SRVNVTFRTXSwgbnVtX3J1bnMpCiAgICAgICAgICAgICAg ICAgY2xzLl9pbnNlcnRfaXRlbV9ydW5fbGVuZ3RoX2VuY29kZWQoCi0gICAgICAgICAgICAgICAg ICAgIHRpbWVzLCBhZ2dyZWdhdGVkX3Rlc3RbSlNPTl9SRVNVTFRTX1RJTUVTXSkKKyAgICAgICAg ICAgICAgICAgICAgdGltZXMsIGFnZ3JlZ2F0ZWRfdGVzdFtKU09OX1JFU1VMVFNfVElNRVNdLCBu dW1fcnVucykKICAgICAgICAgICAgICAgICBjbHMuX25vcm1hbGl6ZV9yZXN1bHRzX2pzb24odGVz dF9uYW1lLCBhZ2dyZWdhdGVkX2pzb24pCiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAg ICAgIGFnZ3JlZ2F0ZWRfanNvblt0ZXN0X25hbWVdID0gaW5jcmVtZW50YWxfanNvblt0ZXN0X25h bWVdCiAKICAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgX2luc2VydF9pdGVtX3J1bl9sZW5ndGhf ZW5jb2RlZChjbHMsIGluY3JlbWVudGFsX2l0ZW0sIGFnZ3JlZ2F0ZWRfaXRlbSk6CisgICAgZGVm IF9pbnNlcnRfaXRlbV9ydW5fbGVuZ3RoX2VuY29kZWQoY2xzLCBpbmNyZW1lbnRhbF9pdGVtLCBh Z2dyZWdhdGVkX2l0ZW0sIG51bV9ydW5zKToKICAgICAgICAgIiIiSW5zZXJ0cyB0aGUgaW5jcmVt ZW50YWwgcnVuLWxlbmd0aCBlbmNvZGVkIHJlc3VsdHMgaW50byB0aGUgYWdncmVnYXRlZAogICAg ICAgICAgICBydW4tbGVuZ3RoIGVuY29kZWQgcmVzdWx0cy4KIApAQCAtMjQ1LDcgKzI0Nyw3IEBA IGNsYXNzIEpzb25SZXN1bHRzKG9iamVjdCk6CiAgICAgICAgIGZvciBpdGVtIGluIGluY3JlbWVu dGFsX2l0ZW06CiAgICAgICAgICAgICBpZiBsZW4oYWdncmVnYXRlZF9pdGVtKSBhbmQgaXRlbVsx XSA9PSBhZ2dyZWdhdGVkX2l0ZW1bMF1bMV06CiAgICAgICAgICAgICAgICAgYWdncmVnYXRlZF9p dGVtWzBdWzBdID0gbWluKAotICAgICAgICAgICAgICAgICAgICBhZ2dyZWdhdGVkX2l0ZW1bMF1b MF0gKyBpdGVtWzBdLCBKU09OX1JFU1VMVFNfTUFYX0JVSUxEUykKKyAgICAgICAgICAgICAgICAg ICAgYWdncmVnYXRlZF9pdGVtWzBdWzBdICsgaXRlbVswXSwgbnVtX3J1bnMpCiAgICAgICAgICAg ICBlbHNlOgogICAgICAgICAgICAgICAgIGFnZ3JlZ2F0ZWRfaXRlbS5pbnNlcnQoMCwgaXRlbSkK IApAQCAtMzQwLDcgKzM0Miw3IEBAIGNsYXNzIEpzb25SZXN1bHRzKG9iamVjdCk6CiAgICAgICAg IHJldHVybiBUcnVlCiAKICAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgbWVyZ2UoY2xzLCBidWls ZGVyLCBhZ2dyZWdhdGVkLCBpbmNyZW1lbnRhbCwgc29ydF9rZXlzPUZhbHNlKToKKyAgICBkZWYg bWVyZ2UoY2xzLCBidWlsZGVyLCBhZ2dyZWdhdGVkLCBpbmNyZW1lbnRhbCwgbnVtX3J1bnMsIHNv cnRfa2V5cz1GYWxzZSk6CiAgICAgICAgICIiIk1lcmdlIGluY3JlbWVudGFsIGpzb24gZmlsZSBk YXRhIHdpdGggYWdncmVnYXRlZCBqc29uIGZpbGUgZGF0YS4KIAogICAgICAgICBBcmdzOgpAQCAt Mzc4LDkgKzM4MCw3IEBAIGNsYXNzIEpzb25SZXN1bHRzKG9iamVjdCk6CiAKICAgICAgICAgbG9n Z2luZy5pbmZvKCJNZXJnaW5nIGpzb24gcmVzdWx0cy4uLiIpCiAgICAgICAgIHRyeToKLSAgICAg ICAgICAgIGlmIG5vdCBjbHMuX21lcmdlX2pzb24oCi0gICAgICAgICAgICAgICAgYWdncmVnYXRl ZF9qc29uW2J1aWxkZXJdLAotICAgICAgICAgICAgICAgIGluY3JlbWVudGFsX2pzb25bYnVpbGRl cl0pOgorICAgICAgICAgICAgaWYgbm90IGNscy5fbWVyZ2VfanNvbihhZ2dyZWdhdGVkX2pzb25b YnVpbGRlcl0sIGluY3JlbWVudGFsX2pzb25bYnVpbGRlcl0sIG51bV9ydW5zKToKICAgICAgICAg ICAgICAgICByZXR1cm4gTm9uZQogICAgICAgICBleGNlcHQgRXhjZXB0aW9uLCBlcnI6CiAgICAg ICAgICAgICBsb2dnaW5nLmVycm9yKCJGYWlsZWQgdG8gbWVyZ2UganNvbiByZXN1bHRzOiAlcyIs IHN0cihlcnIpKQpAQCAtMzkzLDE5ICszOTMsMjkgQEAgY2xhc3MgSnNvblJlc3VsdHMob2JqZWN0 KToKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgdXBkYXRlKGNscywgbWFzdGVyLCBidWlsZGVy LCB0ZXN0X3R5cGUsIGluY3JlbWVudGFsKToKICAgICAgICAgIiIiVXBkYXRlIGRhdGFzdG9yZSBq c29uIGZpbGUgZGF0YSBieSBtZXJnaW5nIGl0IHdpdGggaW5jcmVtZW50YWwganNvbgotICAgICAg ICAgICBmaWxlLgorICAgICAgICAgICBmaWxlLiBXcml0ZXMgdGhlIGxhcmdlIGZpbGUgYW5kIGEg c21hbGwgZmlsZS4gVGhlIHNtYWxsIGZpbGUganVzdCBzdG9yZXMKKyAgICAgICAgICAgZmV3ZXIg cnVucy4KIAogICAgICAgICBBcmdzOgorICAgICAgICAgICAgbWFzdGVyOiBtYXN0ZXIgbmFtZS4K ICAgICAgICAgICAgIGJ1aWxkZXI6IGJ1aWxkZXIgbmFtZS4KICAgICAgICAgICAgIHRlc3RfdHlw ZTogdHlwZSBvZiB0ZXN0IHJlc3VsdHMuCiAgICAgICAgICAgICBpbmNyZW1lbnRhbDogaW5jcmVt ZW50YWwganNvbiBmaWxlIGRhdGEgdG8gbWVyZ2UuCiAKICAgICAgICAgUmV0dXJuczoKLSAgICAg ICAgICAgIFRlc3RGaWxlIG9iamVjdCBpZiB1cGRhdGUgc3VjY2VlZHMgb3IKKyAgICAgICAgICAg IExhcmdlIFRlc3RGaWxlIG9iamVjdCBpZiB1cGRhdGUgc3VjY2VlZHMgb3IKICAgICAgICAgICAg IE5vbmUgb24gZmFpbHVyZS4KICAgICAgICAgIiIiCisgICAgICAgIHNtYWxsX2ZpbGUgPSBjbHMu dXBkYXRlX2ZpbGUobWFzdGVyLCBidWlsZGVyLCB0ZXN0X3R5cGUsIGluY3JlbWVudGFsLCBKU09O X1JFU1VMVFNfRklMRV9TTUFMTCwgSlNPTl9SRVNVTFRTX01BWF9CVUlMRFNfU01BTEwpCisgICAg ICAgIGxhcmdlX2ZpbGUgPSBjbHMudXBkYXRlX2ZpbGUobWFzdGVyLCBidWlsZGVyLCB0ZXN0X3R5 cGUsIGluY3JlbWVudGFsLCBKU09OX1JFU1VMVFNfRklMRSwgSlNPTl9SRVNVTFRTX01BWF9CVUlM RFMpCiAKLSAgICAgICAgZmlsZXMgPSBUZXN0RmlsZS5nZXRfZmlsZXMobWFzdGVyLCBidWlsZGVy LCB0ZXN0X3R5cGUsIEpTT05fUkVTVUxUU19GSUxFKQorICAgICAgICBpZiBzbWFsbF9maWxlIGFu ZCBsYXJnZV9maWxlOgorICAgICAgICAgICAgcmV0dXJuIGxhcmdlX2ZpbGUKKyAgICAgICAgcmV0 dXJuIE5vbmUKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiB1cGRhdGVfZmlsZShjbHMsIG1h c3RlciwgYnVpbGRlciwgdGVzdF90eXBlLCBpbmNyZW1lbnRhbCwgZmlsZW5hbWUsIG51bV9ydW5z KToKKyAgICAgICAgZmlsZXMgPSBUZXN0RmlsZS5nZXRfZmlsZXMobWFzdGVyLCBidWlsZGVyLCB0 ZXN0X3R5cGUsIGZpbGVuYW1lKQogICAgICAgICBpZiBmaWxlczoKICAgICAgICAgICAgIGZpbGUg PSBmaWxlc1swXQogCkBAIC00MTcsMjEgKzQyNywyMSBAQCBjbGFzcyBKc29uUmVzdWx0cyhvYmpl Y3QpOgogICAgICAgICAgICAgaWYgbm90IGZpbGUudGVzdF90eXBlOgogICAgICAgICAgICAgICAg IGZpbGUudGVzdF90eXBlID0gImxheW91dC10ZXN0cyIKIAotICAgICAgICAgICAgbmV3X3Jlc3Vs dHMgPSBjbHMubWVyZ2UoYnVpbGRlciwgZmlsZS5kYXRhLCBpbmNyZW1lbnRhbCkKKyAgICAgICAg ICAgIG5ld19yZXN1bHRzID0gY2xzLm1lcmdlKGJ1aWxkZXIsIGZpbGUuZGF0YSwgaW5jcmVtZW50 YWwsIG51bV9ydW5zKQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgIyBVc2UgdGhlIGluY3Jl bWVudGFsIGRhdGEgaWYgdGhlcmUgaXMgbm8gYWdncmVnYXRlZCBmaWxlIHRvIG1lcmdlLgogICAg ICAgICAgICAgZmlsZSA9IFRlc3RGaWxlKCkKICAgICAgICAgICAgIGZpbGUubWFzdGVyID0gbWFz dGVyCiAgICAgICAgICAgICBmaWxlLmJ1aWxkZXIgPSBidWlsZGVyCiAgICAgICAgICAgICBmaWxl LnRlc3RfdHlwZSA9IHRlc3RfdHlwZQotICAgICAgICAgICAgZmlsZS5uYW1lID0gSlNPTl9SRVNV TFRTX0ZJTEUKKyAgICAgICAgICAgIGZpbGUubmFtZSA9IGZpbGVuYW1lCiAgICAgICAgICAgICBu ZXdfcmVzdWx0cyA9IGluY3JlbWVudGFsCiAgICAgICAgICAgICBsb2dnaW5nLmluZm8oIk5vIGV4 aXN0aW5nIGpzb24gcmVzdWx0cywgaW5jcmVtZW50YWwganNvbiBpcyBzYXZlZC4iKQogCi0gICAg ICAgIGlmIG5vdCBuZXdfcmVzdWx0czoKLSAgICAgICAgICAgIHJldHVybiBOb25lCi0KLSAgICAg ICAgaWYgbm90IGZpbGUuc2F2ZShuZXdfcmVzdWx0cyk6CisgICAgICAgIGlmIG5vdCBuZXdfcmVz dWx0cyBvciBub3QgZmlsZS5zYXZlKG5ld19yZXN1bHRzKToKKyAgICAgICAgICAgIGxvZ2dpbmcu aW5mbygKKyAgICAgICAgICAgICAgICAiVXBkYXRlIGZhaWxlZCwgbWFzdGVyOiAlcywgYnVpbGRl cjogJXMsIHRlc3RfdHlwZTogJXMsIG5hbWU6ICVzLiIgJQorICAgICAgICAgICAgICAgIChtYXN0 ZXIsIGJ1aWxkZXIsIHRlc3RfdHlwZSwgSlNPTl9SRVNVTFRTX0ZJTEVfU01BTEwpKQogICAgICAg ICAgICAgcmV0dXJuIE5vbmUKIAogICAgICAgICByZXR1cm4gZmlsZQpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvVGVzdFJlc3VsdFNlcnZlci9tb2RlbC9qc29ucmVzdWx0c191bml0dGVzdC5weSBi L1dlYktpdFRvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvbW9kZWwvanNvbnJlc3VsdHNfdW5pdHRlc3Qu cHkKaW5kZXggMTViNjU5YmQwOTMyYTY5YjFjMmRhZGM3MjEzYmRkZjFlYTk1MjY3Yy4uYTkxMDY5 MWIwOGZiNmM5YWEwYTJjODNlZDFlZjgxZjIyNzY2ODU4ZiAxMDA3NTUKLS0tIGEvV2ViS2l0VG9v bHMvVGVzdFJlc3VsdFNlcnZlci9tb2RlbC9qc29ucmVzdWx0c191bml0dGVzdC5weQorKysgYi9X ZWJLaXRUb29scy9UZXN0UmVzdWx0U2VydmVyL21vZGVsL2pzb25yZXN1bHRzX3VuaXR0ZXN0LnB5 CkBAIC0yNiw2ICsyNiwxMyBAQAogIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNF KSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwg RVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAoraW1w b3J0IHN5cworIyBGSVhNRTogV3JpdGUgYSBwcm9wZXIgdGVzdCBoYXJuZXNzIHRvIGF2b2lkIG1l c3Npbmcgd2l0aCBzeXMucGF0aC4KK3N5cy5wYXRoLmFwcGVuZChzeXMucGF0aFswXSArICcvLi4n KQorIyBGSVhNRTogTWFrZSB0aGlzIG5vdCBkZXBlbmQgb24gaGF2aW5nIGhhcmQtY29kZWQgcGF0 aHMuCitzeXMucGF0aC5hcHBlbmQoJy91c3IvbG9jYWwvZ29vZ2xlX2FwcGVuZ2luZS8nKQorc3lz LnBhdGguYXBwZW5kKCcvdXNyL2xvY2FsL2dvb2dsZV9hcHBlbmdpbmUvbGliL3lhbWwvbGliLycp CisKIGltcG9ydCBqc29ucmVzdWx0cwogaW1wb3J0IHVuaXR0ZXN0CiAKQEAgLTExOCw3ICsxMjUs OCBAQCBjbGFzcyBKc29uUmVzdWx0c1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBh Z2dyZWdhdGVkX3Jlc3VsdHMgPSBzZWxmLl9tYWtlX3Rlc3RfanNvbihhZ2dyZWdhdGVkX2RhdGEp CiAgICAgICAgIGluY3JlbWVudGFsX3Jlc3VsdHMgPSBzZWxmLl9tYWtlX3Rlc3RfanNvbihpbmNy ZW1lbnRhbF9kYXRhKQogICAgICAgICBtZXJnZWRfcmVzdWx0cyA9IEpzb25SZXN1bHRzLm1lcmdl KHNlbGYuX2J1aWxkZXIsCi0gICAgICAgICAgICBhZ2dyZWdhdGVkX3Jlc3VsdHMsIGluY3JlbWVu dGFsX3Jlc3VsdHMsIHNvcnRfa2V5cz1UcnVlKQorICAgICAgICAgICAgYWdncmVnYXRlZF9yZXN1 bHRzLCBpbmNyZW1lbnRhbF9yZXN1bHRzLCBqc29ucmVzdWx0cy5KU09OX1JFU1VMVFNfTUFYX0JV SUxEUywKKyAgICAgICAgICAgIHNvcnRfa2V5cz1UcnVlKQogCiAgICAgICAgIGlmIGV4cGVjdGVk X2RhdGE6CiAgICAgICAgICAgICBleHBlY3RlZF9yZXN1bHRzID0gc2VsZi5fbWFrZV90ZXN0X2pz b24oZXhwZWN0ZWRfZGF0YSkK 72235 2010-10-28 14:34:11 -0700 2010-10-28 14:41:47 -0700 Patch bug-48547-20101028143409.patch text/plain 10372 ojan ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxYTMzYjk5YmMyYzkxMjQzMTczNDdjNDlmMjdkNjE4ZWVmYjI1M2QyLi42NDY5ZGZm MjNmNmVkMzlmMGUxYTlmMzQzN2Y0NjY0N2I2NjQ2MTY4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMTAtMjggIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGFkZCBhIHJl c3VsdC1zbWFsbC5qc29uIGZpbGUgZm9yIHRoZSB0ZXN0IGRhc2hib2FyZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg1NDcKKworICAgICAgICBPdXRw dXQgYm90aCBhIHJlc3VsdHMuanNvbiBmaWxlIGFuZCBhIHJlc3VsdHMtc21hbGwuanNvbiBmaWxl LgorICAgICAgICBUaGUgZGFzaGJvYXJkIHdpbGwgbG9hZCByZXN1bHRzLXNtYWxsLmpzb24gYnkg ZGVmYXVsdCBzbyBpdCBsb2FkcyBmYXN0ZXIuCisKKyAgICAgICAgKiBUZXN0UmVzdWx0U2VydmVy L21vZGVsL2pzb25yZXN1bHRzLnB5OgorICAgICAgICAqIFRlc3RSZXN1bHRTZXJ2ZXIvbW9kZWwv anNvbnJlc3VsdHNfdW5pdHRlc3QucHk6CisgICAgICAgIEFkZGVkIGEgYnVuY2ggb2Ygc3lzLnBh dGggaGFja2VyeS4gVW5mb3J1bmF0ZWx5LCB0aGlzIHVzZXMgaGFyZGNvZGVkCisgICAgICAgIHBh dGhzLiBUaGF0IG9idmlvdXNseSBuZWVkcyB0byBiZSBmaXhlZCwgYnV0IGF0IGxlYXN0IHRoaXMg d2F5IGl0CisgICAgICAgIGNsZWFybHkgZG9jdW1lbnRzIHdoYXQgcGF0aHMgYXJlIG5lY2Vzc2Fy eS4KKwogMjAxMC0xMC0yNyAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9UZXN0 UmVzdWx0U2VydmVyL21vZGVsL2pzb25yZXN1bHRzLnB5IGIvV2ViS2l0VG9vbHMvVGVzdFJlc3Vs dFNlcnZlci9tb2RlbC9qc29ucmVzdWx0cy5weQppbmRleCA4NzljZjc4YjZhMDhjYzU3ODVkYTJl NDA1ZGI1ZmZlNjY1YmM5YjVhLi5jMTAyY2VkM2RjMTE3NjBhYjJhNGNmOTRmZmQ3YjZhYzdiMzI0 ZmRiIDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9UZXN0UmVzdWx0U2VydmVyL21vZGVsL2pzb25y ZXN1bHRzLnB5CisrKyBiL1dlYktpdFRvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvbW9kZWwvanNvbnJl c3VsdHMucHkKQEAgLTMzLDYgKzMzLDcgQEAgaW1wb3J0IGxvZ2dpbmcKIGZyb20gbW9kZWwudGVz dGZpbGUgaW1wb3J0IFRlc3RGaWxlCiAKIEpTT05fUkVTVUxUU19GSUxFID0gInJlc3VsdHMuanNv biIKK0pTT05fUkVTVUxUU19GSUxFX1NNQUxMID0gInJlc3VsdHMtc21hbGwuanNvbiIKIEpTT05f UkVTVUxUU19QUkVGSVggPSAiQUREX1JFU1VMVFMoIgogSlNPTl9SRVNVTFRTX1NVRkZJWCA9ICIp OyIKIEpTT05fUkVTVUxUU19WRVJTSU9OX0tFWSA9ICJ2ZXJzaW9uIgpAQCAtNDUsNiArNDYsNyBA QCBKU09OX1JFU1VMVFNfTk9fREFUQSA9ICJOIgogSlNPTl9SRVNVTFRTX01JTl9USU1FID0gMQog SlNPTl9SRVNVTFRTX1ZFUlNJT04gPSAzCiBKU09OX1JFU1VMVFNfTUFYX0JVSUxEUyA9IDE1MDAK K0pTT05fUkVTVUxUU19NQVhfQlVJTERTX1NNQUxMID0gMjAwCiAKIAogY2xhc3MgSnNvblJlc3Vs dHMob2JqZWN0KToKQEAgLTEwNiw3ICsxMDgsNyBAQCBjbGFzcyBKc29uUmVzdWx0cyhvYmplY3Qp OgogICAgICAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBf bWVyZ2VfanNvbihjbHMsIGFnZ3JlZ2F0ZWRfanNvbiwgaW5jcmVtZW50YWxfanNvbik6CisgICAg ZGVmIF9tZXJnZV9qc29uKGNscywgYWdncmVnYXRlZF9qc29uLCBpbmNyZW1lbnRhbF9qc29uLCBu dW1fcnVucyk6CiAgICAgICAgICIiIk1lcmdlIGluY3JlbWVudGFsIGpzb24gaW50byBhZ2dyZWdh dGVkIGpzb24gcmVzdWx0cy4KIAogICAgICAgICBBcmdzOgpAQCAtMTIwLDE5ICsxMjIsMTkgQEAg Y2xhc3MgSnNvblJlc3VsdHMob2JqZWN0KToKIAogICAgICAgICAjIE1lcmdlIG5vbiB0ZXN0cyBw cm9wZXJ0eSBkYXRhLgogICAgICAgICAjIFRlc3RzIHByb3BlcnRpZXMgYXJlIG1lcmdlZCBpbiBf bWVyZ2VfdGVzdHMuCi0gICAgICAgIGlmIG5vdCBjbHMuX21lcmdlX25vbl90ZXN0X2RhdGEoYWdn cmVnYXRlZF9qc29uLCBpbmNyZW1lbnRhbF9qc29uKToKKyAgICAgICAgaWYgbm90IGNscy5fbWVy Z2Vfbm9uX3Rlc3RfZGF0YShhZ2dyZWdhdGVkX2pzb24sIGluY3JlbWVudGFsX2pzb24sIG51bV9y dW5zKToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogCiAgICAgICAgICMgTWVyZ2UgdGVzdHMg cmVzdWx0cyBhbmQgdGltZXMKICAgICAgICAgaW5jcmVtZW50YWxfdGVzdHMgPSBpbmNyZW1lbnRh bF9qc29uW0pTT05fUkVTVUxUU19URVNUU10KICAgICAgICAgaWYgaW5jcmVtZW50YWxfdGVzdHM6 CiAgICAgICAgICAgICBhZ2dyZWdhdGVkX3Rlc3RzID0gYWdncmVnYXRlZF9qc29uW0pTT05fUkVT VUxUU19URVNUU10KLSAgICAgICAgICAgIGNscy5fbWVyZ2VfdGVzdHMoYWdncmVnYXRlZF90ZXN0 cywgaW5jcmVtZW50YWxfdGVzdHMpCisgICAgICAgICAgICBjbHMuX21lcmdlX3Rlc3RzKGFnZ3Jl Z2F0ZWRfdGVzdHMsIGluY3JlbWVudGFsX3Rlc3RzLCBudW1fcnVucykKIAogICAgICAgICByZXR1 cm4gVHJ1ZQogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIF9tZXJnZV9ub25fdGVzdF9kYXRh KGNscywgYWdncmVnYXRlZF9qc29uLCBpbmNyZW1lbnRhbF9qc29uKToKKyAgICBkZWYgX21lcmdl X25vbl90ZXN0X2RhdGEoY2xzLCBhZ2dyZWdhdGVkX2pzb24sIGluY3JlbWVudGFsX2pzb24sIG51 bV9ydW5zKToKICAgICAgICAgIiIiTWVyZ2UgaW5jcmVtZW50YWwgbm9uIHRlc3RzIHByb3BlcnR5 IGRhdGEgaW50byBhZ2dyZWdhdGVkIGpzb24gcmVzdWx0cy4KIAogICAgICAgICBBcmdzOgpAQCAt MTczLDEzICsxNzUsMTMgQEAgY2xhc3MgSnNvblJlc3VsdHMob2JqZWN0KToKICAgICAgICAgICAg ICAgICByZXR1cm4gRmFsc2UKIAogICAgICAgICAgICAgIyBNZXJnZSB0aGlzIGJ1aWxkIGludG8g YWdncmVhZ2F0ZWQgcmVzdWx0cy4KLSAgICAgICAgICAgIGNscy5fbWVyZ2Vfb25lX2J1aWxkKGFn Z3JlZ2F0ZWRfanNvbiwgaW5jcmVtZW50YWxfanNvbiwgaW5kZXgpCisgICAgICAgICAgICBjbHMu X21lcmdlX29uZV9idWlsZChhZ2dyZWdhdGVkX2pzb24sIGluY3JlbWVudGFsX2pzb24sIGluZGV4 LCBudW1fcnVucykKIAogICAgICAgICByZXR1cm4gVHJ1ZQogCiAgICAgQGNsYXNzbWV0aG9kCiAg ICAgZGVmIF9tZXJnZV9vbmVfYnVpbGQoY2xzLCBhZ2dyZWdhdGVkX2pzb24sIGluY3JlbWVudGFs X2pzb24sCi0gICAgICAgICAgICAgICAgICAgICAgICAgaW5jcmVtZW50YWxfaW5kZXgpOgorICAg ICAgICAgICAgICAgICAgICAgICAgIGluY3JlbWVudGFsX2luZGV4LCBudW1fcnVucyk6CiAgICAg ICAgICIiIk1lcmdlIG9uZSBidWlsZCBvZiBpbmNyZW1lbnRhbCBqc29uIGludG8gYWdncmVnYXRl ZCBqc29uIHJlc3VsdHMuCiAKICAgICAgICAgQXJnczoKQEAgLTE5OCwxMiArMjAwLDEyIEBAIGNs YXNzIEpzb25SZXN1bHRzKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgYWdncmVnYXRlZF9qc29u W2tleV0uaW5zZXJ0KAogICAgICAgICAgICAgICAgICAgICAwLCBpbmNyZW1lbnRhbF9qc29uW2tl eV1baW5jcmVtZW50YWxfaW5kZXhdKQogICAgICAgICAgICAgICAgIGFnZ3JlZ2F0ZWRfanNvbltr ZXldID0gXAotICAgICAgICAgICAgICAgICAgICBhZ2dyZWdhdGVkX2pzb25ba2V5XVs6SlNPTl9S RVNVTFRTX01BWF9CVUlMRFNdCisgICAgICAgICAgICAgICAgICAgIGFnZ3JlZ2F0ZWRfanNvbltr ZXldWzpudW1fcnVuc10KICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgYWdncmVn YXRlZF9qc29uW2tleV0gPSBpbmNyZW1lbnRhbF9qc29uW2tleV0KIAogICAgIEBjbGFzc21ldGhv ZAotICAgIGRlZiBfbWVyZ2VfdGVzdHMoY2xzLCBhZ2dyZWdhdGVkX2pzb24sIGluY3JlbWVudGFs X2pzb24pOgorICAgIGRlZiBfbWVyZ2VfdGVzdHMoY2xzLCBhZ2dyZWdhdGVkX2pzb24sIGluY3Jl bWVudGFsX2pzb24sIG51bV9ydW5zKToKICAgICAgICAgIiIiTWVyZ2UgInRlc3RzIiBwcm9wZXJ0 aWVzOnJlc3VsdHMsIHRpbWVzLgogCiAgICAgICAgIEFyZ3M6CkBAIC0yMjUsMTUgKzIyNywxNSBA QCBjbGFzcyBKc29uUmVzdWx0cyhvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICB0aW1lcyA9 IFtbMSwgMF1dCiAKICAgICAgICAgICAgICAgICBjbHMuX2luc2VydF9pdGVtX3J1bl9sZW5ndGhf ZW5jb2RlZCgKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0cywgYWdncmVnYXRlZF90ZXN0W0pT T05fUkVTVUxUU19SRVNVTFRTXSkKKyAgICAgICAgICAgICAgICAgICAgcmVzdWx0cywgYWdncmVn YXRlZF90ZXN0W0pTT05fUkVTVUxUU19SRVNVTFRTXSwgbnVtX3J1bnMpCiAgICAgICAgICAgICAg ICAgY2xzLl9pbnNlcnRfaXRlbV9ydW5fbGVuZ3RoX2VuY29kZWQoCi0gICAgICAgICAgICAgICAg ICAgIHRpbWVzLCBhZ2dyZWdhdGVkX3Rlc3RbSlNPTl9SRVNVTFRTX1RJTUVTXSkKKyAgICAgICAg ICAgICAgICAgICAgdGltZXMsIGFnZ3JlZ2F0ZWRfdGVzdFtKU09OX1JFU1VMVFNfVElNRVNdLCBu dW1fcnVucykKICAgICAgICAgICAgICAgICBjbHMuX25vcm1hbGl6ZV9yZXN1bHRzX2pzb24odGVz dF9uYW1lLCBhZ2dyZWdhdGVkX2pzb24pCiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAg ICAgIGFnZ3JlZ2F0ZWRfanNvblt0ZXN0X25hbWVdID0gaW5jcmVtZW50YWxfanNvblt0ZXN0X25h bWVdCiAKICAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgX2luc2VydF9pdGVtX3J1bl9sZW5ndGhf ZW5jb2RlZChjbHMsIGluY3JlbWVudGFsX2l0ZW0sIGFnZ3JlZ2F0ZWRfaXRlbSk6CisgICAgZGVm IF9pbnNlcnRfaXRlbV9ydW5fbGVuZ3RoX2VuY29kZWQoY2xzLCBpbmNyZW1lbnRhbF9pdGVtLCBh Z2dyZWdhdGVkX2l0ZW0sIG51bV9ydW5zKToKICAgICAgICAgIiIiSW5zZXJ0cyB0aGUgaW5jcmVt ZW50YWwgcnVuLWxlbmd0aCBlbmNvZGVkIHJlc3VsdHMgaW50byB0aGUgYWdncmVnYXRlZAogICAg ICAgICAgICBydW4tbGVuZ3RoIGVuY29kZWQgcmVzdWx0cy4KIApAQCAtMjQ1LDcgKzI0Nyw3IEBA IGNsYXNzIEpzb25SZXN1bHRzKG9iamVjdCk6CiAgICAgICAgIGZvciBpdGVtIGluIGluY3JlbWVu dGFsX2l0ZW06CiAgICAgICAgICAgICBpZiBsZW4oYWdncmVnYXRlZF9pdGVtKSBhbmQgaXRlbVsx XSA9PSBhZ2dyZWdhdGVkX2l0ZW1bMF1bMV06CiAgICAgICAgICAgICAgICAgYWdncmVnYXRlZF9p dGVtWzBdWzBdID0gbWluKAotICAgICAgICAgICAgICAgICAgICBhZ2dyZWdhdGVkX2l0ZW1bMF1b MF0gKyBpdGVtWzBdLCBKU09OX1JFU1VMVFNfTUFYX0JVSUxEUykKKyAgICAgICAgICAgICAgICAg ICAgYWdncmVnYXRlZF9pdGVtWzBdWzBdICsgaXRlbVswXSwgbnVtX3J1bnMpCiAgICAgICAgICAg ICBlbHNlOgogICAgICAgICAgICAgICAgIGFnZ3JlZ2F0ZWRfaXRlbS5pbnNlcnQoMCwgaXRlbSkK IApAQCAtMzQwLDcgKzM0Miw3IEBAIGNsYXNzIEpzb25SZXN1bHRzKG9iamVjdCk6CiAgICAgICAg IHJldHVybiBUcnVlCiAKICAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgbWVyZ2UoY2xzLCBidWls ZGVyLCBhZ2dyZWdhdGVkLCBpbmNyZW1lbnRhbCwgc29ydF9rZXlzPUZhbHNlKToKKyAgICBkZWYg bWVyZ2UoY2xzLCBidWlsZGVyLCBhZ2dyZWdhdGVkLCBpbmNyZW1lbnRhbCwgbnVtX3J1bnMsIHNv cnRfa2V5cz1GYWxzZSk6CiAgICAgICAgICIiIk1lcmdlIGluY3JlbWVudGFsIGpzb24gZmlsZSBk YXRhIHdpdGggYWdncmVnYXRlZCBqc29uIGZpbGUgZGF0YS4KIAogICAgICAgICBBcmdzOgpAQCAt Mzc4LDkgKzM4MCw3IEBAIGNsYXNzIEpzb25SZXN1bHRzKG9iamVjdCk6CiAKICAgICAgICAgbG9n Z2luZy5pbmZvKCJNZXJnaW5nIGpzb24gcmVzdWx0cy4uLiIpCiAgICAgICAgIHRyeToKLSAgICAg ICAgICAgIGlmIG5vdCBjbHMuX21lcmdlX2pzb24oCi0gICAgICAgICAgICAgICAgYWdncmVnYXRl ZF9qc29uW2J1aWxkZXJdLAotICAgICAgICAgICAgICAgIGluY3JlbWVudGFsX2pzb25bYnVpbGRl cl0pOgorICAgICAgICAgICAgaWYgbm90IGNscy5fbWVyZ2VfanNvbihhZ2dyZWdhdGVkX2pzb25b YnVpbGRlcl0sIGluY3JlbWVudGFsX2pzb25bYnVpbGRlcl0sIG51bV9ydW5zKToKICAgICAgICAg ICAgICAgICByZXR1cm4gTm9uZQogICAgICAgICBleGNlcHQgRXhjZXB0aW9uLCBlcnI6CiAgICAg ICAgICAgICBsb2dnaW5nLmVycm9yKCJGYWlsZWQgdG8gbWVyZ2UganNvbiByZXN1bHRzOiAlcyIs IHN0cihlcnIpKQpAQCAtMzkzLDE5ICszOTMsMjkgQEAgY2xhc3MgSnNvblJlc3VsdHMob2JqZWN0 KToKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgdXBkYXRlKGNscywgbWFzdGVyLCBidWlsZGVy LCB0ZXN0X3R5cGUsIGluY3JlbWVudGFsKToKICAgICAgICAgIiIiVXBkYXRlIGRhdGFzdG9yZSBq c29uIGZpbGUgZGF0YSBieSBtZXJnaW5nIGl0IHdpdGggaW5jcmVtZW50YWwganNvbgotICAgICAg ICAgICBmaWxlLgorICAgICAgICAgICBmaWxlLiBXcml0ZXMgdGhlIGxhcmdlIGZpbGUgYW5kIGEg c21hbGwgZmlsZS4gVGhlIHNtYWxsIGZpbGUganVzdCBzdG9yZXMKKyAgICAgICAgICAgZmV3ZXIg cnVucy4KIAogICAgICAgICBBcmdzOgorICAgICAgICAgICAgbWFzdGVyOiBtYXN0ZXIgbmFtZS4K ICAgICAgICAgICAgIGJ1aWxkZXI6IGJ1aWxkZXIgbmFtZS4KICAgICAgICAgICAgIHRlc3RfdHlw ZTogdHlwZSBvZiB0ZXN0IHJlc3VsdHMuCiAgICAgICAgICAgICBpbmNyZW1lbnRhbDogaW5jcmVt ZW50YWwganNvbiBmaWxlIGRhdGEgdG8gbWVyZ2UuCiAKICAgICAgICAgUmV0dXJuczoKLSAgICAg ICAgICAgIFRlc3RGaWxlIG9iamVjdCBpZiB1cGRhdGUgc3VjY2VlZHMgb3IKKyAgICAgICAgICAg IExhcmdlIFRlc3RGaWxlIG9iamVjdCBpZiB1cGRhdGUgc3VjY2VlZHMgb3IKICAgICAgICAgICAg IE5vbmUgb24gZmFpbHVyZS4KICAgICAgICAgIiIiCisgICAgICAgIHNtYWxsX2ZpbGUgPSBjbHMu dXBkYXRlX2ZpbGUobWFzdGVyLCBidWlsZGVyLCB0ZXN0X3R5cGUsIGluY3JlbWVudGFsLCBKU09O X1JFU1VMVFNfRklMRV9TTUFMTCwgSlNPTl9SRVNVTFRTX01BWF9CVUlMRFNfU01BTEwpCisgICAg ICAgIGxhcmdlX2ZpbGUgPSBjbHMudXBkYXRlX2ZpbGUobWFzdGVyLCBidWlsZGVyLCB0ZXN0X3R5 cGUsIGluY3JlbWVudGFsLCBKU09OX1JFU1VMVFNfRklMRSwgSlNPTl9SRVNVTFRTX01BWF9CVUlM RFMpCiAKLSAgICAgICAgZmlsZXMgPSBUZXN0RmlsZS5nZXRfZmlsZXMobWFzdGVyLCBidWlsZGVy LCB0ZXN0X3R5cGUsIEpTT05fUkVTVUxUU19GSUxFKQorICAgICAgICBpZiBzbWFsbF9maWxlIGFu ZCBsYXJnZV9maWxlOgorICAgICAgICAgICAgcmV0dXJuIGxhcmdlX2ZpbGUKKyAgICAgICAgcmV0 dXJuIE5vbmUKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiB1cGRhdGVfZmlsZShjbHMsIG1h c3RlciwgYnVpbGRlciwgdGVzdF90eXBlLCBpbmNyZW1lbnRhbCwgZmlsZW5hbWUsIG51bV9ydW5z KToKKyAgICAgICAgZmlsZXMgPSBUZXN0RmlsZS5nZXRfZmlsZXMobWFzdGVyLCBidWlsZGVyLCB0 ZXN0X3R5cGUsIGZpbGVuYW1lKQogICAgICAgICBpZiBmaWxlczoKICAgICAgICAgICAgIGZpbGUg PSBmaWxlc1swXQogCkBAIC00MTcsMjEgKzQyNywyMSBAQCBjbGFzcyBKc29uUmVzdWx0cyhvYmpl Y3QpOgogICAgICAgICAgICAgaWYgbm90IGZpbGUudGVzdF90eXBlOgogICAgICAgICAgICAgICAg IGZpbGUudGVzdF90eXBlID0gImxheW91dC10ZXN0cyIKIAotICAgICAgICAgICAgbmV3X3Jlc3Vs dHMgPSBjbHMubWVyZ2UoYnVpbGRlciwgZmlsZS5kYXRhLCBpbmNyZW1lbnRhbCkKKyAgICAgICAg ICAgIG5ld19yZXN1bHRzID0gY2xzLm1lcmdlKGJ1aWxkZXIsIGZpbGUuZGF0YSwgaW5jcmVtZW50 YWwsIG51bV9ydW5zKQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgIyBVc2UgdGhlIGluY3Jl bWVudGFsIGRhdGEgaWYgdGhlcmUgaXMgbm8gYWdncmVnYXRlZCBmaWxlIHRvIG1lcmdlLgogICAg ICAgICAgICAgZmlsZSA9IFRlc3RGaWxlKCkKICAgICAgICAgICAgIGZpbGUubWFzdGVyID0gbWFz dGVyCiAgICAgICAgICAgICBmaWxlLmJ1aWxkZXIgPSBidWlsZGVyCiAgICAgICAgICAgICBmaWxl LnRlc3RfdHlwZSA9IHRlc3RfdHlwZQotICAgICAgICAgICAgZmlsZS5uYW1lID0gSlNPTl9SRVNV TFRTX0ZJTEUKKyAgICAgICAgICAgIGZpbGUubmFtZSA9IGZpbGVuYW1lCiAgICAgICAgICAgICBu ZXdfcmVzdWx0cyA9IGluY3JlbWVudGFsCiAgICAgICAgICAgICBsb2dnaW5nLmluZm8oIk5vIGV4 aXN0aW5nIGpzb24gcmVzdWx0cywgaW5jcmVtZW50YWwganNvbiBpcyBzYXZlZC4iKQogCi0gICAg ICAgIGlmIG5vdCBuZXdfcmVzdWx0czoKLSAgICAgICAgICAgIHJldHVybiBOb25lCi0KLSAgICAg ICAgaWYgbm90IGZpbGUuc2F2ZShuZXdfcmVzdWx0cyk6CisgICAgICAgIGlmIG5vdCBuZXdfcmVz dWx0cyBvciBub3QgZmlsZS5zYXZlKG5ld19yZXN1bHRzKToKKyAgICAgICAgICAgIGxvZ2dpbmcu aW5mbygKKyAgICAgICAgICAgICAgICAiVXBkYXRlIGZhaWxlZCwgbWFzdGVyOiAlcywgYnVpbGRl cjogJXMsIHRlc3RfdHlwZTogJXMsIG5hbWU6ICVzLiIgJQorICAgICAgICAgICAgICAgIChtYXN0 ZXIsIGJ1aWxkZXIsIHRlc3RfdHlwZSwgZmlsZW5hbWUpKQogICAgICAgICAgICAgcmV0dXJuIE5v bmUKIAogICAgICAgICByZXR1cm4gZmlsZQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvVGVzdFJl c3VsdFNlcnZlci9tb2RlbC9qc29ucmVzdWx0c191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1Rl c3RSZXN1bHRTZXJ2ZXIvbW9kZWwvanNvbnJlc3VsdHNfdW5pdHRlc3QucHkKaW5kZXggMTViNjU5 YmQwOTMyYTY5YjFjMmRhZGM3MjEzYmRkZjFlYTk1MjY3Yy4uYzcwYjkwYzJjZTg2ZWFlZTgwMmFm YmI4MWI2ZWIwZDdiZWQ0MTM3OSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvVGVzdFJlc3VsdFNl cnZlci9tb2RlbC9qc29ucmVzdWx0c191bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9UZXN0 UmVzdWx0U2VydmVyL21vZGVsL2pzb25yZXN1bHRzX3VuaXR0ZXN0LnB5CkBAIC0yNiwxMCArMjYs MTQgQEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBB TlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKLWltcG9ydCBqc29ucmVzdWx0 cwordHJ5OgorICAgIGltcG9ydCBqc29ucmVzdWx0cworICAgIGZyb20ganNvbnJlc3VsdHMgaW1w b3J0IEpzb25SZXN1bHRzCitleGNlcHQgSW1wb3J0RXJyb3I6CisgICAgcHJpbnQgIkVSUk9SOiBB ZGQgdGhlIFRlc3RSZXN1bHRTZXJ2ZXIsIGdvb2dsZV9hcHBlbmdpbmUgYW5kIHlhbWwvbGliIGRp cmVjdG9yaWVzIHRvIHlvdXIgUFlUSE9OUEFUSCIKKwogaW1wb3J0IHVuaXR0ZXN0CiAKLWZyb20g anNvbnJlc3VsdHMgaW1wb3J0IEpzb25SZXN1bHRzCiAKIEpTT05fUkVTVUxUU19URU1QTEFURSA9 ICgKICAgICAneyJXZWJraXQiOnsnCkBAIC0xMTgsNyArMTIyLDggQEAgY2xhc3MgSnNvblJlc3Vs dHNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgYWdncmVnYXRlZF9yZXN1bHRzID0g c2VsZi5fbWFrZV90ZXN0X2pzb24oYWdncmVnYXRlZF9kYXRhKQogICAgICAgICBpbmNyZW1lbnRh bF9yZXN1bHRzID0gc2VsZi5fbWFrZV90ZXN0X2pzb24oaW5jcmVtZW50YWxfZGF0YSkKICAgICAg ICAgbWVyZ2VkX3Jlc3VsdHMgPSBKc29uUmVzdWx0cy5tZXJnZShzZWxmLl9idWlsZGVyLAotICAg ICAgICAgICAgYWdncmVnYXRlZF9yZXN1bHRzLCBpbmNyZW1lbnRhbF9yZXN1bHRzLCBzb3J0X2tl eXM9VHJ1ZSkKKyAgICAgICAgICAgIGFnZ3JlZ2F0ZWRfcmVzdWx0cywgaW5jcmVtZW50YWxfcmVz dWx0cywganNvbnJlc3VsdHMuSlNPTl9SRVNVTFRTX01BWF9CVUlMRFMsCisgICAgICAgICAgICBz b3J0X2tleXM9VHJ1ZSkKIAogICAgICAgICBpZiBleHBlY3RlZF9kYXRhOgogICAgICAgICAgICAg ZXhwZWN0ZWRfcmVzdWx0cyA9IHNlbGYuX21ha2VfdGVzdF9qc29uKGV4cGVjdGVkX2RhdGEpCg==