76238 2012-01-12 18:17:25 -0800 test-webkitpy: clean up handling of test directories, QueueStatusServer 2012-01-13 13:31:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76022 1 dpranke dpranke abarth eric ojan webkit.review.bot oldest_to_newest 535359 0 dpranke 2012-01-12 18:17:25 -0800 test-webkitpy: clean up handling of test directories, QueueStatusServer 535412 1 122364 dpranke 2012-01-12 20:43:12 -0800 Created attachment 122364 Patch 535416 2 122365 dpranke 2012-01-12 20:46:07 -0800 Created attachment 122365 minor nits 535949 3 dpranke 2012-01-13 13:31:40 -0800 fix committed in http://trac.webkit.org/changeset/104980 122364 2012-01-12 20:43:12 -0800 2012-01-12 20:46:03 -0800 Patch bug-76238-20120112204310.patch text/plain 10024 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0ODQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTRlZTc3MWZkN2M0MGRiNWMwZDIzZjgwYThiMjMwYTFm YmM5ZmM4NC4uZmRjMDMzY2ZlMTIzYTM0MjczODNlMDA1MWQ4OTU4N2Y4Y2EyOWM2MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMz IEBACiAyMDEyLTAxLTEyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHRlc3Qtd2Via2l0cHk6IGNsZWFuIHVwIGhhbmRsaW5nIG9mIHRlc3QgZGlyZWN0b3Jp ZXMsIFF1ZXVlU3RhdHVzU2VydmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03NjIzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgcGF0Y2ggY2xlYW5zIHVwIGEgYnVuY2ggb2YgaGFja3MgcmVsYXRl ZCB0byBob3cgd2UgZmluZCBhbGwKKyAgICAgICAgb2YgdGhlIHB5dGhvbiB1bml0IHRlc3RzIGFu ZCBzZXQgdXAgdGhlIHN5cy5wYXRoIHZhcmlhYmxlIGluCisgICAgICAgIHRlc3Qtd2Via2l0cHku CisKKyAgICAgICAgVGhpcyBwYXRjaCBjaGFuZ2VzIGhvdyB0ZXN0LXdlYmtpdHB5IHdvcmtzIHNs aWdodGx5IGluIHRoYXQgd2UKKyAgICAgICAgd2lsbCBub3cgbG9vayBmb3IgdGVzdCBmaWxlcyB1 bmRlciBUb29scy9TY3JpcHRzIGFuZCBTb3VyY2UvV2ViS2l0Mi9TY3JpcHRzCisgICAgICAgIHJh dGhlciB0aGFuIGp1c3QgVG9vbHMvU2NyaXB0cy93ZWJraXRweSBhbmQgU291cmNlL1dlYktpdDIv U2NyaXB0cy93ZWJraXQuCisgICAgICAgIFRoaXMgZ3JlYXRseSBzaW1wbGlmaWVzIHRoZSBtYXBw aW5nIG9mIHBhdGhzIHRvIG1vZHVsZSBuYW1lcyBhbmQKKyAgICAgICAgYXBwZWFycyB0byBoYXZl IG5vIHNpZ25pZmljYW50IHBlcmZvcm1hbmNlIGltcGFjdCBvciBvdGhlciBkcmF3YmFja3MuCisK KyAgICAgICAgVGhlcmUgYXJlIG90aGVyIHdheXMgdGhhdCB3ZSBjb3VsZCByZW1vdmUgYWxsIG9m IHRoZSBoYWNrcyBhbmQKKyAgICAgICAgc3RpbGwgaGF2ZSBhIG1vcmUgZmxleGlibGUgbWFwcGlu ZyBvZiBwYXRocyB0byBtb2R1bGUgbmFtZXMsIGJ1dAorICAgICAgICB0aGUgb25lcyBJJ3ZlIHRo b3VnaHQgb2Ygc28gZmFyIGFkZCBhIGRlY2VudCBhbW91bnQgb2YgY29tcGxleGl0eSB0bworICAg ICAgICB0aGUgaW1wbGVtZW50YXRpb24gYW5kIGRvZXNuJ3Qgc2VlbSB0byBidXkgdXMgbXVjaC4K KyAgICAgICAgCisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvX19pbml0X18ucHk6CisgICAg ICAgICogU2NyaXB0cy90ZXN0LXdlYmtpdHB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv dGVzdC9tYWluLnB5OgorICAgICAgICAoVGVzdGVyLl9tb2R1bGVzX2Zyb21fcGF0aHMpOgorICAg ICAgICAoVGVzdGVyLl9pc19tb2R1bGUpOgorCisyMDEyLTAxLTEyICBEaXJrIFByYW5rZSAgPGRw cmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIHRlc3Qtd2Via2l0cHk6IHNob3VsZCBzdXBw b3J0IGNsYXNzZXMgYW5kIGluZGl2aWR1YWwgdGVzdCBuYW1lcyBhcyB3ZWxsIGFzIG1vZHVsZXMK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2MjMzCiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL19faW5pdF9fLnB5IGIvVG9vbHMv UXVldWVTdGF0dXNTZXJ2ZXIvX19pbml0X18ucHkKaW5kZXggNTc5N2QyZGRmMGEwNjUyMmJkNjYx Yjk2MTUxMmNhMDI1YzAzYWI4OS4uZWY2NWJlZTViYjc3ZTk2ZWJjN2NkOWM0NzY0MDY5MGZiZGE4 YWMxOSAxMDA2NDQKLS0tIGEvVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvX19pbml0X18ucHkKKysr IGIvVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvX19pbml0X18ucHkKQEAgLTEsMzIgKzEgQEAKICMg UmVxdWlyZWQgZm9yIFB5dGhvbiB0byBzZWFyY2ggdGhpcyBkaXJlY3RvcnkgZm9yIG1vZHVsZSBm aWxlcwotCi0jIFRoaXMgX19pbml0X18ucHkgbWFrZXMgdW5pdCB0ZXN0aW5nIGVhc2llciBieSBh bGxvd2luZyB1cyB0byB0cmVhdCB0aGUgZW50aXJlIHNlcnZlciBhcyBvbmUgYmlnIG1vZHVsZS4K LSMgVGhpcyBmaWxlIGlzIG9ubHkgYWNjZXNzZWQgd2hlbiBub3Qgb24gQXBwRW5naW5lIGl0c2Vs Zi4KLQotIyBNYWtlIHN1cmUgdGhhdCB0aGlzIG1vZHVsZSB3aWxsIGxvYWQgaW4gdGhhdCBjYXNl IGJ5IGluY2x1ZGluZyBwYXRocyB0bwotIyB0aGUgZGVmYXVsdCBHb29nbGUgQXBwRW5naW5lIGlu c3RhbGwuCi0KLSMgUmVxdWVzdCBhIG1vZGVybiBEamFuZ28KLWZyb20gZ29vZ2xlLmFwcGVuZ2lu ZS5kaXN0IGltcG9ydCB1c2VfbGlicmFyeQotdXNlX2xpYnJhcnkoJ2RqYW5nbycsICcxLjInKSAg IyBNdXN0IGFncmVlIHdpdGggbWFpbi5weSEKLQotZGVmIGZpeF9zeXNfcGF0aCgpOgotICAgIGlt cG9ydCBzeXMKLSAgICBpbXBvcnQgb3MKLQotICAgICMgQXBwRW5naW5lIGltcG9ydHMgYSBidW5j aCBvZiBnb29nbGUtc3BlY2lmaWMgbW9kdWxlcy4gIFRoYW5rZnVsbHkgdGhlIGRldl9hcHBzZXJ2 ZXIKLSAgICAjIGtub3dzIGhvdyB0byBkbyB0aGUgc2FtZS4gIFJlLXVzZSB0aGUgZGV2X2FwcHNl cnZlciBmaXhfc3lzX3BhdGggbG9naWMgdG8gaW1wb3J0Ci0gICAgIyBhbGwgdGhlIGdvb2dsZS5h cHBlbmdpbmUuKiBzdHVmZiBzbyB3ZSBjYW4gcnVuIHVuZGVyIHRlc3Qtd2Via2l0cHkKLSAgICBz eXMucGF0aC5hcHBlbmQoIi91c3IvbG9jYWwvZ29vZ2xlX2FwcGVuZ2luZSIpCi0gICAgaW1wb3J0 IGRldl9hcHBzZXJ2ZXIKLSAgICBkZXZfYXBwc2VydmVyLmZpeF9zeXNfcGF0aCgpCi0KLSAgICAj IHRlc3Qtd2Via2l0cHkgYWRkcyAkV0VCS0lUL1dlYktpdFRvb2xzIHRvIHRoZSBzeXMucGF0aCBh bmQgaW1wb3J0cwotICAgICMgUXVldWVTdGF0dXNTZXJ2ZXIgdG8gcnVuIGFsbCB0aGUgdGVzdHMu ICBIb3dldmVyLCB3aGVuIEFwcEVuZ2luZSBydW5zCi0gICAgIyBvdXIgY29kZSBRdWV1ZVN0YXR1 c1NlcnZlciBpcyB0aGUgcm9vdCAoYW5kIHRodXMgaW4gdGhlIHBhdGgpLgotICAgICMgRW11bGF0 ZSB0aGF0IGhlcmUgZm9yIHRlc3Qtd2Via2l0cHkgc28gdGhhdCB3ZSBjYW4gaW1wb3J0ICJtb2Rl bC4iCi0gICAgIyBub3QgIlF1ZXVlU3RhdHVzU2VydmVyLm1vZGVsLiIsIGV0Yy4KLSAgICBzeXMu cGF0aC5hcHBlbmQob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSkKLQotCi1maXhfc3lzX3BhdGgo KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5IGIvVG9vbHMvU2NyaXB0 cy90ZXN0LXdlYmtpdHB5CmluZGV4IDZjM2RlMzkwMjRhODM1MDdkMzQ0MWE3Zjk1N2E4NmE4MTYx NDJlMzYuLmQ5NjQzYzhlZTA2NmIxZTc4ZDA2N2QyOTExZDFkMDkxMjhiMjRmZTcgMTAwNzU1Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweQorKysgYi9Ub29scy9TY3JpcHRzL3Rlc3Qt d2Via2l0cHkKQEAgLTQ2LDE4ICs0NiwyMSBAQCBpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgog CiAgICAgIyBGSVhNRTogV2Ugc2hvdWxkIHByb2JhYmx5IHRlc3QgZWFjaCBwYWNrYWdlIHNlcGFy YXRlbHkgdG8gYXZvaWQgbmFtaW5nIGNvbmZsaWN0cy4KICAgICBkaXJzID0gWwotICAgICAgICBv cy5wYXRoLmpvaW4od2Via2l0X3Jvb3QsICdUb29scycsICdTY3JpcHRzJywgJ3dlYmtpdHB5Jyks Ci0gICAgICAgIG9zLnBhdGguam9pbih3ZWJraXRfcm9vdCwgJ1NvdXJjZScsICdXZWJLaXQyJywg J1NjcmlwdHMnLCAnd2Via2l0MicpLAorICAgICAgICBvcy5wYXRoLmpvaW4od2Via2l0X3Jvb3Qs ICdUb29scycsICdTY3JpcHRzJyksCisgICAgICAgIG9zLnBhdGguam9pbih3ZWJraXRfcm9vdCwg J1NvdXJjZScsICdXZWJLaXQyJywgJ1NjcmlwdHMnKQogICAgIF0KIAogICAgICMgRklYTUU6IERv IHdlIG5lZWQgdG8gYmUgYWJsZSB0byB0ZXN0IFF1ZXVlU3RhdHVzU2VydmVyIG9uIFdpbmRvd3Mg YXMgd2VsbD8KICAgICBhcHBlbmdpbmVfc2RrX3BhdGggPSAnL3Vzci9sb2NhbC9nb29nbGVfYXBw ZW5naW5lJwotICAgIGlmIG9zLnBhdGguZXhpc3RzKGFwcGVuZ2luZV9zZGtfcGF0aCkgYW5kIG5v dCBhcHBlbmdpbmVfc2RrX3BhdGggaW4gc3lzLnBhdGg6Ci0gICAgICAgIHN5cy5wYXRoLmFwcGVu ZChhcHBlbmdpbmVfc2RrX3BhdGgpCi0gICAgdHJ5OgotICAgICAgICBpbXBvcnQgZ29vZ2xlLmFw cGVuZ2luZQorICAgIGlmIG9zLnBhdGguZXhpc3RzKGFwcGVuZ2luZV9zZGtfcGF0aCk6CisgICAg ICAgIGlmIG5vdCBhcHBlbmdpbmVfc2RrX3BhdGggaW4gc3lzLnBhdGg6CisgICAgICAgICAgICBz eXMucGF0aC5hcHBlbmQoYXBwZW5naW5lX3Nka19wYXRoKQorICAgICAgICBpbXBvcnQgZGV2X2Fw cHNlcnZlcgorICAgICAgICBmcm9tIGdvb2dsZS5hcHBlbmdpbmUuZGlzdCBpbXBvcnQgdXNlX2xp YnJhcnkKKyAgICAgICAgdXNlX2xpYnJhcnkoJ2RqYW5nbycsICcxLjInKQorICAgICAgICBkZXZf YXBwc2VydmVyLmZpeF9zeXNfcGF0aCgpCiAgICAgICAgIGRpcnMuYXBwZW5kKG9zLnBhdGguam9p bih3ZWJraXRfcm9vdCwgJ1Rvb2xzJywgJ1F1ZXVlU3RhdHVzU2VydmVyJykpCi0gICAgZXhjZXB0 IEltcG9ydEVycm9yOgorICAgIGVsc2U6CiAgICAgICAgIF9sb2cuaW5mbygnU2tpcHBpbmcgUXVl dWVTdGF0dXNTZXJ2ZXIgdGVzdHM7IHRoZSBHb29nbGUgQXBwRW5naW5lIFB5dGhvbiBTREsgaXMg bm90IGluc3RhbGxlZC4nKQogCiAgICAgbWFpbi5UZXN0ZXIuY2xlYW5fcGFja2FnZXMoZGlycykK QEAgLTY1LDQgKzY4LDggQEAgaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgICB0ZXN0ZXIg PSBtYWluLlRlc3RlcigpCiAgICAgb3B0aW9ucywgYXJncyA9IHRlc3Rlci5wYXJzZV9hcmdzKHN5 cy5hcmd2KQogICAgIHRlc3Rlci5jb25maWd1cmUob3B0aW9ucykKKworICAgICMgTWFrZSBzdXJl IFBZVEhPTlBBVEggaXMgc2V0IHVwIGNvcnJlY3RseSBzbyB0aGF0IGFsbCBvZiB0aGUgaW1wb3J0 cyB3aWxsIHdvcmsuCisgICAgc3lzLnBhdGggPSBbZCBmb3IgZCBpbiBkaXJzIGlmIGQgbm90IGlu IHN5cy5wYXRoXSArIHN5cy5wYXRoCisKICAgICBzeXMuZXhpdChub3QgdGVzdGVyLnJ1bihkaXJz LCBhcmdzKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkKaW5kZXggZGFmZWE0OGU5MzNm NDUxNDcyMDcyNGU2N2EyNjc3MjUyN2UxMWU4OC4uZTM3NWIxMDc5YzJjN2VjYzNmNTc2YjlhMzE1 YmZkNWE4NmM0ZjAwYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21h aW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkKQEAgLTE0Miwy NiArMTQyLDIxIEBAIGNsYXNzIFRlc3RlcihvYmplY3QpOgogICAgICAgICBoYW5kbGVyLmFkZEZp bHRlcih0ZXN0aW5nX2ZpbHRlcikKIAogICAgIGRlZiBydW4oc2VsZiwgZGlycywgYXJncyk6Ci0g ICAgICAgIHJldHVybiBub3Qgc2VsZi5fcnVuX3Rlc3RzKGRpcnMsIHNlbGYuX2ZpbmRfbW9kdWxl cyhkaXJzLCBhcmdzKSkKLQotICAgIGRlZiBfZmluZF9tb2R1bGVzKHNlbGYsIGRpcnMsIG1vZHVs ZXMpOgotICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgY29uc2lkZXIgbW92aW5nIHdlYmtpdHB5 IG9mZiBvZiB1c2luZyAid2Via2l0cHkuIiB0byBwcmVmaXgKLSAgICAgICAgIyBhbGwgaW5jbHVk ZXMuICBJZiB3ZSBkaWQgdGhhdCwgdGhlbiB0aGlzIHdvdWxkIHVzZSBwYXRoIGluc3RlYWQgb2Yg ZGlybmFtZShwYXRoKS4KLSAgICAgICAgIyBRdWV1ZVN0YXR1c1NlcnZlci5fX2luaXRfXyBoYXMg YSBzeXMucGF0aCBpbXBvcnQgaGFjayBkdWUgdG8gdGhpcyBjb2RlLgotICAgICAgICBzeXMucGF0 aC5leHRlbmQoc2V0KG9zLnBhdGguZGlybmFtZShwYXRoKSBmb3IgcGF0aCBpbiBkaXJzKSkKLSAg ICAgICAgaWYgbW9kdWxlczoKLSAgICAgICAgICAgIHJldHVybiBtb2R1bGVzCisgICAgICAgIGFy Z3MgPSBhcmdzIG9yIHNlbGYuX2ZpbmRfbW9kdWxlcyhkaXJzKQorICAgICAgICByZXR1cm4gc2Vs Zi5fcnVuX3Rlc3RzKGRpcnMsIGFyZ3MpCiAKKyAgICBkZWYgX2ZpbmRfbW9kdWxlcyhzZWxmLCBk aXJzKToKICAgICAgICAgbW9kdWxlcyA9IFtdCiAgICAgICAgIGZvciBkaXJfdG9fc2VhcmNoIGlu IGRpcnM6Ci0gICAgICAgICAgICBtb2R1bGVzLmV4dGVuZChzZWxmLl9tb2R1bGVzX2Zyb21fcGF0 aHMoZGlyX3RvX3NlYXJjaCwgc2VsZi5fZmluZF91bmRlcihkaXJfdG9fc2VhcmNoLCAiX3VuaXR0 ZXN0LnB5IikpKQorICAgICAgICAgICAgbW9kdWxlcy5leHRlbmQoc2VsZi5fZmluZF9tb2R1bGVz X3VuZGVyKGRpcl90b19zZWFyY2gsICdfdW5pdHRlc3QucHknKSkKICAgICAgICAgICAgIGlmIG5v dCBzZWxmLl9vcHRpb25zLnNraXBfaW50ZWdyYXRpb250ZXN0czoKLSAgICAgICAgICAgICAgICBt b2R1bGVzLmV4dGVuZChzZWxmLl9tb2R1bGVzX2Zyb21fcGF0aHMoZGlyX3RvX3NlYXJjaCwgc2Vs Zi5fZmluZF91bmRlcihkaXJfdG9fc2VhcmNoLCAiX2ludGVncmF0aW9udGVzdC5weSIpKSkKKyAg ICAgICAgICAgICAgICBtb2R1bGVzLmV4dGVuZChzZWxmLl9maW5kX21vZHVsZXNfdW5kZXIoZGly X3RvX3NlYXJjaCwgJ19pbnRlZ3JhdGlvbnRlc3QucHknKSkKICAgICAgICAgbW9kdWxlcy5zb3J0 KCkKIAogICAgICAgICBmb3IgbW9kdWxlIGluIG1vZHVsZXM6CiAgICAgICAgICAgICBfbG9nLmRl YnVnKCJGb3VuZDogJXMiICUgbW9kdWxlKQogCisgICAgICAgICMgRklYTUU6IEZpZ3VyZSBvdXQg aG93IHRvIG1vdmUgdGhpcyB0byB0ZXN0LXdlYmtpdHB5IGluIG9yZGVyIHRvIHRvIG1ha2UgdGhp cyBmaWxlIG1vcmUgZ2VuZXJpYy4KICAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMuYWxsOgog ICAgICAgICAgICAgc2xvd190ZXN0cyA9ICgnd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LnNjbS5z Y21fdW5pdHRlc3QnLCkKICAgICAgICAgICAgIHNlbGYuX2V4Y2x1ZGUobW9kdWxlcywgc2xvd190 ZXN0cywgJ2FyZSByZWFsbHksIHJlYWxseSBzbG93JywgMzE4MTgpCkBAIC0xODYsNDEgKzE4MSwx OCBAQCBjbGFzcyBUZXN0ZXIob2JqZWN0KToKICAgICAgICAgX2xvZy5pbmZvKCcgICAgKGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0lZDsgdXNlIC0tYWxsIHRvIGluY2x1 ZGUpJyAlIGJ1Z2lkKQogICAgICAgICBfbG9nLmluZm8oJycpCiAKLSAgICBkZWYgX2ZpbmRfdW5k ZXIoc2VsZiwgZGlyX3RvX3NlYXJjaCwgc3VmZml4KToKLSAgICAgICAgcGF0aHMgPSBbXQotICAg ICAgICBmb3IgZGlyX3BhdGgsIGRpcl9uYW1lcywgZmlsZV9uYW1lcyBpbiBvcy53YWxrKGRpcl90 b19zZWFyY2gpOgotICAgICAgICAgICAgZm9yIGZpbGVfbmFtZSBpbiBmaWxlX25hbWVzOgotICAg ICAgICAgICAgICAgIGlmIGZpbGVfbmFtZS5lbmRzd2l0aChzdWZmaXgpOgotICAgICAgICAgICAg ICAgICAgICBwYXRocy5hcHBlbmQob3MucGF0aC5qb2luKGRpcl9wYXRoLCBmaWxlX25hbWUpKQot ICAgICAgICByZXR1cm4gcGF0aHMKKyAgICBkZWYgX2ZpbmRfbW9kdWxlc191bmRlcihzZWxmLCBk aXJfdG9fc2VhcmNoLCBzdWZmaXgpOgogCi0gICAgZGVmIF9tb2R1bGVzX2Zyb21fcGF0aHMoc2Vs ZiwgcGFja2FnZV9yb290LCBwYXRocyk6Ci0gICAgICAgICIiIlJldHVybiBhIGxpc3Qgb2YgZnVs bHktcXVhbGlmaWVkIG1vZHVsZSBuYW1lcyBnaXZlbiBwYXRocyB0byB0ZXN0IGZpbGVzLiIiIgot ICAgICAgICBwYWNrYWdlX3BhdGggPSBvcy5wYXRoLmFic3BhdGgocGFja2FnZV9yb290KQotICAg ICAgICByb290X3BhY2thZ2VfbmFtZSA9IG9zLnBhdGguc3BsaXQocGFja2FnZV9wYXRoKVsxXSAg IyBFcXVhbHMgIndlYmtpdHB5Ii4KKyAgICAgICAgZGVmIHRvX3BhY2thZ2UoZGlyX3BhdGgpOgor ICAgICAgICAgICAgcmV0dXJuIGRpcl9wYXRoLnJlcGxhY2UoZGlyX3RvX3NlYXJjaCArIG9zLnNl cCwgJycpLnJlcGxhY2Uob3Muc2VwLCAnLicpCiAKLSAgICAgICAgcHJlZml4X2xlbmd0aCA9IGxl bihwYWNrYWdlX3BhdGgpCisgICAgICAgIGRlZiB0b19tb2R1bGUoZmlsZW5hbWUsIHBhY2thZ2Up OgorICAgICAgICAgICAgcmV0dXJuIHBhY2thZ2UgKyAnLicgKyBmaWxlbmFtZS5yZXBsYWNlKCcu cHknLCAnJykKIAogICAgICAgICBtb2R1bGVzID0gW10KLSAgICAgICAgZm9yIHBhdGggaW4gcGF0 aHM6Ci0gICAgICAgICAgICBwYXRoID0gb3MucGF0aC5hYnNwYXRoKHBhdGgpCi0gICAgICAgICAg ICAjIFRoaXMgZ2l2ZXMgdXMsIGZvciBleGFtcGxlOiAvY29tbW9uL2NvbmZpZy9wb3J0c191bml0 dGVzdC5weQotICAgICAgICAgICAgcmVsX3BhdGggPSBwYXRoW3ByZWZpeF9sZW5ndGg6XQotICAg ICAgICAgICAgIyBUaGlzIGdpdmVzIHVzLCBmb3IgZXhhbXBsZTogL2NvbW1vbi9jb25maWcvcG9y dHNfdW5pdHRlc3QKLSAgICAgICAgICAgIHJlbF9wYXRoID0gb3MucGF0aC5zcGxpdGV4dChyZWxf cGF0aClbMF0KLQotICAgICAgICAgICAgcGFydHMgPSBbXQotICAgICAgICAgICAgd2hpbGUgVHJ1 ZToKLSAgICAgICAgICAgICAgICAocmVsX3BhdGgsIHRhaWwpID0gb3MucGF0aC5zcGxpdChyZWxf cGF0aCkKLSAgICAgICAgICAgICAgICBpZiBub3QgdGFpbDoKLSAgICAgICAgICAgICAgICAgICAg YnJlYWsKLSAgICAgICAgICAgICAgICBwYXJ0cy5pbnNlcnQoMCwgdGFpbCkKLSAgICAgICAgICAg ICMgV2Ugbm93IGhhdmUsIGZvciBleGFtcGxlOiBjb21tb24uY29uZmlnLnBvcnRzX3VuaXR0ZXN0 Ci0gICAgICAgICAgICAjIEZJWE1FOiBUaGlzIGlzIGFsbCBhIGhhY2sgYXJvdW5kIHRoZSBmYWN0 IHRoYXQgd2UgYWx3YXlzIHByZWZpeCB3ZWJraXRweSBpbmNsdWRlcyB3aXRoICJ3ZWJraXRweS4i Ci0gICAgICAgICAgICBwYXJ0cy5pbnNlcnQoMCwgcm9vdF9wYWNrYWdlX25hbWUpICAjIFB1dCAi d2Via2l0cHkiIGF0IHRoZSBiZWdpbm5pbmcuCi0gICAgICAgICAgICBtb2R1bGUgPSAiLiIuam9p bihwYXJ0cykKLSAgICAgICAgICAgIG1vZHVsZXMuYXBwZW5kKG1vZHVsZSkKLQorICAgICAgICBm b3IgZGlyX3BhdGgsIF8sIGZpbGVuYW1lcyBpbiBvcy53YWxrKGRpcl90b19zZWFyY2gpOgorICAg ICAgICAgICAgcGFja2FnZSA9IHRvX3BhY2thZ2UoZGlyX3BhdGgpCisgICAgICAgICAgICBtb2R1 bGVzLmV4dGVuZCh0b19tb2R1bGUoZiwgcGFja2FnZSkgZm9yIGYgaW4gZmlsZW5hbWVzIGlmIGYu ZW5kc3dpdGgoc3VmZml4KSkKICAgICAgICAgcmV0dXJuIG1vZHVsZXMKIAogICAgIGRlZiBfcnVu X3Rlc3RzKHNlbGYsIGRpcnMsIGFyZ3MpOgpAQCAtMjU1LDEyICsyMjcsNyBAQCBjbGFzcyBUZXN0 ZXIob2JqZWN0KToKIAogICAgIGRlZiBfaXNfbW9kdWxlKHNlbGYsIGRpcnMsIG5hbWUpOgogICAg ICAgICByZWxwYXRoID0gbmFtZS5yZXBsYWNlKCcuJywgb3Muc2VwKSArICcucHknCi0gICAgICAg IGZvciBkIGluIGRpcnM6Ci0gICAgICAgICAgICAjIEZJWE1FOiB3ZSBuZWVkIHRvIHRha2UgdGhl IHBhcmVudCBkaXJlY3Rvcnkgb2YgdGhlIGVhY2ggZGlyIGluIHRoZSBsaXN0Ci0gICAgICAgICAg ICAjIGluIG9yZGVyIHRvIHdvcmsgYXJvdW5kIHRoZSAnd2Via2l0cHknIGlzc3VlIG1lbnRpb25l ZCBhYm92ZS4KLSAgICAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihvcy5w YXRoLmRpcm5hbWUoZCksIHJlbHBhdGgpKToKLSAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQot ICAgICAgICByZXR1cm4gRmFsc2UKKyAgICAgICAgcmV0dXJuIGFueShvcy5wYXRoLmV4aXN0cyhv cy5wYXRoLmpvaW4oZCwgcmVscGF0aCkpIGZvciBkIGluIGRpcnMpCiAKICAgICBkZWYgX2xvZ19l eGNlcHRpb24oc2VsZik6CiAgICAgICAgIHMgPSBTdHJpbmdJTy5TdHJpbmdJTygpCg== 122365 2012-01-12 20:46:07 -0800 2012-01-12 20:50:26 -0800 minor nits bug-76238-20120112204606.patch text/plain 10023 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0ODQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTRlZTc3MWZkN2M0MGRiNWMwZDIzZjgwYThiMjMwYTFm YmM5ZmM4NC4uMjVkNGMwYzVlY2NlZDVjZWU2ODM2Y2Y4MmViNGE1MjA1MzVlOGY5ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMz IEBACiAyMDEyLTAxLTEyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHRlc3Qtd2Via2l0cHk6IGNsZWFuIHVwIGhhbmRsaW5nIG9mIHRlc3QgZGlyZWN0b3Jp ZXMsIFF1ZXVlU3RhdHVzU2VydmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03NjIzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgcGF0Y2ggY2xlYW5zIHVwIGEgYnVuY2ggb2YgaGFja3MgcmVsYXRl ZCB0byBob3cgd2UgZmluZCBhbGwKKyAgICAgICAgb2YgdGhlIHB5dGhvbiB1bml0IHRlc3RzIGFu ZCBzZXQgdXAgdGhlIHN5cy5wYXRoIHZhcmlhYmxlIGluCisgICAgICAgIHRlc3Qtd2Via2l0cHku CisKKyAgICAgICAgVGhpcyBwYXRjaCBjaGFuZ2VzIGhvdyB0ZXN0LXdlYmtpdHB5IHdvcmtzIHNs aWdodGx5IGluIHRoYXQgd2UKKyAgICAgICAgd2lsbCBub3cgbG9vayBmb3IgdGVzdCBmaWxlcyB1 bmRlciBUb29scy9TY3JpcHRzIGFuZCBTb3VyY2UvV2ViS2l0Mi9TY3JpcHRzCisgICAgICAgIHJh dGhlciB0aGFuIGp1c3QgVG9vbHMvU2NyaXB0cy93ZWJraXRweSBhbmQgU291cmNlL1dlYktpdDIv U2NyaXB0cy93ZWJraXQuCisgICAgICAgIFRoaXMgZ3JlYXRseSBzaW1wbGlmaWVzIHRoZSBtYXBw aW5nIG9mIHBhdGhzIHRvIG1vZHVsZSBuYW1lcyBhbmQKKyAgICAgICAgYXBwZWFycyB0byBoYXZl IG5vIHNpZ25pZmljYW50IHBlcmZvcm1hbmNlIGltcGFjdCBvciBvdGhlciBkcmF3YmFja3MuCisK KyAgICAgICAgVGhlcmUgYXJlIG90aGVyIHdheXMgdGhhdCB3ZSBjb3VsZCByZW1vdmUgYWxsIG9m IHRoZSBoYWNrcyBhbmQKKyAgICAgICAgc3RpbGwgaGF2ZSBhIG1vcmUgZmxleGlibGUgbWFwcGlu ZyBvZiBwYXRocyB0byBtb2R1bGUgbmFtZXMsIGJ1dAorICAgICAgICB0aGUgb25lcyBJJ3ZlIHRo b3VnaHQgb2Ygc28gZmFyIGFkZCBhIGRlY2VudCBhbW91bnQgb2YgY29tcGxleGl0eSB0bworICAg ICAgICB0aGUgaW1wbGVtZW50YXRpb24gYW5kIGRvbid0IHNlZW0gdG8gYnV5IHVzIG11Y2guCisg ICAgICAgIAorICAgICAgICAqIFF1ZXVlU3RhdHVzU2VydmVyL19faW5pdF9fLnB5OgorICAgICAg ICAqIFNjcmlwdHMvdGVzdC13ZWJraXRweToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rl c3QvbWFpbi5weToKKyAgICAgICAgKFRlc3Rlci5fbW9kdWxlc19mcm9tX3BhdGhzKToKKyAgICAg ICAgKFRlc3Rlci5faXNfbW9kdWxlKToKKworMjAxMi0wMS0xMiAgRGlyayBQcmFua2UgIDxkcHJh bmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICB0ZXN0LXdlYmtpdHB5OiBzaG91bGQgc3VwcG9y dCBjbGFzc2VzIGFuZCBpbmRpdmlkdWFsIHRlc3QgbmFtZXMgYXMgd2VsbCBhcyBtb2R1bGVzCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjIzMwogCmRp ZmYgLS1naXQgYS9Ub29scy9RdWV1ZVN0YXR1c1NlcnZlci9fX2luaXRfXy5weSBiL1Rvb2xzL1F1 ZXVlU3RhdHVzU2VydmVyL19faW5pdF9fLnB5CmluZGV4IDU3OTdkMmRkZjBhMDY1MjJiZDY2MWI5 NjE1MTJjYTAyNWMwM2FiODkuLmVmNjViZWU1YmI3N2U5NmViYzdjZDljNDc2NDA2OTBmYmRhOGFj MTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL19faW5pdF9fLnB5CisrKyBi L1Rvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL19faW5pdF9fLnB5CkBAIC0xLDMyICsxIEBACiAjIFJl cXVpcmVkIGZvciBQeXRob24gdG8gc2VhcmNoIHRoaXMgZGlyZWN0b3J5IGZvciBtb2R1bGUgZmls ZXMKLQotIyBUaGlzIF9faW5pdF9fLnB5IG1ha2VzIHVuaXQgdGVzdGluZyBlYXNpZXIgYnkgYWxs b3dpbmcgdXMgdG8gdHJlYXQgdGhlIGVudGlyZSBzZXJ2ZXIgYXMgb25lIGJpZyBtb2R1bGUuCi0j IFRoaXMgZmlsZSBpcyBvbmx5IGFjY2Vzc2VkIHdoZW4gbm90IG9uIEFwcEVuZ2luZSBpdHNlbGYu Ci0KLSMgTWFrZSBzdXJlIHRoYXQgdGhpcyBtb2R1bGUgd2lsbCBsb2FkIGluIHRoYXQgY2FzZSBi eSBpbmNsdWRpbmcgcGF0aHMgdG8KLSMgdGhlIGRlZmF1bHQgR29vZ2xlIEFwcEVuZ2luZSBpbnN0 YWxsLgotCi0jIFJlcXVlc3QgYSBtb2Rlcm4gRGphbmdvCi1mcm9tIGdvb2dsZS5hcHBlbmdpbmUu ZGlzdCBpbXBvcnQgdXNlX2xpYnJhcnkKLXVzZV9saWJyYXJ5KCdkamFuZ28nLCAnMS4yJykgICMg TXVzdCBhZ3JlZSB3aXRoIG1haW4ucHkhCi0KLWRlZiBmaXhfc3lzX3BhdGgoKToKLSAgICBpbXBv cnQgc3lzCi0gICAgaW1wb3J0IG9zCi0KLSAgICAjIEFwcEVuZ2luZSBpbXBvcnRzIGEgYnVuY2gg b2YgZ29vZ2xlLXNwZWNpZmljIG1vZHVsZXMuICBUaGFua2Z1bGx5IHRoZSBkZXZfYXBwc2VydmVy Ci0gICAgIyBrbm93cyBob3cgdG8gZG8gdGhlIHNhbWUuICBSZS11c2UgdGhlIGRldl9hcHBzZXJ2 ZXIgZml4X3N5c19wYXRoIGxvZ2ljIHRvIGltcG9ydAotICAgICMgYWxsIHRoZSBnb29nbGUuYXBw ZW5naW5lLiogc3R1ZmYgc28gd2UgY2FuIHJ1biB1bmRlciB0ZXN0LXdlYmtpdHB5Ci0gICAgc3lz LnBhdGguYXBwZW5kKCIvdXNyL2xvY2FsL2dvb2dsZV9hcHBlbmdpbmUiKQotICAgIGltcG9ydCBk ZXZfYXBwc2VydmVyCi0gICAgZGV2X2FwcHNlcnZlci5maXhfc3lzX3BhdGgoKQotCi0gICAgIyB0 ZXN0LXdlYmtpdHB5IGFkZHMgJFdFQktJVC9XZWJLaXRUb29scyB0byB0aGUgc3lzLnBhdGggYW5k IGltcG9ydHMKLSAgICAjIFF1ZXVlU3RhdHVzU2VydmVyIHRvIHJ1biBhbGwgdGhlIHRlc3RzLiAg SG93ZXZlciwgd2hlbiBBcHBFbmdpbmUgcnVucwotICAgICMgb3VyIGNvZGUgUXVldWVTdGF0dXNT ZXJ2ZXIgaXMgdGhlIHJvb3QgKGFuZCB0aHVzIGluIHRoZSBwYXRoKS4KLSAgICAjIEVtdWxhdGUg dGhhdCBoZXJlIGZvciB0ZXN0LXdlYmtpdHB5IHNvIHRoYXQgd2UgY2FuIGltcG9ydCAibW9kZWwu IgotICAgICMgbm90ICJRdWV1ZVN0YXR1c1NlcnZlci5tb2RlbC4iLCBldGMuCi0gICAgc3lzLnBh dGguYXBwZW5kKG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXykpCi0KLQotZml4X3N5c19wYXRoKCkK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweSBiL1Rvb2xzL1NjcmlwdHMv dGVzdC13ZWJraXRweQppbmRleCA2YzNkZTM5MDI0YTgzNTA3ZDM0NDFhN2Y5NTdhODZhODE2MTQy ZTM2Li41NWFkOTdiNTVkNDUxYjY1NDAxZTZhZTcwNzM0MTc2MTBjZjBhMjFmIDEwMDc1NQotLS0g YS9Ub29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHkKKysrIGIvVG9vbHMvU2NyaXB0cy90ZXN0LXdl YmtpdHB5CkBAIC00NiwxOCArNDYsMjEgQEAgaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKIAog ICAgICMgRklYTUU6IFdlIHNob3VsZCBwcm9iYWJseSB0ZXN0IGVhY2ggcGFja2FnZSBzZXBhcmF0 ZWx5IHRvIGF2b2lkIG5hbWluZyBjb25mbGljdHMuCiAgICAgZGlycyA9IFsKLSAgICAgICAgb3Mu cGF0aC5qb2luKHdlYmtpdF9yb290LCAnVG9vbHMnLCAnU2NyaXB0cycsICd3ZWJraXRweScpLAot ICAgICAgICBvcy5wYXRoLmpvaW4od2Via2l0X3Jvb3QsICdTb3VyY2UnLCAnV2ViS2l0MicsICdT Y3JpcHRzJywgJ3dlYmtpdDInKSwKKyAgICAgICAgb3MucGF0aC5qb2luKHdlYmtpdF9yb290LCAn VG9vbHMnLCAnU2NyaXB0cycpLAorICAgICAgICBvcy5wYXRoLmpvaW4od2Via2l0X3Jvb3QsICdT b3VyY2UnLCAnV2ViS2l0MicsICdTY3JpcHRzJyksCiAgICAgXQogCiAgICAgIyBGSVhNRTogRG8g d2UgbmVlZCB0byBiZSBhYmxlIHRvIHRlc3QgUXVldWVTdGF0dXNTZXJ2ZXIgb24gV2luZG93cyBh cyB3ZWxsPwogICAgIGFwcGVuZ2luZV9zZGtfcGF0aCA9ICcvdXNyL2xvY2FsL2dvb2dsZV9hcHBl bmdpbmUnCi0gICAgaWYgb3MucGF0aC5leGlzdHMoYXBwZW5naW5lX3Nka19wYXRoKSBhbmQgbm90 IGFwcGVuZ2luZV9zZGtfcGF0aCBpbiBzeXMucGF0aDoKLSAgICAgICAgc3lzLnBhdGguYXBwZW5k KGFwcGVuZ2luZV9zZGtfcGF0aCkKLSAgICB0cnk6Ci0gICAgICAgIGltcG9ydCBnb29nbGUuYXBw ZW5naW5lCisgICAgaWYgb3MucGF0aC5leGlzdHMoYXBwZW5naW5lX3Nka19wYXRoKToKKyAgICAg ICAgaWYgbm90IGFwcGVuZ2luZV9zZGtfcGF0aCBpbiBzeXMucGF0aDoKKyAgICAgICAgICAgIHN5 cy5wYXRoLmFwcGVuZChhcHBlbmdpbmVfc2RrX3BhdGgpCisgICAgICAgIGltcG9ydCBkZXZfYXBw c2VydmVyCisgICAgICAgIGZyb20gZ29vZ2xlLmFwcGVuZ2luZS5kaXN0IGltcG9ydCB1c2VfbGli cmFyeQorICAgICAgICB1c2VfbGlicmFyeSgnZGphbmdvJywgJzEuMicpCisgICAgICAgIGRldl9h cHBzZXJ2ZXIuZml4X3N5c19wYXRoKCkKICAgICAgICAgZGlycy5hcHBlbmQob3MucGF0aC5qb2lu KHdlYmtpdF9yb290LCAnVG9vbHMnLCAnUXVldWVTdGF0dXNTZXJ2ZXInKSkKLSAgICBleGNlcHQg SW1wb3J0RXJyb3I6CisgICAgZWxzZToKICAgICAgICAgX2xvZy5pbmZvKCdTa2lwcGluZyBRdWV1 ZVN0YXR1c1NlcnZlciB0ZXN0czsgdGhlIEdvb2dsZSBBcHBFbmdpbmUgUHl0aG9uIFNESyBpcyBu b3QgaW5zdGFsbGVkLicpCiAKICAgICBtYWluLlRlc3Rlci5jbGVhbl9wYWNrYWdlcyhkaXJzKQpA QCAtNjUsNCArNjgsOCBAQCBpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgogICAgIHRlc3RlciA9 IG1haW4uVGVzdGVyKCkKICAgICBvcHRpb25zLCBhcmdzID0gdGVzdGVyLnBhcnNlX2FyZ3Moc3lz LmFyZ3YpCiAgICAgdGVzdGVyLmNvbmZpZ3VyZShvcHRpb25zKQorCisgICAgIyBNYWtlIHN1cmUg UFlUSE9OUEFUSCBpcyBzZXQgdXAgY29ycmVjdGx5IHNvIHRoYXQgYWxsIG9mIHRoZSBpbXBvcnRz IHdpbGwgd29yay4KKyAgICBzeXMucGF0aCA9IFtkIGZvciBkIGluIGRpcnMgaWYgZCBub3QgaW4g c3lzLnBhdGhdICsgc3lzLnBhdGgKKwogICAgIHN5cy5leGl0KG5vdCB0ZXN0ZXIucnVuKGRpcnMs IGFyZ3MpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvbWFpbi5weQppbmRleCBkYWZlYTQ4ZTkzM2Y0 NTE0NzIwNzI0ZTY3YTI2NzcyNTI3ZTExZTg4Li5lMzc1YjEwNzljMmM3ZWNjM2Y1NzZiOWEzMTVi ZmQ1YTg2YzRmMDBhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvbWFp bi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvbWFpbi5weQpAQCAtMTQyLDI2 ICsxNDIsMjEgQEAgY2xhc3MgVGVzdGVyKG9iamVjdCk6CiAgICAgICAgIGhhbmRsZXIuYWRkRmls dGVyKHRlc3RpbmdfZmlsdGVyKQogCiAgICAgZGVmIHJ1bihzZWxmLCBkaXJzLCBhcmdzKToKLSAg ICAgICAgcmV0dXJuIG5vdCBzZWxmLl9ydW5fdGVzdHMoZGlycywgc2VsZi5fZmluZF9tb2R1bGVz KGRpcnMsIGFyZ3MpKQotCi0gICAgZGVmIF9maW5kX21vZHVsZXMoc2VsZiwgZGlycywgbW9kdWxl cyk6Ci0gICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBjb25zaWRlciBtb3Zpbmcgd2Via2l0cHkg b2ZmIG9mIHVzaW5nICJ3ZWJraXRweS4iIHRvIHByZWZpeAotICAgICAgICAjIGFsbCBpbmNsdWRl cy4gIElmIHdlIGRpZCB0aGF0LCB0aGVuIHRoaXMgd291bGQgdXNlIHBhdGggaW5zdGVhZCBvZiBk aXJuYW1lKHBhdGgpLgotICAgICAgICAjIFF1ZXVlU3RhdHVzU2VydmVyLl9faW5pdF9fIGhhcyBh IHN5cy5wYXRoIGltcG9ydCBoYWNrIGR1ZSB0byB0aGlzIGNvZGUuCi0gICAgICAgIHN5cy5wYXRo LmV4dGVuZChzZXQob3MucGF0aC5kaXJuYW1lKHBhdGgpIGZvciBwYXRoIGluIGRpcnMpKQotICAg ICAgICBpZiBtb2R1bGVzOgotICAgICAgICAgICAgcmV0dXJuIG1vZHVsZXMKKyAgICAgICAgYXJn cyA9IGFyZ3Mgb3Igc2VsZi5fZmluZF9tb2R1bGVzKGRpcnMpCisgICAgICAgIHJldHVybiBzZWxm Ll9ydW5fdGVzdHMoZGlycywgYXJncykKIAorICAgIGRlZiBfZmluZF9tb2R1bGVzKHNlbGYsIGRp cnMpOgogICAgICAgICBtb2R1bGVzID0gW10KICAgICAgICAgZm9yIGRpcl90b19zZWFyY2ggaW4g ZGlyczoKLSAgICAgICAgICAgIG1vZHVsZXMuZXh0ZW5kKHNlbGYuX21vZHVsZXNfZnJvbV9wYXRo cyhkaXJfdG9fc2VhcmNoLCBzZWxmLl9maW5kX3VuZGVyKGRpcl90b19zZWFyY2gsICJfdW5pdHRl c3QucHkiKSkpCisgICAgICAgICAgICBtb2R1bGVzLmV4dGVuZChzZWxmLl9maW5kX21vZHVsZXNf dW5kZXIoZGlyX3RvX3NlYXJjaCwgJ191bml0dGVzdC5weScpKQogICAgICAgICAgICAgaWYgbm90 IHNlbGYuX29wdGlvbnMuc2tpcF9pbnRlZ3JhdGlvbnRlc3RzOgotICAgICAgICAgICAgICAgIG1v ZHVsZXMuZXh0ZW5kKHNlbGYuX21vZHVsZXNfZnJvbV9wYXRocyhkaXJfdG9fc2VhcmNoLCBzZWxm Ll9maW5kX3VuZGVyKGRpcl90b19zZWFyY2gsICJfaW50ZWdyYXRpb250ZXN0LnB5IikpKQorICAg ICAgICAgICAgICAgIG1vZHVsZXMuZXh0ZW5kKHNlbGYuX2ZpbmRfbW9kdWxlc191bmRlcihkaXJf dG9fc2VhcmNoLCAnX2ludGVncmF0aW9udGVzdC5weScpKQogICAgICAgICBtb2R1bGVzLnNvcnQo KQogCiAgICAgICAgIGZvciBtb2R1bGUgaW4gbW9kdWxlczoKICAgICAgICAgICAgIF9sb2cuZGVi dWcoIkZvdW5kOiAlcyIgJSBtb2R1bGUpCiAKKyAgICAgICAgIyBGSVhNRTogRmlndXJlIG91dCBo b3cgdG8gbW92ZSB0aGlzIHRvIHRlc3Qtd2Via2l0cHkgaW4gb3JkZXIgdG8gdG8gbWFrZSB0aGlz IGZpbGUgbW9yZSBnZW5lcmljLgogICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy5hbGw6CiAg ICAgICAgICAgICBzbG93X3Rlc3RzID0gKCd3ZWJraXRweS5jb21tb24uY2hlY2tvdXQuc2NtLnNj bV91bml0dGVzdCcsKQogICAgICAgICAgICAgc2VsZi5fZXhjbHVkZShtb2R1bGVzLCBzbG93X3Rl c3RzLCAnYXJlIHJlYWxseSwgcmVhbGx5IHNsb3cnLCAzMTgxOCkKQEAgLTE4Niw0MSArMTgxLDE4 IEBAIGNsYXNzIFRlc3RlcihvYmplY3QpOgogICAgICAgICBfbG9nLmluZm8oJyAgICAoaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPSVkOyB1c2UgLS1hbGwgdG8gaW5jbHVk ZSknICUgYnVnaWQpCiAgICAgICAgIF9sb2cuaW5mbygnJykKIAotICAgIGRlZiBfZmluZF91bmRl cihzZWxmLCBkaXJfdG9fc2VhcmNoLCBzdWZmaXgpOgotICAgICAgICBwYXRocyA9IFtdCi0gICAg ICAgIGZvciBkaXJfcGF0aCwgZGlyX25hbWVzLCBmaWxlX25hbWVzIGluIG9zLndhbGsoZGlyX3Rv X3NlYXJjaCk6Ci0gICAgICAgICAgICBmb3IgZmlsZV9uYW1lIGluIGZpbGVfbmFtZXM6Ci0gICAg ICAgICAgICAgICAgaWYgZmlsZV9uYW1lLmVuZHN3aXRoKHN1ZmZpeCk6Ci0gICAgICAgICAgICAg ICAgICAgIHBhdGhzLmFwcGVuZChvcy5wYXRoLmpvaW4oZGlyX3BhdGgsIGZpbGVfbmFtZSkpCi0g ICAgICAgIHJldHVybiBwYXRocworICAgIGRlZiBfZmluZF9tb2R1bGVzX3VuZGVyKHNlbGYsIGRp cl90b19zZWFyY2gsIHN1ZmZpeCk6CiAKLSAgICBkZWYgX21vZHVsZXNfZnJvbV9wYXRocyhzZWxm LCBwYWNrYWdlX3Jvb3QsIHBhdGhzKToKLSAgICAgICAgIiIiUmV0dXJuIGEgbGlzdCBvZiBmdWxs eS1xdWFsaWZpZWQgbW9kdWxlIG5hbWVzIGdpdmVuIHBhdGhzIHRvIHRlc3QgZmlsZXMuIiIiCi0g ICAgICAgIHBhY2thZ2VfcGF0aCA9IG9zLnBhdGguYWJzcGF0aChwYWNrYWdlX3Jvb3QpCi0gICAg ICAgIHJvb3RfcGFja2FnZV9uYW1lID0gb3MucGF0aC5zcGxpdChwYWNrYWdlX3BhdGgpWzFdICAj IEVxdWFscyAid2Via2l0cHkiLgorICAgICAgICBkZWYgdG9fcGFja2FnZShkaXJfcGF0aCk6Cisg ICAgICAgICAgICByZXR1cm4gZGlyX3BhdGgucmVwbGFjZShkaXJfdG9fc2VhcmNoICsgb3Muc2Vw LCAnJykucmVwbGFjZShvcy5zZXAsICcuJykKIAotICAgICAgICBwcmVmaXhfbGVuZ3RoID0gbGVu KHBhY2thZ2VfcGF0aCkKKyAgICAgICAgZGVmIHRvX21vZHVsZShmaWxlbmFtZSwgcGFja2FnZSk6 CisgICAgICAgICAgICByZXR1cm4gcGFja2FnZSArICcuJyArIGZpbGVuYW1lLnJlcGxhY2UoJy5w eScsICcnKQogCiAgICAgICAgIG1vZHVsZXMgPSBbXQotICAgICAgICBmb3IgcGF0aCBpbiBwYXRo czoKLSAgICAgICAgICAgIHBhdGggPSBvcy5wYXRoLmFic3BhdGgocGF0aCkKLSAgICAgICAgICAg ICMgVGhpcyBnaXZlcyB1cywgZm9yIGV4YW1wbGU6IC9jb21tb24vY29uZmlnL3BvcnRzX3VuaXR0 ZXN0LnB5Ci0gICAgICAgICAgICByZWxfcGF0aCA9IHBhdGhbcHJlZml4X2xlbmd0aDpdCi0gICAg ICAgICAgICAjIFRoaXMgZ2l2ZXMgdXMsIGZvciBleGFtcGxlOiAvY29tbW9uL2NvbmZpZy9wb3J0 c191bml0dGVzdAotICAgICAgICAgICAgcmVsX3BhdGggPSBvcy5wYXRoLnNwbGl0ZXh0KHJlbF9w YXRoKVswXQotCi0gICAgICAgICAgICBwYXJ0cyA9IFtdCi0gICAgICAgICAgICB3aGlsZSBUcnVl OgotICAgICAgICAgICAgICAgIChyZWxfcGF0aCwgdGFpbCkgPSBvcy5wYXRoLnNwbGl0KHJlbF9w YXRoKQotICAgICAgICAgICAgICAgIGlmIG5vdCB0YWlsOgotICAgICAgICAgICAgICAgICAgICBi cmVhawotICAgICAgICAgICAgICAgIHBhcnRzLmluc2VydCgwLCB0YWlsKQotICAgICAgICAgICAg IyBXZSBub3cgaGF2ZSwgZm9yIGV4YW1wbGU6IGNvbW1vbi5jb25maWcucG9ydHNfdW5pdHRlc3QK LSAgICAgICAgICAgICMgRklYTUU6IFRoaXMgaXMgYWxsIGEgaGFjayBhcm91bmQgdGhlIGZhY3Qg dGhhdCB3ZSBhbHdheXMgcHJlZml4IHdlYmtpdHB5IGluY2x1ZGVzIHdpdGggIndlYmtpdHB5LiIK LSAgICAgICAgICAgIHBhcnRzLmluc2VydCgwLCByb290X3BhY2thZ2VfbmFtZSkgICMgUHV0ICJ3 ZWJraXRweSIgYXQgdGhlIGJlZ2lubmluZy4KLSAgICAgICAgICAgIG1vZHVsZSA9ICIuIi5qb2lu KHBhcnRzKQotICAgICAgICAgICAgbW9kdWxlcy5hcHBlbmQobW9kdWxlKQotCisgICAgICAgIGZv ciBkaXJfcGF0aCwgXywgZmlsZW5hbWVzIGluIG9zLndhbGsoZGlyX3RvX3NlYXJjaCk6CisgICAg ICAgICAgICBwYWNrYWdlID0gdG9fcGFja2FnZShkaXJfcGF0aCkKKyAgICAgICAgICAgIG1vZHVs ZXMuZXh0ZW5kKHRvX21vZHVsZShmLCBwYWNrYWdlKSBmb3IgZiBpbiBmaWxlbmFtZXMgaWYgZi5l bmRzd2l0aChzdWZmaXgpKQogICAgICAgICByZXR1cm4gbW9kdWxlcwogCiAgICAgZGVmIF9ydW5f dGVzdHMoc2VsZiwgZGlycywgYXJncyk6CkBAIC0yNTUsMTIgKzIyNyw3IEBAIGNsYXNzIFRlc3Rl cihvYmplY3QpOgogCiAgICAgZGVmIF9pc19tb2R1bGUoc2VsZiwgZGlycywgbmFtZSk6CiAgICAg ICAgIHJlbHBhdGggPSBuYW1lLnJlcGxhY2UoJy4nLCBvcy5zZXApICsgJy5weScKLSAgICAgICAg Zm9yIGQgaW4gZGlyczoKLSAgICAgICAgICAgICMgRklYTUU6IHdlIG5lZWQgdG8gdGFrZSB0aGUg cGFyZW50IGRpcmVjdG9yeSBvZiB0aGUgZWFjaCBkaXIgaW4gdGhlIGxpc3QKLSAgICAgICAgICAg ICMgaW4gb3JkZXIgdG8gd29yayBhcm91bmQgdGhlICd3ZWJraXRweScgaXNzdWUgbWVudGlvbmVk IGFib3ZlLgotICAgICAgICAgICAgaWYgb3MucGF0aC5leGlzdHMob3MucGF0aC5qb2luKG9zLnBh dGguZGlybmFtZShkKSwgcmVscGF0aCkpOgotICAgICAgICAgICAgICAgIHJldHVybiBUcnVlCi0g ICAgICAgIHJldHVybiBGYWxzZQorICAgICAgICByZXR1cm4gYW55KG9zLnBhdGguZXhpc3RzKG9z LnBhdGguam9pbihkLCByZWxwYXRoKSkgZm9yIGQgaW4gZGlycykKIAogICAgIGRlZiBfbG9nX2V4 Y2VwdGlvbihzZWxmKToKICAgICAgICAgcyA9IFN0cmluZ0lPLlN0cmluZ0lPKCkK