44119 2010-08-17 11:01:36 -0700 Update json results generator so incremental json includes results for tests failed in previous runs 2010-08-17 16:58:32 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 victorw victorw ojan webkit.review.bot oldest_to_newest 265645 0 victorw 2010-08-17 11:01:36 -0700 JSON results generator generates incremental json file and uploads it to test results server to merge with the aggregated results. The current version of incremental json only contains results for tests failed in current run. It does not have results for tests that pass in this run but failed before. This is incorrect as the server needs to know the results for those tests (pass, skipped, no data etc). To fix this, json results generator needs to get list of tests from test results server aggregated json and add current run results for these tests to incremental json. 265768 1 64632 victorw 2010-08-17 14:32:11 -0700 Created attachment 64632 Proposed Patch 265769 2 webkit.review.bot 2010-08-17 14:32:53 -0700 Attachment 64632 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:86: trailing whitespace [pep8/W291] [5] WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:291: trailing whitespace [pep8/W291] [5] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 265802 3 64647 victorw 2010-08-17 15:29:41 -0700 Created attachment 64647 Proposed Patch 265843 4 64647 ojan 2010-08-17 16:49:43 -0700 Comment on attachment 64647 Proposed Patch WebKitTools/ChangeLog:6 + results for tests pass in current run but failed before. Nit: results for tests that pass... 265850 5 victorw 2010-08-17 16:58:32 -0700 Committed r65574: <http://trac.webkit.org/changeset/65574> 64632 2010-08-17 14:32:11 -0700 2010-08-17 15:29:41 -0700 Proposed Patch inc_json_all_tests.patch text/plain 10320 victorw SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDY1NTQyKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDgtMTcgIFZpY3RvciBXYW5nICA8dmlj dG9yd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVXBkYXRlIGpzb24gcmVzdWx0cyBnZW5lcmF0b3IgdG8gaGF2ZSBpbmNyZW1l bnRhbCBqc29uIGluY2x1ZGluZworICAgICAgICByZXN1bHRzIGZvciB0ZXN0cyBwYXNzIGluIGN1 cnJlbnQgcnVuIGJ1dCBmYWlsZWQgYmVmb3JlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDExOQorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRfcmVzdWx0c19nZW5lcmF0 b3IucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3Bh Y2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorCiAyMDEwLTA4LTE3ICBBZGFt IFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBUZWFjaCBydW4td2Via2l0LXRl c3RzLCBEdW1wUmVuZGVyVHJlZSwgYW5kIFdlYktpdFRlc3RSdW5uZXIgaG93IHRvCkluZGV4OiBX ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3J1bl93ZWJraXRfdGVzdHMucHkJKHJldmlzaW9uIDY1NTQxKQorKysgV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQkod29ya2lu ZyBjb3B5KQpAQCAtODc5LDcgKzg3OSw4IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgICAg ICBzZWxmLl9vcHRpb25zLmJ1aWxkX251bWJlciwgc2VsZi5fb3B0aW9ucy5yZXN1bHRzX2RpcmVj dG9yeSwKICAgICAgICAgICAgIEJVSUxERVJfQkFTRV9VUkwsIGluZGl2aWR1YWxfdGVzdF90aW1p bmdzLAogICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgc2Vs Zi5fdGVzdF9maWxlc19saXN0LAotICAgICAgICAgICAgbm90IHNlbGYuX29wdGlvbnMudXBsb2Fk X2Z1bGxfcmVzdWx0cykKKyAgICAgICAgICAgIG5vdCBzZWxmLl9vcHRpb25zLnVwbG9hZF9mdWxs X3Jlc3VsdHMsCisgICAgICAgICAgICBzZWxmLl9vcHRpb25zLnRlc3RfcmVzdWx0c19zZXJ2ZXIp CiAKICAgICAgICAgX2xvZy5kZWJ1ZygiRmluaXNoZWQgd3JpdGluZyBKU09OIGZpbGVzLiIpCiAK SW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9w YWNrYWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pz b25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CShyZXZpc2lvbiA2NTU0MSkKKysrIFdlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25f bGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CSh3b3JraW5nIGNvcHkpCkBAIC01Nyw3ICs1Nyw3 IEBAIGNsYXNzIEpTT05MYXlvdXRSZXN1bHRzR2VuZXJhdG9yKGpzb25fcmUKICAgICBkZWYgX19p bml0X18oc2VsZiwgcG9ydCwgYnVpbGRlcl9uYW1lLCBidWlsZF9uYW1lLCBidWlsZF9udW1iZXIs CiAgICAgICAgIHJlc3VsdHNfZmlsZV9iYXNlX3BhdGgsIGJ1aWxkZXJfYmFzZV91cmwsCiAgICAg ICAgIHRlc3RfdGltaW5ncywgZXhwZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgYWxsX3Rlc3Rz LAotICAgICAgICBnZW5lcmF0ZV9pbmNyZW1lbnRhbF9yZXN1bHRzPUZhbHNlKToKKyAgICAgICAg Z2VuZXJhdGVfaW5jcmVtZW50YWxfcmVzdWx0cz1GYWxzZSwgdGVzdF9yZXN1bHRzX3NlcnZlcj1O b25lKToKICAgICAgICAgIiIiTW9kaWZpZXMgdGhlIHJlc3VsdHMuanNvbiBmaWxlLiBHcmFicyBp dCBvZmYgdGhlIGFyY2hpdmUgZGlyZWN0b3J5CiAgICAgICAgIGlmIGl0IGlzIG5vdCBmb3VuZCBs b2NhbGx5LgogCkBAIC02OCw3ICs2OCw3IEBAIGNsYXNzIEpTT05MYXlvdXRSZXN1bHRzR2VuZXJh dG9yKGpzb25fcmUKICAgICAgICAgc3VwZXIoSlNPTkxheW91dFJlc3VsdHNHZW5lcmF0b3IsIHNl bGYpLl9faW5pdF9fKAogICAgICAgICAgICAgYnVpbGRlcl9uYW1lLCBidWlsZF9uYW1lLCBidWls ZF9udW1iZXIsIHJlc3VsdHNfZmlsZV9iYXNlX3BhdGgsCiAgICAgICAgICAgICBidWlsZGVyX2Jh c2VfdXJsLCB7fSwgcG9ydC50ZXN0X3JlcG9zaXRvcnlfcGF0aHMoKSwKLSAgICAgICAgICAgIGdl bmVyYXRlX2luY3JlbWVudGFsX3Jlc3VsdHMpCisgICAgICAgICAgICBnZW5lcmF0ZV9pbmNyZW1l bnRhbF9yZXN1bHRzLCB0ZXN0X3Jlc3VsdHNfc2VydmVyKQogCiAgICAgICAgIHNlbGYuX3BvcnQg PSBwb3J0CiAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucyA9IGV4cGVjdGF0aW9ucwpJbmRleDog V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uv anNvbl9yZXN1bHRzX2dlbmVyYXRvci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2Vu ZXJhdG9yLnB5CShyZXZpc2lvbiA2NTU0MSkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3IucHkJ KHdvcmtpbmcgY29weSkKQEAgLTgzLDExICs4MywxNSBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVy YXRvckJhc2Uob2JqZWN0KToKIAogICAgIFJFU1VMVFNfRklMRU5BTUUgPSAicmVzdWx0cy5qc29u IgogICAgIElOQ1JFTUVOVEFMX1JFU1VMVFNfRklMRU5BTUUgPSAiaW5jcmVtZW50YWxfcmVzdWx0 cy5qc29uIgorICAgIAorICAgIFVSTF9GT1JfVEVTVF9MSVNUX0pTT04gPSBcCisgICAgICAgICJo dHRwOi8vJXMvdGVzdGZpbGU/YnVpbGRlcj0lcyZuYW1lPSVzJnRlc3RsaXN0anNvbj0xIgogCiAg ICAgZGVmIF9faW5pdF9fKHNlbGYsIGJ1aWxkZXJfbmFtZSwgYnVpbGRfbmFtZSwgYnVpbGRfbnVt YmVyLAogICAgICAgICByZXN1bHRzX2ZpbGVfYmFzZV9wYXRoLCBidWlsZGVyX2Jhc2VfdXJsLAog ICAgICAgICB0ZXN0X3Jlc3VsdHNfbWFwLCBzdm5fcmVwb3NpdG9yaWVzPU5vbmUsCi0gICAgICAg IGdlbmVyYXRlX2luY3JlbWVudGFsX3Jlc3VsdHM9RmFsc2UpOgorICAgICAgICBnZW5lcmF0ZV9p bmNyZW1lbnRhbF9yZXN1bHRzPUZhbHNlLAorICAgICAgICB0ZXN0X3Jlc3VsdHNfc2VydmVyPU5v bmUpOgogICAgICAgICAiIiJNb2RpZmllcyB0aGUgcmVzdWx0cy5qc29uIGZpbGUuIEdyYWJzIGl0 IG9mZiB0aGUgYXJjaGl2ZSBkaXJlY3RvcnkKICAgICAgICAgaWYgaXQgaXMgbm90IGZvdW5kIGxv Y2FsbHkuCiAKQEAgLTEwMyw2ICsxMDcsOSBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvckJh c2Uob2JqZWN0KToKICAgICAgICAgICBzdm5fcmVwb3NpdG9yaWVzOiBBIChqc29uX2ZpZWxkX25h bWUsIHN2bl9wYXRoKSBwYWlyIGZvciBTVk4KICAgICAgICAgICAgICAgcmVwb3NpdG9yaWVzIHRo YXQgdGVzdHMgcmVseSBvbi4gIFRoZSBTVk4gcmV2aXNpb24gd2lsbCBiZQogICAgICAgICAgICAg ICBpbmNsdWRlZCBpbiB0aGUgSlNPTiB3aXRoIHRoZSBnaXZlbiBqc29uX2ZpZWxkX25hbWUuCisg ICAgICAgICAgZ2VuZXJhdGVfaW5jcmVtZW50YWxfcmVzdWx0czogSWYgdHJ1ZSwgZ2VuZXJhdGUg aW5jcmVtZW50YWwganNvbiBmaWxlCisgICAgICAgICAgICAgIGZyb20gY3VycmVudCBydW4gcmVz dWx0cy4KKyAgICAgICAgICB0ZXN0X3Jlc3VsdHNfc2VydmVyOiBzZXJ2ZXIgdGhhdCBob3N0cyB0 ZXN0IHJlc3VsdHMganNvbi4KICAgICAgICAgIiIiCiAgICAgICAgIHNlbGYuX2J1aWxkZXJfbmFt ZSA9IGJ1aWxkZXJfbmFtZQogICAgICAgICBzZWxmLl9idWlsZF9uYW1lID0gYnVpbGRfbmFtZQpA QCAtMTIxLDYgKzEyOCw4IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZShvYmplY3Qp OgogICAgICAgICBpZiBub3Qgc2VsZi5fc3ZuX3JlcG9zaXRvcmllczoKICAgICAgICAgICAgIHNl bGYuX3N2bl9yZXBvc2l0b3JpZXMgPSB7fQogCisgICAgICAgIHNlbGYuX3Rlc3RfcmVzdWx0c19z ZXJ2ZXIgPSB0ZXN0X3Jlc3VsdHNfc2VydmVyCisKICAgICAgICAgc2VsZi5fanNvbiA9IE5vbmUK ICAgICAgICAgc2VsZi5fYXJjaGl2ZWRfcmVzdWx0cyA9IE5vbmUKIApAQCAtMTQ0LDI1ICsxNTMs MjQgQEAgY2xhc3MgSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlKG9iamVjdCk6CiAKICAgICBkZWYg Z2V0X2pzb24oc2VsZiwgaW5jcmVtZW50YWw9RmFsc2UpOgogICAgICAgICAiIiJHZXRzIHRoZSBy ZXN1bHRzIGZvciB0aGUgcmVzdWx0cy5qc29uIGZpbGUuIiIiCi0gICAgICAgIGlmIGluY3JlbWVu dGFsOgotICAgICAgICAgICAgcmVzdWx0c19qc29uID0ge30KLSAgICAgICAgZWxzZToKKyAgICAg ICAgcmVzdWx0c19qc29uID0ge30KKyAgICAgICAgaWYgbm90IGluY3JlbWVudGFsOgogICAgICAg ICAgICAgaWYgc2VsZi5fanNvbjoKICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5fanNvbgog Ci0gICAgICAgICAgICBpZiBub3Qgc2VsZi5fYXJjaGl2ZWRfcmVzdWx0czoKLSAgICAgICAgICAg ICAgICBzZWxmLl9hcmNoaXZlZF9yZXN1bHRzLCBlcnJvciA9IFwKLSAgICAgICAgICAgICAgICAg ICAgc2VsZi5fZ2V0X2FyY2hpdmVkX2pzb25fcmVzdWx0cygpCi0gICAgICAgICAgICAgICAgaWYg ZXJyb3I6Ci0gICAgICAgICAgICAgICAgICAgICMgSWYgdGhlcmUgd2FzIGFuIGVycm9yIGRvbid0 IHdyaXRlIGEgcmVzdWx0cy5qc29uCi0gICAgICAgICAgICAgICAgICAgICMgZmlsZSBhdCBhbGwg YXMgaXQgd291bGQgbG9zZSBhbGwgdGhlIGluZm9ybWF0aW9uIG9uIHRoZQotICAgICAgICAgICAg ICAgICAgICAjIGJvdC4KLSAgICAgICAgICAgICAgICAgICAgX2xvZy5lcnJvcigiQXJjaGl2ZSBk aXJlY3RvcnkgaXMgaW5hY2Nlc3NpYmxlLiBOb3QgIgotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJtb2RpZnlpbmcgb3IgY2xvYmJlcmluZyB0aGUgcmVzdWx0cy5qc29uICIKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiZmlsZTogIiArIHN0cihlcnJvcikpCi0gICAgICAg ICAgICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAgICAgICBpZiBzZWxmLl9hcmNoaXZlZF9y ZXN1bHRzOgorICAgICAgICAgICAgICAgIHJlc3VsdHNfanNvbiA9IHNlbGYuX2FyY2hpdmVkX3Jl c3VsdHMKIAotICAgICAgICAgICAgcmVzdWx0c19qc29uID0gc2VsZi5fYXJjaGl2ZWRfcmVzdWx0 cworICAgICAgICBpZiBub3QgcmVzdWx0c19qc29uOgorICAgICAgICAgICAgcmVzdWx0c19qc29u LCBlcnJvciA9IHNlbGYuX2dldF9hcmNoaXZlZF9qc29uX3Jlc3VsdHMoaW5jcmVtZW50YWwpCisg ICAgICAgICAgICBpZiBlcnJvcjoKKyAgICAgICAgICAgICAgICAjIElmIHRoZXJlIHdhcyBhbiBl cnJvciBkb24ndCB3cml0ZSBhIHJlc3VsdHMuanNvbgorICAgICAgICAgICAgICAgICMgZmlsZSBh dCBhbGwgYXMgaXQgd291bGQgbG9zZSBhbGwgdGhlIGluZm9ybWF0aW9uIG9uIHRoZQorICAgICAg ICAgICAgICAgICMgYm90LgorICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoIkFyY2hpdmUgZGly ZWN0b3J5IGlzIGluYWNjZXNzaWJsZS4gTm90ICIKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICJtb2RpZnlpbmcgb3IgY2xvYmJlcmluZyB0aGUgcmVzdWx0cy5qc29uICIKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICJmaWxlOiAiICsgc3RyKGVycm9yKSkKKyAgICAgICAgICAgICAgICBy ZXR1cm4gTm9uZQogCiAgICAgICAgIGJ1aWxkZXJfbmFtZSA9IHNlbGYuX2J1aWxkZXJfbmFtZQog ICAgICAgICBpZiByZXN1bHRzX2pzb24gYW5kIGJ1aWxkZXJfbmFtZSBub3QgaW4gcmVzdWx0c19q c29uOgpAQCAtMTg2LDcgKzE5NCw3IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZShv YmplY3QpOgogICAgICAgICBhbGxfZmFpbGluZ190ZXN0cyA9IHNlbGYuX2dldF9mYWlsZWRfdGVz dF9uYW1lcygpCiAgICAgICAgIGFsbF9mYWlsaW5nX3Rlc3RzLnVwZGF0ZSh0ZXN0cy5pdGVya2V5 cygpKQogICAgICAgICBmb3IgdGVzdCBpbiBhbGxfZmFpbGluZ190ZXN0czoKLSAgICAgICAgICAg IHNlbGYuX2luc2VydF90ZXN0X3RpbWVfYW5kX3Jlc3VsdCh0ZXN0LCB0ZXN0cykKKyAgICAgICAg ICAgIHNlbGYuX2luc2VydF90ZXN0X3RpbWVfYW5kX3Jlc3VsdCh0ZXN0LCB0ZXN0cywgaW5jcmVt ZW50YWwpCiAKICAgICAgICAgcmV0dXJuIHJlc3VsdHNfanNvbgogCkBAIC0yNTMsMjQgKzI2MSw0 MCBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvckJhc2Uob2JqZWN0KToKICAgICAgICAgICAg ICAgICByZXR1cm4gIiIKICAgICAgICAgcmV0dXJuICIiCiAKLSAgICBkZWYgX2dldF9hcmNoaXZl ZF9qc29uX3Jlc3VsdHMoc2VsZik6CisgICAgZGVmIF9nZXRfYXJjaGl2ZWRfanNvbl9yZXN1bHRz KHNlbGYsIGZvcl9pbmNyZW1lbnRhbD1GYWxzZSk6CiAgICAgICAgICIiIlJlYWRzIG9sZCByZXN1 bHRzIEpTT04gZmlsZSBpZiBpdCBleGlzdHMuCiAgICAgICAgIFJldHVybnMgKGFyY2hpdmVkX3Jl c3VsdHMsIGVycm9yKSB0dXBsZSB3aGVyZSBlcnJvciBpcyBOb25lIGlmIHJlc3VsdHMKICAgICAg ICAgd2VyZSBzdWNjZXNzZnVsbHkgcmVhZC4KKworICAgICAgICBpZiBmb3JfaW5jcmVtZW50YWwg aXMgVHJ1ZSwgZG93bmxvYWQgSlNPTiBmaWxlIHRoYXQgb25seSBjb250YWlucyB0ZXN0CisgICAg ICAgICMgbmFtZSBsaXN0IGZyb20gdGVzdC1yZXN1bHRzIHNlcnZlci4gVGhpcyBpcyBmb3IgZ2Vu ZXJhdGluZyBpbmNyZW1lbnRhbAorICAgICAgICAjIEpTT04gc28gdGhlIGZpbGUgZ2VuZXJhdGVk IGhhcyBpbmZvIGZvciB0ZXN0cyB0aGF0IGZhaWxlZCBiZWZvcmUgYnV0CisgICAgICAgICMgcGFz cyBvciBhcmUgc2tpcHBlZCBmcm9tIGN1cnJlbnQgcnVuLgogICAgICAgICAiIiIKICAgICAgICAg cmVzdWx0c19qc29uID0ge30KICAgICAgICAgb2xkX3Jlc3VsdHMgPSBOb25lCiAgICAgICAgIGVy cm9yID0gTm9uZQogCi0gICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKHNlbGYuX3Jlc3VsdHNfZmls ZV9wYXRoKToKKyAgICAgICAgaWYgb3MucGF0aC5leGlzdHMoc2VsZi5fcmVzdWx0c19maWxlX3Bh dGgpIGFuZCBub3QgZm9yX2luY3JlbWVudGFsOgogICAgICAgICAgICAgd2l0aCBjb2RlY3Mub3Bl bihzZWxmLl9yZXN1bHRzX2ZpbGVfcGF0aCwgInIiLCAidXRmLTgiKSBhcyBmaWxlOgogICAgICAg ICAgICAgICAgIG9sZF9yZXN1bHRzID0gZmlsZS5yZWFkKCkKLSAgICAgICAgZWxpZiBzZWxmLl9i dWlsZGVyX2Jhc2VfdXJsOgotICAgICAgICAgICAgIyBDaGVjayBpZiB3ZSBoYXZlIHRoZSBhcmNo aXZlZCBKU09OIGZpbGUgb24gdGhlIGJ1aWxkYm90IHNlcnZlci4KLSAgICAgICAgICAgIHJlc3Vs dHNfZmlsZV91cmwgPSAoc2VsZi5fYnVpbGRlcl9iYXNlX3VybCArCi0gICAgICAgICAgICAgICAg c2VsZi5fYnVpbGRfbmFtZSArICIvIiArIHNlbGYuUkVTVUxUU19GSUxFTkFNRSkKLSAgICAgICAg ICAgIF9sb2cuZXJyb3IoIkxvY2FsIHJlc3VsdHMuanNvbiBmaWxlIGRvZXMgbm90IGV4aXN0LiBH cmFiYmluZyAiCi0gICAgICAgICAgICAgICAgICAgICAgICJpdCBvZmYgdGhlIGFyY2hpdmUgYXQg IiArIHJlc3VsdHNfZmlsZV91cmwpCisgICAgICAgIGVsaWYgc2VsZi5fYnVpbGRlcl9iYXNlX3Vy bCBvciBmb3JfaW5jcmVtZW50YWw6CisgICAgICAgICAgICBpZiBmb3JfaW5jcmVtZW50YWw6Cisg ICAgICAgICAgICAgICAgaWYgbm90IHNlbGYuX3Rlc3RfcmVzdWx0c19zZXJ2ZXI6CisgICAgICAg ICAgICAgICAgICAgICMgc3RhcnRpbmcgZnJvbSBmcmVzaCBpZiBubyB0ZXN0IHJlc3VsdHMgc2Vy dmVyIHNwZWNpZmllZC4KKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHt9LCBOb25lCisKKyAg ICAgICAgICAgICAgICByZXN1bHRzX2ZpbGVfdXJsID0gKHNlbGYuVVJMX0ZPUl9URVNUX0xJU1Rf SlNPTiAlCisgICAgICAgICAgICAgICAgICAgIChzZWxmLl90ZXN0X3Jlc3VsdHNfc2VydmVyLAor ICAgICAgICAgICAgICAgICAgICAgc2VsZi5fYnVpbGRlcl9uYW1lLAorICAgICAgICAgICAgICAg ICAgICAgc2VsZi5SRVNVTFRTX0ZJTEVOQU1FKSkKKyAgICAgICAgICAgIGVsc2U6ICAgICAgICAg ICAgIAorICAgICAgICAgICAgICAgICMgQ2hlY2sgaWYgd2UgaGF2ZSB0aGUgYXJjaGl2ZWQgSlNP TiBmaWxlIG9uIHRoZSBidWlsZGJvdAorICAgICAgICAgICAgICAgICMgc2VydmVyLgorICAgICAg ICAgICAgICAgIHJlc3VsdHNfZmlsZV91cmwgPSAoc2VsZi5fYnVpbGRlcl9iYXNlX3VybCArCisg ICAgICAgICAgICAgICAgICAgIHNlbGYuX2J1aWxkX25hbWUgKyAiLyIgKyBzZWxmLlJFU1VMVFNf RklMRU5BTUUpCisgICAgICAgICAgICAgICAgX2xvZy5lcnJvcigiTG9jYWwgcmVzdWx0cy5qc29u IGZpbGUgZG9lcyBub3QgZXhpc3QuIEdyYWJiaW5nICIKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICJpdCBvZmYgdGhlIGFyY2hpdmUgYXQgIiArIHJlc3VsdHNfZmlsZV91cmwpCiAKICAgICAg ICAgICAgIHRyeToKICAgICAgICAgICAgICAgICByZXN1bHRzX2ZpbGUgPSB1cmxsaWIyLnVybG9w ZW4ocmVzdWx0c19maWxlX3VybCkKQEAgLTM4Nyw3ICs0MTEsNyBAQCBjbGFzcyBKU09OUmVzdWx0 c0dlbmVyYXRvckJhc2Uob2JqZWN0KToKICAgICAgICAgICAgIGludCh0aW1lLnRpbWUoKSksCiAg ICAgICAgICAgICBzZWxmLlRJTUUpCiAKLSAgICBkZWYgX2luc2VydF90ZXN0X3RpbWVfYW5kX3Jl c3VsdChzZWxmLCB0ZXN0X25hbWUsIHRlc3RzKToKKyAgICBkZWYgX2luc2VydF90ZXN0X3RpbWVf YW5kX3Jlc3VsdChzZWxmLCB0ZXN0X25hbWUsIHRlc3RzLCBpbmNyZW1lbnRhbD1GYWxzZSk6CiAg ICAgICAgICIiIiBJbnNlcnQgYSB0ZXN0IGl0ZW0gd2l0aCBpdHMgcmVzdWx0cyB0byB0aGUgZ2l2 ZW4gdGVzdHMgZGljdGlvbmFyeS4KIAogICAgICAgICBBcmdzOgpAQCAtNDAzLDcgKzQyNywxMSBA QCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvckJhc2Uob2JqZWN0KToKICAgICAgICAgdGhpc1Rl c3QgPSB0ZXN0c1t0ZXN0X25hbWVdCiAgICAgICAgIHNlbGYuX2luc2VydF9pdGVtX3J1bl9sZW5n dGhfZW5jb2RlZChyZXN1bHQsIHRoaXNUZXN0W3NlbGYuUkVTVUxUU10pCiAgICAgICAgIHNlbGYu X2luc2VydF9pdGVtX3J1bl9sZW5ndGhfZW5jb2RlZCh0aW1lLCB0aGlzVGVzdFtzZWxmLlRJTUVT XSkKLSAgICAgICAgc2VsZi5fbm9ybWFsaXplX3Jlc3VsdHNfanNvbih0aGlzVGVzdCwgdGVzdF9u YW1lLCB0ZXN0cykKKworICAgICAgICAjIERvbid0IG5vcm1hbGl6ZSB0aGUgaW5jcmVtZW50YWwg cmVzdWx0cyBqc29uIGJlY2F1c2Ugd2UgbmVlZCByZXN1bHRzCisgICAgICAgICMgZm9yIHRlc3Rz IHRoYXQgcGFzcyBvciBoYXZlIG5vIGRhdGEgZnJvbSBjdXJyZW50IHJ1bi4KKyAgICAgICAgaWYg bm90IGluY3JlbWVudGFsOgorICAgICAgICAgICAgc2VsZi5fbm9ybWFsaXplX3Jlc3VsdHNfanNv bih0aGlzVGVzdCwgdGVzdF9uYW1lLCB0ZXN0cykKIAogICAgIGRlZiBfY29udmVydF9qc29uX3Rv X2N1cnJlbnRfdmVyc2lvbihzZWxmLCByZXN1bHRzX2pzb24pOgogICAgICAgICAiIiJJZiB0aGUg SlNPTiBkb2VzIG5vdCBtYXRjaCB0aGUgY3VycmVudCB2ZXJzaW9uLCBjb252ZXJ0cyBpdCB0byB0 aGUK 64647 2010-08-17 15:29:41 -0700 2010-08-17 16:49:43 -0700 Proposed Patch inc_json_all_tests.patch text/plain 10733 victorw SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDY1NTQyKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDgtMTcgIFZpY3RvciBXYW5nICA8dmlj dG9yd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVXBkYXRlIGpzb24gcmVzdWx0cyBnZW5lcmF0b3IgdG8gaGF2ZSBpbmNyZW1l bnRhbCBqc29uIGluY2x1ZGluZworICAgICAgICByZXN1bHRzIGZvciB0ZXN0cyBwYXNzIGluIGN1 cnJlbnQgcnVuIGJ1dCBmYWlsZWQgYmVmb3JlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDExOQorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRfcmVzdWx0c19nZW5lcmF0 b3IucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3Bh Y2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorCiAyMDEwLTA4LTE3ICBBZGFt IFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBUZWFjaCBydW4td2Via2l0LXRl c3RzLCBEdW1wUmVuZGVyVHJlZSwgYW5kIFdlYktpdFRlc3RSdW5uZXIgaG93IHRvCkluZGV4OiBX ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3J1bl93ZWJraXRfdGVzdHMucHkJKHJldmlzaW9uIDY1NTQxKQorKysgV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQkod29ya2lu ZyBjb3B5KQpAQCAtODc5LDcgKzg3OSw4IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgICAg ICBzZWxmLl9vcHRpb25zLmJ1aWxkX251bWJlciwgc2VsZi5fb3B0aW9ucy5yZXN1bHRzX2RpcmVj dG9yeSwKICAgICAgICAgICAgIEJVSUxERVJfQkFTRV9VUkwsIGluZGl2aWR1YWxfdGVzdF90aW1p bmdzLAogICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgc2Vs Zi5fdGVzdF9maWxlc19saXN0LAotICAgICAgICAgICAgbm90IHNlbGYuX29wdGlvbnMudXBsb2Fk X2Z1bGxfcmVzdWx0cykKKyAgICAgICAgICAgIG5vdCBzZWxmLl9vcHRpb25zLnVwbG9hZF9mdWxs X3Jlc3VsdHMsCisgICAgICAgICAgICBzZWxmLl9vcHRpb25zLnRlc3RfcmVzdWx0c19zZXJ2ZXIp CiAKICAgICAgICAgX2xvZy5kZWJ1ZygiRmluaXNoZWQgd3JpdGluZyBKU09OIGZpbGVzLiIpCiAK SW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9w YWNrYWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pz b25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CShyZXZpc2lvbiA2NTU0MSkKKysrIFdlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25f bGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CSh3b3JraW5nIGNvcHkpCkBAIC01Nyw3ICs1Nyw3 IEBAIGNsYXNzIEpTT05MYXlvdXRSZXN1bHRzR2VuZXJhdG9yKGpzb25fcmUKICAgICBkZWYgX19p bml0X18oc2VsZiwgcG9ydCwgYnVpbGRlcl9uYW1lLCBidWlsZF9uYW1lLCBidWlsZF9udW1iZXIs CiAgICAgICAgIHJlc3VsdHNfZmlsZV9iYXNlX3BhdGgsIGJ1aWxkZXJfYmFzZV91cmwsCiAgICAg ICAgIHRlc3RfdGltaW5ncywgZXhwZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgYWxsX3Rlc3Rz LAotICAgICAgICBnZW5lcmF0ZV9pbmNyZW1lbnRhbF9yZXN1bHRzPUZhbHNlKToKKyAgICAgICAg Z2VuZXJhdGVfaW5jcmVtZW50YWxfcmVzdWx0cz1GYWxzZSwgdGVzdF9yZXN1bHRzX3NlcnZlcj1O b25lKToKICAgICAgICAgIiIiTW9kaWZpZXMgdGhlIHJlc3VsdHMuanNvbiBmaWxlLiBHcmFicyBp dCBvZmYgdGhlIGFyY2hpdmUgZGlyZWN0b3J5CiAgICAgICAgIGlmIGl0IGlzIG5vdCBmb3VuZCBs b2NhbGx5LgogCkBAIC02OCw3ICs2OCw3IEBAIGNsYXNzIEpTT05MYXlvdXRSZXN1bHRzR2VuZXJh dG9yKGpzb25fcmUKICAgICAgICAgc3VwZXIoSlNPTkxheW91dFJlc3VsdHNHZW5lcmF0b3IsIHNl bGYpLl9faW5pdF9fKAogICAgICAgICAgICAgYnVpbGRlcl9uYW1lLCBidWlsZF9uYW1lLCBidWls ZF9udW1iZXIsIHJlc3VsdHNfZmlsZV9iYXNlX3BhdGgsCiAgICAgICAgICAgICBidWlsZGVyX2Jh c2VfdXJsLCB7fSwgcG9ydC50ZXN0X3JlcG9zaXRvcnlfcGF0aHMoKSwKLSAgICAgICAgICAgIGdl bmVyYXRlX2luY3JlbWVudGFsX3Jlc3VsdHMpCisgICAgICAgICAgICBnZW5lcmF0ZV9pbmNyZW1l bnRhbF9yZXN1bHRzLCB0ZXN0X3Jlc3VsdHNfc2VydmVyKQogCiAgICAgICAgIHNlbGYuX3BvcnQg PSBwb3J0CiAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucyA9IGV4cGVjdGF0aW9ucwpJbmRleDog V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uv anNvbl9yZXN1bHRzX2dlbmVyYXRvci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2Vu ZXJhdG9yLnB5CShyZXZpc2lvbiA2NTU0MSkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3IucHkJ KHdvcmtpbmcgY29weSkKQEAgLTg0LDEwICs4NCwxNCBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVy YXRvckJhc2Uob2JqZWN0KToKICAgICBSRVNVTFRTX0ZJTEVOQU1FID0gInJlc3VsdHMuanNvbiIK ICAgICBJTkNSRU1FTlRBTF9SRVNVTFRTX0ZJTEVOQU1FID0gImluY3JlbWVudGFsX3Jlc3VsdHMu anNvbiIKIAorICAgIFVSTF9GT1JfVEVTVF9MSVNUX0pTT04gPSBcCisgICAgICAgICJodHRwOi8v JXMvdGVzdGZpbGU/YnVpbGRlcj0lcyZuYW1lPSVzJnRlc3RsaXN0anNvbj0xIgorCiAgICAgZGVm IF9faW5pdF9fKHNlbGYsIGJ1aWxkZXJfbmFtZSwgYnVpbGRfbmFtZSwgYnVpbGRfbnVtYmVyLAog ICAgICAgICByZXN1bHRzX2ZpbGVfYmFzZV9wYXRoLCBidWlsZGVyX2Jhc2VfdXJsLAogICAgICAg ICB0ZXN0X3Jlc3VsdHNfbWFwLCBzdm5fcmVwb3NpdG9yaWVzPU5vbmUsCi0gICAgICAgIGdlbmVy YXRlX2luY3JlbWVudGFsX3Jlc3VsdHM9RmFsc2UpOgorICAgICAgICBnZW5lcmF0ZV9pbmNyZW1l bnRhbF9yZXN1bHRzPUZhbHNlLAorICAgICAgICB0ZXN0X3Jlc3VsdHNfc2VydmVyPU5vbmUpOgog ICAgICAgICAiIiJNb2RpZmllcyB0aGUgcmVzdWx0cy5qc29uIGZpbGUuIEdyYWJzIGl0IG9mZiB0 aGUgYXJjaGl2ZSBkaXJlY3RvcnkKICAgICAgICAgaWYgaXQgaXMgbm90IGZvdW5kIGxvY2FsbHku CiAKQEAgLTEwMyw2ICsxMDcsOSBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvckJhc2Uob2Jq ZWN0KToKICAgICAgICAgICBzdm5fcmVwb3NpdG9yaWVzOiBBIChqc29uX2ZpZWxkX25hbWUsIHN2 bl9wYXRoKSBwYWlyIGZvciBTVk4KICAgICAgICAgICAgICAgcmVwb3NpdG9yaWVzIHRoYXQgdGVz dHMgcmVseSBvbi4gIFRoZSBTVk4gcmV2aXNpb24gd2lsbCBiZQogICAgICAgICAgICAgICBpbmNs dWRlZCBpbiB0aGUgSlNPTiB3aXRoIHRoZSBnaXZlbiBqc29uX2ZpZWxkX25hbWUuCisgICAgICAg ICAgZ2VuZXJhdGVfaW5jcmVtZW50YWxfcmVzdWx0czogSWYgdHJ1ZSwgZ2VuZXJhdGUgaW5jcmVt ZW50YWwganNvbiBmaWxlCisgICAgICAgICAgICAgIGZyb20gY3VycmVudCBydW4gcmVzdWx0cy4K KyAgICAgICAgICB0ZXN0X3Jlc3VsdHNfc2VydmVyOiBzZXJ2ZXIgdGhhdCBob3N0cyB0ZXN0IHJl c3VsdHMganNvbi4KICAgICAgICAgIiIiCiAgICAgICAgIHNlbGYuX2J1aWxkZXJfbmFtZSA9IGJ1 aWxkZXJfbmFtZQogICAgICAgICBzZWxmLl9idWlsZF9uYW1lID0gYnVpbGRfbmFtZQpAQCAtMTIx LDYgKzEyOCw4IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZShvYmplY3QpOgogICAg ICAgICBpZiBub3Qgc2VsZi5fc3ZuX3JlcG9zaXRvcmllczoKICAgICAgICAgICAgIHNlbGYuX3N2 bl9yZXBvc2l0b3JpZXMgPSB7fQogCisgICAgICAgIHNlbGYuX3Rlc3RfcmVzdWx0c19zZXJ2ZXIg PSB0ZXN0X3Jlc3VsdHNfc2VydmVyCisKICAgICAgICAgc2VsZi5fanNvbiA9IE5vbmUKICAgICAg ICAgc2VsZi5fYXJjaGl2ZWRfcmVzdWx0cyA9IE5vbmUKIApAQCAtMTQ0LDI1ICsxNTMsMjQgQEAg Y2xhc3MgSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlKG9iamVjdCk6CiAKICAgICBkZWYgZ2V0X2pz b24oc2VsZiwgaW5jcmVtZW50YWw9RmFsc2UpOgogICAgICAgICAiIiJHZXRzIHRoZSByZXN1bHRz IGZvciB0aGUgcmVzdWx0cy5qc29uIGZpbGUuIiIiCi0gICAgICAgIGlmIGluY3JlbWVudGFsOgot ICAgICAgICAgICAgcmVzdWx0c19qc29uID0ge30KLSAgICAgICAgZWxzZToKKyAgICAgICAgcmVz dWx0c19qc29uID0ge30KKyAgICAgICAgaWYgbm90IGluY3JlbWVudGFsOgogICAgICAgICAgICAg aWYgc2VsZi5fanNvbjoKICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5fanNvbgogCi0gICAg ICAgICAgICBpZiBub3Qgc2VsZi5fYXJjaGl2ZWRfcmVzdWx0czoKLSAgICAgICAgICAgICAgICBz ZWxmLl9hcmNoaXZlZF9yZXN1bHRzLCBlcnJvciA9IFwKLSAgICAgICAgICAgICAgICAgICAgc2Vs Zi5fZ2V0X2FyY2hpdmVkX2pzb25fcmVzdWx0cygpCi0gICAgICAgICAgICAgICAgaWYgZXJyb3I6 Ci0gICAgICAgICAgICAgICAgICAgICMgSWYgdGhlcmUgd2FzIGFuIGVycm9yIGRvbid0IHdyaXRl IGEgcmVzdWx0cy5qc29uCi0gICAgICAgICAgICAgICAgICAgICMgZmlsZSBhdCBhbGwgYXMgaXQg d291bGQgbG9zZSBhbGwgdGhlIGluZm9ybWF0aW9uIG9uIHRoZQotICAgICAgICAgICAgICAgICAg ICAjIGJvdC4KLSAgICAgICAgICAgICAgICAgICAgX2xvZy5lcnJvcigiQXJjaGl2ZSBkaXJlY3Rv cnkgaXMgaW5hY2Nlc3NpYmxlLiBOb3QgIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICJtb2RpZnlpbmcgb3IgY2xvYmJlcmluZyB0aGUgcmVzdWx0cy5qc29uICIKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiZmlsZTogIiArIHN0cihlcnJvcikpCi0gICAgICAgICAgICAg ICAgICAgIHJldHVybiBOb25lCisgICAgICAgICAgICBpZiBzZWxmLl9hcmNoaXZlZF9yZXN1bHRz OgorICAgICAgICAgICAgICAgIHJlc3VsdHNfanNvbiA9IHNlbGYuX2FyY2hpdmVkX3Jlc3VsdHMK IAotICAgICAgICAgICAgcmVzdWx0c19qc29uID0gc2VsZi5fYXJjaGl2ZWRfcmVzdWx0cworICAg ICAgICBpZiBub3QgcmVzdWx0c19qc29uOgorICAgICAgICAgICAgcmVzdWx0c19qc29uLCBlcnJv ciA9IHNlbGYuX2dldF9hcmNoaXZlZF9qc29uX3Jlc3VsdHMoaW5jcmVtZW50YWwpCisgICAgICAg ICAgICBpZiBlcnJvcjoKKyAgICAgICAgICAgICAgICAjIElmIHRoZXJlIHdhcyBhbiBlcnJvciBk b24ndCB3cml0ZSBhIHJlc3VsdHMuanNvbgorICAgICAgICAgICAgICAgICMgZmlsZSBhdCBhbGwg YXMgaXQgd291bGQgbG9zZSBhbGwgdGhlIGluZm9ybWF0aW9uIG9uIHRoZQorICAgICAgICAgICAg ICAgICMgYm90LgorICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoIkFyY2hpdmUgZGlyZWN0b3J5 IGlzIGluYWNjZXNzaWJsZS4gTm90ICIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICJtb2Rp Znlpbmcgb3IgY2xvYmJlcmluZyB0aGUgcmVzdWx0cy5qc29uICIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICJmaWxlOiAiICsgc3RyKGVycm9yKSkKKyAgICAgICAgICAgICAgICByZXR1cm4g Tm9uZQogCiAgICAgICAgIGJ1aWxkZXJfbmFtZSA9IHNlbGYuX2J1aWxkZXJfbmFtZQogICAgICAg ICBpZiByZXN1bHRzX2pzb24gYW5kIGJ1aWxkZXJfbmFtZSBub3QgaW4gcmVzdWx0c19qc29uOgpA QCAtMTg2LDcgKzE5NCw3IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZShvYmplY3Qp OgogICAgICAgICBhbGxfZmFpbGluZ190ZXN0cyA9IHNlbGYuX2dldF9mYWlsZWRfdGVzdF9uYW1l cygpCiAgICAgICAgIGFsbF9mYWlsaW5nX3Rlc3RzLnVwZGF0ZSh0ZXN0cy5pdGVya2V5cygpKQog ICAgICAgICBmb3IgdGVzdCBpbiBhbGxfZmFpbGluZ190ZXN0czoKLSAgICAgICAgICAgIHNlbGYu X2luc2VydF90ZXN0X3RpbWVfYW5kX3Jlc3VsdCh0ZXN0LCB0ZXN0cykKKyAgICAgICAgICAgIHNl bGYuX2luc2VydF90ZXN0X3RpbWVfYW5kX3Jlc3VsdCh0ZXN0LCB0ZXN0cywgaW5jcmVtZW50YWwp CiAKICAgICAgICAgcmV0dXJuIHJlc3VsdHNfanNvbgogCkBAIC0yNTMsMjQgKzI2MSw0MCBAQCBj bGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvckJhc2Uob2JqZWN0KToKICAgICAgICAgICAgICAgICBy ZXR1cm4gIiIKICAgICAgICAgcmV0dXJuICIiCiAKLSAgICBkZWYgX2dldF9hcmNoaXZlZF9qc29u X3Jlc3VsdHMoc2VsZik6CisgICAgZGVmIF9nZXRfYXJjaGl2ZWRfanNvbl9yZXN1bHRzKHNlbGYs IGZvcl9pbmNyZW1lbnRhbD1GYWxzZSk6CiAgICAgICAgICIiIlJlYWRzIG9sZCByZXN1bHRzIEpT T04gZmlsZSBpZiBpdCBleGlzdHMuCiAgICAgICAgIFJldHVybnMgKGFyY2hpdmVkX3Jlc3VsdHMs IGVycm9yKSB0dXBsZSB3aGVyZSBlcnJvciBpcyBOb25lIGlmIHJlc3VsdHMKICAgICAgICAgd2Vy ZSBzdWNjZXNzZnVsbHkgcmVhZC4KKworICAgICAgICBpZiBmb3JfaW5jcmVtZW50YWwgaXMgVHJ1 ZSwgZG93bmxvYWQgSlNPTiBmaWxlIHRoYXQgb25seSBjb250YWlucyB0ZXN0CisgICAgICAgIG5h bWUgbGlzdCBmcm9tIHRlc3QtcmVzdWx0cyBzZXJ2ZXIuIFRoaXMgaXMgZm9yIGdlbmVyYXRpbmcg aW5jcmVtZW50YWwKKyAgICAgICAgSlNPTiBzbyB0aGUgZmlsZSBnZW5lcmF0ZWQgaGFzIGluZm8g Zm9yIHRlc3RzIHRoYXQgZmFpbGVkIGJlZm9yZSBidXQKKyAgICAgICAgcGFzcyBvciBhcmUgc2tp cHBlZCBmcm9tIGN1cnJlbnQgcnVuLgogICAgICAgICAiIiIKICAgICAgICAgcmVzdWx0c19qc29u ID0ge30KICAgICAgICAgb2xkX3Jlc3VsdHMgPSBOb25lCiAgICAgICAgIGVycm9yID0gTm9uZQog Ci0gICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKHNlbGYuX3Jlc3VsdHNfZmlsZV9wYXRoKToKKyAg ICAgICAgaWYgb3MucGF0aC5leGlzdHMoc2VsZi5fcmVzdWx0c19maWxlX3BhdGgpIGFuZCBub3Qg Zm9yX2luY3JlbWVudGFsOgogICAgICAgICAgICAgd2l0aCBjb2RlY3Mub3BlbihzZWxmLl9yZXN1 bHRzX2ZpbGVfcGF0aCwgInIiLCAidXRmLTgiKSBhcyBmaWxlOgogICAgICAgICAgICAgICAgIG9s ZF9yZXN1bHRzID0gZmlsZS5yZWFkKCkKLSAgICAgICAgZWxpZiBzZWxmLl9idWlsZGVyX2Jhc2Vf dXJsOgotICAgICAgICAgICAgIyBDaGVjayBpZiB3ZSBoYXZlIHRoZSBhcmNoaXZlZCBKU09OIGZp bGUgb24gdGhlIGJ1aWxkYm90IHNlcnZlci4KLSAgICAgICAgICAgIHJlc3VsdHNfZmlsZV91cmwg PSAoc2VsZi5fYnVpbGRlcl9iYXNlX3VybCArCi0gICAgICAgICAgICAgICAgc2VsZi5fYnVpbGRf bmFtZSArICIvIiArIHNlbGYuUkVTVUxUU19GSUxFTkFNRSkKLSAgICAgICAgICAgIF9sb2cuZXJy b3IoIkxvY2FsIHJlc3VsdHMuanNvbiBmaWxlIGRvZXMgbm90IGV4aXN0LiBHcmFiYmluZyAiCi0g ICAgICAgICAgICAgICAgICAgICAgICJpdCBvZmYgdGhlIGFyY2hpdmUgYXQgIiArIHJlc3VsdHNf ZmlsZV91cmwpCisgICAgICAgIGVsaWYgc2VsZi5fYnVpbGRlcl9iYXNlX3VybCBvciBmb3JfaW5j cmVtZW50YWw6CisgICAgICAgICAgICBpZiBmb3JfaW5jcmVtZW50YWw6CisgICAgICAgICAgICAg ICAgaWYgbm90IHNlbGYuX3Rlc3RfcmVzdWx0c19zZXJ2ZXI6CisgICAgICAgICAgICAgICAgICAg ICMgc3RhcnRpbmcgZnJvbSBmcmVzaCBpZiBubyB0ZXN0IHJlc3VsdHMgc2VydmVyIHNwZWNpZmll ZC4KKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHt9LCBOb25lCisKKyAgICAgICAgICAgICAg ICByZXN1bHRzX2ZpbGVfdXJsID0gKHNlbGYuVVJMX0ZPUl9URVNUX0xJU1RfSlNPTiAlCisgICAg ICAgICAgICAgICAgICAgIChzZWxmLl90ZXN0X3Jlc3VsdHNfc2VydmVyLAorICAgICAgICAgICAg ICAgICAgICAgc2VsZi5fYnVpbGRlcl9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgc2VsZi5S RVNVTFRTX0ZJTEVOQU1FKSkKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgIyBD aGVjayBpZiB3ZSBoYXZlIHRoZSBhcmNoaXZlZCBKU09OIGZpbGUgb24gdGhlIGJ1aWxkYm90Cisg ICAgICAgICAgICAgICAgIyBzZXJ2ZXIuCisgICAgICAgICAgICAgICAgcmVzdWx0c19maWxlX3Vy bCA9IChzZWxmLl9idWlsZGVyX2Jhc2VfdXJsICsKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5f YnVpbGRfbmFtZSArICIvIiArIHNlbGYuUkVTVUxUU19GSUxFTkFNRSkKKyAgICAgICAgICAgICAg ICBfbG9nLmVycm9yKCJMb2NhbCByZXN1bHRzLmpzb24gZmlsZSBkb2VzIG5vdCBleGlzdC4gR3Jh YmJpbmcgIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIml0IG9mZiB0aGUgYXJjaGl2ZSBh dCAiICsgcmVzdWx0c19maWxlX3VybCkKIAogICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAg ICAgIHJlc3VsdHNfZmlsZSA9IHVybGxpYjIudXJsb3BlbihyZXN1bHRzX2ZpbGVfdXJsKQpAQCAt Mzg3LDcgKzQxMSw3IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZShvYmplY3QpOgog ICAgICAgICAgICAgaW50KHRpbWUudGltZSgpKSwKICAgICAgICAgICAgIHNlbGYuVElNRSkKIAot ICAgIGRlZiBfaW5zZXJ0X3Rlc3RfdGltZV9hbmRfcmVzdWx0KHNlbGYsIHRlc3RfbmFtZSwgdGVz dHMpOgorICAgIGRlZiBfaW5zZXJ0X3Rlc3RfdGltZV9hbmRfcmVzdWx0KHNlbGYsIHRlc3RfbmFt ZSwgdGVzdHMsIGluY3JlbWVudGFsPUZhbHNlKToKICAgICAgICAgIiIiIEluc2VydCBhIHRlc3Qg aXRlbSB3aXRoIGl0cyByZXN1bHRzIHRvIHRoZSBnaXZlbiB0ZXN0cyBkaWN0aW9uYXJ5LgogCiAg ICAgICAgIEFyZ3M6CkBAIC00MDEsOSArNDI1LDIwIEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJh dG9yQmFzZShvYmplY3QpOgogICAgICAgICAgICAgdGVzdHNbdGVzdF9uYW1lXSA9IHNlbGYuX2Ny ZWF0ZV9yZXN1bHRzX2FuZF90aW1lc19qc29uKCkKIAogICAgICAgICB0aGlzVGVzdCA9IHRlc3Rz W3Rlc3RfbmFtZV0KLSAgICAgICAgc2VsZi5faW5zZXJ0X2l0ZW1fcnVuX2xlbmd0aF9lbmNvZGVk KHJlc3VsdCwgdGhpc1Rlc3Rbc2VsZi5SRVNVTFRTXSkKLSAgICAgICAgc2VsZi5faW5zZXJ0X2l0 ZW1fcnVuX2xlbmd0aF9lbmNvZGVkKHRpbWUsIHRoaXNUZXN0W3NlbGYuVElNRVNdKQotICAgICAg ICBzZWxmLl9ub3JtYWxpemVfcmVzdWx0c19qc29uKHRoaXNUZXN0LCB0ZXN0X25hbWUsIHRlc3Rz KQorICAgICAgICBpZiBzZWxmLlJFU1VMVFMgaW4gdGhpc1Rlc3Q6CisgICAgICAgICAgICBzZWxm Ll9pbnNlcnRfaXRlbV9ydW5fbGVuZ3RoX2VuY29kZWQocmVzdWx0LCB0aGlzVGVzdFtzZWxmLlJF U1VMVFNdKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgdGhpc1Rlc3Rbc2VsZi5SRVNVTFRT XSA9IFtbMSwgcmVzdWx0XV0KKworICAgICAgICBpZiBzZWxmLlRJTUVTIGluIHRoaXNUZXN0Ogor ICAgICAgICAgICAgc2VsZi5faW5zZXJ0X2l0ZW1fcnVuX2xlbmd0aF9lbmNvZGVkKHRpbWUsIHRo aXNUZXN0W3NlbGYuVElNRVNdKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgdGhpc1Rlc3Rb c2VsZi5USU1FU10gPSBbWzEsIHRpbWVdXQorCisgICAgICAgICMgRG9uJ3Qgbm9ybWFsaXplIHRo ZSBpbmNyZW1lbnRhbCByZXN1bHRzIGpzb24gYmVjYXVzZSB3ZSBuZWVkIHJlc3VsdHMKKyAgICAg ICAgIyBmb3IgdGVzdHMgdGhhdCBwYXNzIG9yIGhhdmUgbm8gZGF0YSBmcm9tIGN1cnJlbnQgcnVu LgorICAgICAgICBpZiBub3QgaW5jcmVtZW50YWw6CisgICAgICAgICAgICBzZWxmLl9ub3JtYWxp emVfcmVzdWx0c19qc29uKHRoaXNUZXN0LCB0ZXN0X25hbWUsIHRlc3RzKQogCiAgICAgZGVmIF9j b252ZXJ0X2pzb25fdG9fY3VycmVudF92ZXJzaW9uKHNlbGYsIHJlc3VsdHNfanNvbik6CiAgICAg ICAgICIiIklmIHRoZSBKU09OIGRvZXMgbm90IG1hdGNoIHRoZSBjdXJyZW50IHZlcnNpb24sIGNv bnZlcnRzIGl0IHRvIHRoZQo=