47528 2010-10-11 18:12:29 -0700 new-run-webkit-tests: 'webkit-patch skipped-ports' introduced bad layering 2012-04-11 17:13:52 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan pnormand tony oldest_to_newest 292804 0 dpranke 2010-10-11 18:12:29 -0700 bug 42832 / r66872 introduced some unfortunate layering/dependency violations, by making the Port classes depend on the test_expectations library. This should be cleaned up by adding a generic routine that depends on both modules. 600722 1 136789 dpranke 2012-04-11 16:56:04 -0700 Created attachment 136789 Patch 600738 2 dpranke 2012-04-11 17:13:52 -0700 Committed r113927: <http://trac.webkit.org/changeset/113927> 136789 2012-04-11 16:56:04 -0700 2012-04-11 17:02:08 -0700 Patch bug-47528-20120411165603.patch text/plain 11903 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzOTIwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjIyMjk0ZmE3ZWVmOTE3YmIxOWU0YzYwZjRlYmYwMmVl ZmFlODNjMS4uZjlhYTNhODM5OGU3OWI0ZjU4MmZkMWY2NDEwMDFlODk0ZjZjMzI5NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQz IEBACisyMDEyLTA0LTExICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3RzOiAnd2Via2l0LXBhdGNoIHNraXBwZWQtcG9ydHMn IGludHJvZHVjZWQgYmFkIGxheWVyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00NzUyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoZSBza2lwcGVkLXBvcnRzIGNvbW1hbmQgaGFzIGJlZW4gcmVwbGFj ZWQgYnkgJ3dlYmtpdC1wYXRjaAorICAgICAgICBwcmludC1leHBlY3RhdGlvbnMnLCB3aGljaCBv ZmZlcnMgdGhlIGVxdWl2YWxlbnQgZnVuY3Rpb25hbGl0eQorICAgICAgICB2aWEgJ3dlYmtpdC1w YXRjaCBwcmludC1leHBlY3RhdGlvbnMgLS1wbGF0Zm9ybSBcKiAtdCBza2lwJworICAgICAgICAo YW5kIG90aGVyIGZlYXR1cmVzLCBvZiBjb3Vyc2UpLgorICAgICAgICAKKyAgICAgICAgVGhpcyBh bHNvIGFsbG93cyBtZSB0byBmaXggYSBuYXN0eSBsYXllcmluZyB2aW9sYXRpb24gd2hlcmUgdGhl CisgICAgICAgIGNocm9taXVtIHBvcnQgaGFkIHRvIGtub3cgYWJvdXQgdGhlIFRlc3RFeHBlY3Rh dGlvbnMgb2JqZWN0cyBpbgorICAgICAgICBvcmRlciB0byBpbXBsZW1lbnQgdGhlIGNvbW1hbmQg cHJvcGVybHkuCisKKyAgICAgICAgTGFzdGx5LCB0aGlzIGFsbG93cyBtZSB0byByZW5hbWUgc2tp cHBlZF90ZXN0cygpIHRvCisgICAgICAgIHNraXBwZWRfbGF5b3V0X3Rlc3RzKCkgdG8gbW9yZSBj b25zaXN0ZW50IHdpdGgKKyAgICAgICAgc2tpcHBlZF9wZXJmX3Rlc3RzKCkuCisgICAgICAgIAor ICAgICAgICBUaGlzIHBhdGNoIHJlbW92ZXMgc2tpcHNfbGF5b3V0X3Rlc3QoKSBmcm9tIHRoZSBQ b3J0IGludGVyZmFjZSwKKyAgICAgICAgYmVjYXVzZSB0aGF0IGNhbid0IGJlIGltcGxlbWVudGVk IHdpdGhvdXQgdGhlIHBvcnQga25vd2luZyBhYm91dAorICAgICAgICBFeHBlY3RhdGlvbnMgb2Jq ZWN0cyAoYW5kIHNraXBwZWQtcG9ydHMgd2FzIHRoZSBvbmx5IHRoaW5nIHVzaW5nIGl0KS4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAg ICAgICAgKFBvcnQuc2tpcHBlZF9sYXlvdXRfdGVzdHMpOgorICAgICAgICAoUG9ydC5za2lwcGVk X3BlcmZfdGVzdHMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZV91bml0dGVzdC5weToKKyAgICAgICAgKFBvcnRUZXN0LnRlc3RfZGVmYXVsdF9jb25m aWd1cmF0aW9uX25vdGZvdW5kKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtLnB5OgorICAgICAgICAoQ2hyb21pdW1Qb3J0LnRlc3RfZXhwZWN0 YXRpb25zX292ZXJyaWRlcyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bV91bml0dGVzdC5weToKKyAgICAgICAgKENocm9taXVtUG9ydFRlc3Qu dGVzdF9wYXRoX3RvX2ltYWdlX2RpZmYpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5OgorICAgICAgICAoV2ViS2l0UG9ydC5za2lwcGVkX2xh eW91dF90ZXN0cyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1 ZXJpZXMucHk6CisgICAgICAgIChleGVjdXRlKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvY29tbWFuZHMvcXVlcmllc191bml0dGVzdC5weToKKyAgICAgICAgKFF1ZXJ5Q29tbWFu ZHNUZXN0LnRlc3RfdHJlZV9zdGF0dXMpOgorCiAyMDEyLTA0LTExICBNYXJrIFJvd2UgIDxtcm93 ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGEgZnByaW50ZiBmcm9tIExheW91dFRlc3RD b250cm9sbGVyLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9iYXNlLnB5CmluZGV4IGY5NDBhMTAzNjk0ZDA2NTNhYTUxNzZhNWQ0MjhkNmY3MjcwYzFiNjEu LjE0OTQ4MzAwYWRiMDI2MDVmOTM3NWQyOGU5NTA5M2Q5ZjcyYWYyODggMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAgLTU5NCw4ICs1 OTQsOSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgZGVmIHdlYmtpdF9iYXNlKHNlbGYpOgog ICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5hYnNwYXRoKHNlbGYucGF0aF9mcm9tX3dl YmtpdF9iYXNlKCcuJykpCiAKLSAgICBkZWYgc2tpcHBlZF9sYXlvdXRfdGVzdHMoc2VsZik6Ci0g ICAgICAgIHJldHVybiBbXQorICAgIGRlZiBza2lwcGVkX2xheW91dF90ZXN0cyhzZWxmLCB0ZXN0 X2xpc3QpOgorICAgICAgICAiIiJSZXR1cm5zIHRoZSBzZXQgb2YgdGVzdHMgZm91bmQgaW4gU2tp cHBlZCBmaWxlcy4gRG9lcyAqbm90KiBpbmNsdWRlIHRlc3RzIG1hcmtlZCBhcyBTS0lQIGluIGV4 cGVjdGF0aW9ucyBmaWxlcy4iIiIKKyAgICAgICAgcmV0dXJuIHNldChbXSkKIAogICAgIGRlZiBf dGVzdHNfZnJvbV9za2lwcGVkX2ZpbGVfY29udGVudHMoc2VsZiwgc2tpcHBlZF9maWxlX2NvbnRl bnRzKToKICAgICAgICAgdGVzdHNfdG9fc2tpcCA9IFtdCkBAIC02MjMsMjEgKzYyNCw2IEBAIGNs YXNzIFBvcnQob2JqZWN0KToKICAgICBkZWYgc2tpcHBlZF9wZXJmX3Rlc3RzKHNlbGYpOgogICAg ICAgICByZXR1cm4gc2VsZi5fZXhwZWN0YXRpb25zX2Zyb21fc2tpcHBlZF9maWxlcyhbc2VsZi5w ZXJmX3Rlc3RzX2RpcigpXSkKIAotICAgIGRlZiBza2lwcGVkX3Rlc3RzKHNlbGYsIHRlc3RfbGlz dCk6Ci0gICAgICAgIHJldHVybiBzZXQoW10pCi0KLSAgICBkZWYgc2tpcHNfbGF5b3V0X3Rlc3Qo c2VsZiwgdGVzdF9uYW1lKToKLSAgICAgICAgIiIiRmlndXJlcyBvdXQgaWYgdGhlIGdpdmVudCB0 ZXN0IGlzIGJlaW5nIHNraXBwZWQgb3Igbm90LgotCi0gICAgICAgIFRlc3QgY2F0ZWdvcmllcyBh cmUgaGFuZGxlZCBhcyB3ZWxsLiIiIgotICAgICAgICBmb3IgdGVzdF9vcl9jYXRlZ29yeSBpbiBz ZWxmLnNraXBwZWRfbGF5b3V0X3Rlc3RzKCk6Ci0gICAgICAgICAgICBpZiB0ZXN0X29yX2NhdGVn b3J5ID09IHRlc3RfbmFtZToKLSAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQotICAgICAgICAg ICAgY2F0ZWdvcnkgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5sYXlvdXRfdGVzdHNfZGly KCksIHRlc3Rfb3JfY2F0ZWdvcnkpCi0gICAgICAgICAgICBpZiBzZWxmLl9maWxlc3lzdGVtLmlz ZGlyKGNhdGVnb3J5KSBhbmQgdGVzdF9uYW1lLnN0YXJ0c3dpdGgodGVzdF9vcl9jYXRlZ29yeSk6 Ci0gICAgICAgICAgICAgICAgcmV0dXJuIFRydWUKLSAgICAgICAgcmV0dXJuIEZhbHNlCi0KICAg ICBkZWYgc2tpcHNfcGVyZl90ZXN0KHNlbGYsIHRlc3RfbmFtZSk6CiAgICAgICAgIGZvciB0ZXN0 X29yX2NhdGVnb3J5IGluIHNlbGYuc2tpcHBlZF9wZXJmX3Rlc3RzKCk6CiAgICAgICAgICAgICBp ZiB0ZXN0X29yX2NhdGVnb3J5ID09IHRlc3RfbmFtZToKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVzdC5weQppbmRleCBm ZGUwNWZkYTAwYTBhNTEyZDRkZjhmNDE5MWY0MWVlYmU2MTQ4NTFiLi5kNTJmODgxOWY5YjAzYmY4 Njk2OWJhN2ZhMGM5YWViZjgzMjY0MjFjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5CkBAIC0yMDgsMTUg KzIwOCw2IEBAIGNsYXNzIFBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgcG9y dCA9IHNlbGYubWFrZV9wb3J0KGNvbmZpZz1jb25maWdfbW9jay5Nb2NrQ29uZmlnKGRlZmF1bHRf Y29uZmlndXJhdGlvbj0nZGVmYXVsdCcpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQu ZGVmYXVsdF9jb25maWd1cmF0aW9uKCksICdkZWZhdWx0JykKIAotICAgIGRlZiB0ZXN0X2xheW91 dF90ZXN0c19za2lwcGluZyhzZWxmKToKLSAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkK LSAgICAgICAgcG9ydC5ob3N0LmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKHBvcnQubGF5b3V0 X3Rlc3RzX2RpcigpICsgJy9tZWRpYS92aWRlby16b29tLmh0bWwnLCAnJykKLSAgICAgICAgcG9y dC5ob3N0LmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKHBvcnQubGF5b3V0X3Rlc3RzX2Rpcigp ICsgJy9mb28vYmFyLmh0bWwnLCAnJykKLSAgICAgICAgcG9ydC5za2lwcGVkX2xheW91dF90ZXN0 cyA9IGxhbWJkYTogWydmb28vYmFyLmh0bWwnLCAnbWVkaWEnXQotICAgICAgICBzZWxmLmFzc2Vy dFRydWUocG9ydC5za2lwc19sYXlvdXRfdGVzdCgnZm9vL2Jhci5odG1sJykpCi0gICAgICAgIHNl bGYuYXNzZXJ0VHJ1ZShwb3J0LnNraXBzX2xheW91dF90ZXN0KCdtZWRpYS92aWRlby16b29tLmh0 bWwnKSkKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShwb3J0LnNraXBzX2xheW91dF90ZXN0KCdm b28vZm9vLmh0bWwnKSkKLQogICAgIGRlZiB0ZXN0X3NldHVwX3Rlc3RfcnVuKHNlbGYpOgogICAg ICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQogICAgICAgICAjIFRoaXMgcm91dGluZSBpcyBh IG5vLW9wLiBXZSBqdXN0IHRlc3QgaXQgZm9yIGNvdmVyYWdlLgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKaW5kZXggNjRhZmRm NWZiZWJjYTE1ZjI1NmFjNDUwNTBmY2ZmNjJkMDQzOTlkYy4uZDM3NzQ3NTIxNGMzNWEyMWY4NTkw NDk2N2M1OTc0NTVlNWQzYmU1YyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC0zMjEsMjAgKzMyMSw2IEBAIGNsYXNz IENocm9taXVtUG9ydChQb3J0KToKICAgICAgICAgICAgIHJldHVybiBOb25lCiAgICAgICAgIHJl dHVybiBzZWxmLl9maWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKG92ZXJyaWRlc19wYXRoKQogCi0g ICAgZGVmIHNraXBwZWRfbGF5b3V0X3Rlc3RzKHNlbGYsIGV4dHJhX3Rlc3RfZmlsZXM9Tm9uZSk6 Ci0gICAgICAgIGV4cGVjdGF0aW9uc19zdHIgPSBzZWxmLnRlc3RfZXhwZWN0YXRpb25zKCkKLSAg ICAgICAgb3ZlcnJpZGVzX3N0ciA9IHNlbGYudGVzdF9leHBlY3RhdGlvbnNfb3ZlcnJpZGVzKCkK LSAgICAgICAgaXNfZGVidWdfbW9kZSA9IEZhbHNlCi0KLSAgICAgICAgYWxsX3Rlc3RfZmlsZXMg PSBzZWxmLnRlc3RzKFtdKQotICAgICAgICBpZiBleHRyYV90ZXN0X2ZpbGVzOgotICAgICAgICAg ICAgYWxsX3Rlc3RfZmlsZXMudXBkYXRlKGV4dHJhX3Rlc3RfZmlsZXMpCi0KLSAgICAgICAgZXhw ZWN0YXRpb25zID0gdGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucygKLSAgICAgICAg ICAgIHNlbGYsIGFsbF90ZXN0X2ZpbGVzLCBleHBlY3RhdGlvbnNfc3RyLCBzZWxmLnRlc3RfY29u ZmlndXJhdGlvbigpLAotICAgICAgICAgICAgaXNfbGludF9tb2RlPUZhbHNlLCBvdmVycmlkZXM9 b3ZlcnJpZGVzX3N0cikKLSAgICAgICAgcmV0dXJuIGV4cGVjdGF0aW9ucy5nZXRfdGVzdHNfd2l0 aF9yZXN1bHRfdHlwZSh0ZXN0X2V4cGVjdGF0aW9ucy5TS0lQKQotCiAgICAgZGVmIHJlcG9zaXRv cnlfcGF0aHMoc2VsZik6CiAgICAgICAgIHJlcG9zID0gc3VwZXIoQ2hyb21pdW1Qb3J0LCBzZWxm KS5yZXBvc2l0b3J5X3BhdGhzKCkKICAgICAgICAgcmVwb3MuYXBwZW5kKCgnY2hyb21pdW0nLCBz ZWxmLnBhdGhfZnJvbV9jaHJvbWl1bV9iYXNlKCdidWlsZCcpKSkKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fdW5pdHRlc3QucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3VuaXR0 ZXN0LnB5CmluZGV4IDgwNzQzMGVlNDY2M2Q3ZmNlNmFlNGNmMzA0ZmY1OTc5MDE3ZWVmOTIuLmE3 MjA0ODlkNzE0NmU4YTQzNjdmODJlNjNiYzc5MjQxY2I3YTgyNjMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fdW5pdHRlc3QucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91 bml0dGVzdC5weQpAQCAtMjQ0LDIyICsyNDQsNiBAQCBjbGFzcyBDaHJvbWl1bVBvcnRUZXN0KHBv cnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKENocm9t aXVtUG9ydFRlc3QuVGVzdE1hY1BvcnQoKS5fcGF0aF90b19pbWFnZV9kaWZmKCkuZW5kc3dpdGgo Jy94Y29kZWJ1aWxkL2RlZmF1bHQvSW1hZ2VEaWZmJykpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1 ZShDaHJvbWl1bVBvcnRUZXN0LlRlc3RXaW5Qb3J0KCkuX3BhdGhfdG9faW1hZ2VfZGlmZigpLmVu ZHN3aXRoKCcvZGVmYXVsdC9JbWFnZURpZmYuZXhlJykpCiAKLSAgICBkZWYgdGVzdF9za2lwcGVk X2xheW91dF90ZXN0cyhzZWxmKToKLSAgICAgICAgbW9ja19vcHRpb25zID0gTW9ja09wdGlvbnMo KQotICAgICAgICBtb2NrX29wdGlvbnMuY29uZmlndXJhdGlvbiA9ICdyZWxlYXNlJwotICAgICAg ICBwb3J0ID0gQ2hyb21pdW1Qb3J0VGVzdC5UZXN0TGludXhQb3J0KG9wdGlvbnM9bW9ja19vcHRp b25zKQotCi0gICAgICAgIGZha2VfdGVzdCA9ICdmYXN0L2pzL25vdC1nb29kLmpzJwotCi0gICAg ICAgIHBvcnQudGVzdF9leHBlY3RhdGlvbnMgPSBsYW1iZGE6ICIiIkJVR19URVNUIFNLSVAgOiBm YXN0L2pzL25vdC1nb29kLmpzID0gVEVYVAotTElOVVggV0lOIDogZmFzdC9qcy92ZXJ5LWdvb2Qu anMgPSBUSU1FT1VUIFBBU1MiIiIKLSAgICAgICAgcG9ydC50ZXN0X2V4cGVjdGF0aW9uc19vdmVy cmlkZXMgPSBsYW1iZGE6ICcnCi0gICAgICAgIHBvcnQudGVzdHMgPSBsYW1iZGEgcGF0aHM6IHNl dCgpCi0gICAgICAgIHBvcnQudGVzdF9leGlzdHMgPSBsYW1iZGEgdGVzdDogVHJ1ZQotCi0gICAg ICAgIHNraXBwZWRfdGVzdHMgPSBwb3J0LnNraXBwZWRfbGF5b3V0X3Rlc3RzKGV4dHJhX3Rlc3Rf ZmlsZXM9W2Zha2VfdGVzdCwgXSkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCJmYXN0L2pzL25v dC1nb29kLmpzIiBpbiBza2lwcGVkX3Rlc3RzKQotCiAgICAgZGVmIHRlc3RfZGVmYXVsdF9jb25m aWd1cmF0aW9uKHNlbGYpOgogICAgICAgICBtb2NrX29wdGlvbnMgPSBNb2NrT3B0aW9ucygpCiAg ICAgICAgIHBvcnQgPSBDaHJvbWl1bVBvcnRUZXN0LlRlc3RMaW51eFBvcnQob3B0aW9ucz1tb2Nr X29wdGlvbnMpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3dlYmtpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvd2Via2l0LnB5CmluZGV4IDg3ZmE1ZDlkODY5NTFkZWZlNDU5NTBkMjNlNjAyMDk0ZjdjNjIx OTIuLjUxMTAxZWMzNDEyYTc2NDkxZTY5ZmVmZGFjYjJmMjJmMTM5N2Q5MDUgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CkBAIC0z NTcsMTUgKzM1NywxMSBAQCBjbGFzcyBXZWJLaXRQb3J0KFBvcnQpOgogICAgICAgICByZXR1cm4g ZXhwZWN0YXRpb25zCiAKICAgICBkZWYgc2tpcHBlZF9sYXlvdXRfdGVzdHMoc2VsZiwgdGVzdF9s aXN0KToKLSAgICAgICAgIyBVc2UgYSBzZXQgdG8gYWxsb3cgZHVwbGljYXRlcwogICAgICAgICB0 ZXN0c190b19za2lwID0gc2V0KHNlbGYuX2V4cGVjdGF0aW9uc19mcm9tX3NraXBwZWRfZmlsZXMo c2VsZi5fc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocygpKSkKICAgICAgICAgdGVzdHNfdG9fc2tp cC51cGRhdGUoc2VsZi5fdGVzdHNfZm9yX290aGVyX3BsYXRmb3JtcygpKQogICAgICAgICB0ZXN0 c190b19za2lwLnVwZGF0ZShzZWxmLl9za2lwcGVkX3Rlc3RzX2Zvcl91bnN1cHBvcnRlZF9mZWF0 dXJlcyh0ZXN0X2xpc3QpKQogICAgICAgICByZXR1cm4gdGVzdHNfdG9fc2tpcAogCi0gICAgZGVm IHNraXBwZWRfdGVzdHMoc2VsZiwgdGVzdF9saXN0KToKLSAgICAgICAgcmV0dXJuIHNlbGYuc2tp cHBlZF9sYXlvdXRfdGVzdHModGVzdF9saXN0KQotCiAgICAgZGVmIF9idWlsZF9wYXRoKHNlbGYs ICpjb21wcyk6CiAgICAgICAgICMgLS1yb290IGlzIHVzZWQgZm9yIHJ1bm5pbmcgd2l0aCBhIHBy ZS1idWlsdCByb290IChsaWtlIGZyb20gYSBuaWdodGx5IHppcCkuCiAgICAgICAgIGJ1aWxkX2Rp cmVjdG9yeSA9IHNlbGYuZ2V0X29wdGlvbigncm9vdCcpIG9yIHNlbGYuZ2V0X29wdGlvbignYnVp bGRfZGlyZWN0b3J5JykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9j b21tYW5kcy9xdWVyaWVzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRz L3F1ZXJpZXMucHkKaW5kZXggNzUxMWE0YTA4ZGNiNzEzNWUyNzY5MzYzYjUzZTg0YzU3ZDdlNzMx NC4uMTk0N2M4NDIzZjliNjc5NDA3NGYwODA0YjhlY2UxZTRmMWI3Nzk4ZiAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXJpZXMucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXJpZXMucHkKQEAgLTM4MCwyOCAr MzgwLDYgQEAgYW5kIFBJRCBhbmQgcHJpbnRzIGl0IHRvIHN0ZG91dC4iIiIKICAgICAgICAgcHJp bnQgY3Jhc2hfbG9ncy5maW5kX25ld2VzdF9sb2coYXJnc1swXSwgcGlkKQogCiAKLWNsYXNzIFNr aXBwZWRQb3J0cyhBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6Ci0gICAgbmFtZSA9ICJza2lw cGVkLXBvcnRzIgotICAgIGhlbHBfdGV4dCA9ICJQcmludCB0aGUgbGlzdCBvZiBwb3J0cyBza2lw cGluZyB0aGUgZ2l2ZW4gbGF5b3V0IHRlc3QocykiCi0gICAgbG9uZ19oZWxwID0gIiIiU2NhbnMg dGhlIHRoZSBTa2lwcGVkIGZpbGUgb2YgZWFjaCBwb3J0IGFuZCBmaWd1cmUKLW91dCB3aGF0IHBv cnRzIGFyZSBza2lwcGluZyB0aGUgdGVzdChzKS4gQ2F0ZWdvcmllcyBhcmUgdGFrZW4gaW4gYWNj b3VudCB0b28uIiIiCi0gICAgYXJndW1lbnRfbmFtZXMgPSAiVEVTVF9OQU1FIgotCi0gICAgZGVm IGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6Ci0gICAgICAgIHJlc3VsdHMgPSBk aWN0KFsodGVzdF9uYW1lLCBbXSkgZm9yIHRlc3RfbmFtZSBpbiBhcmdzXSkKLSAgICAgICAgZm9y IHBvcnRfbmFtZSBpbiB0b29sLnBvcnRfZmFjdG9yeS5hbGxfcG9ydF9uYW1lcygpOgotICAgICAg ICAgICAgcG9ydF9vYmplY3QgPSB0b29sLnBvcnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lKQotICAg ICAgICAgICAgZm9yIHRlc3RfbmFtZSBpbiBhcmdzOgotICAgICAgICAgICAgICAgIGlmIHBvcnRf b2JqZWN0LnNraXBzX2xheW91dF90ZXN0KHRlc3RfbmFtZSk6Ci0gICAgICAgICAgICAgICAgICAg IHJlc3VsdHNbdGVzdF9uYW1lXS5hcHBlbmQocG9ydF9uYW1lKQotCi0gICAgICAgIGZvciB0ZXN0 X25hbWUsIHBvcnRzIGluIHJlc3VsdHMuaXRlcml0ZW1zKCk6Ci0gICAgICAgICAgICBpZiBwb3J0 czoKLSAgICAgICAgICAgICAgICBwcmludCAiUG9ydHMgc2tpcHBpbmcgdGVzdCAlcjogJXMiICUg KHRlc3RfbmFtZSwgJywgJy5qb2luKHBvcnRzKSkKLSAgICAgICAgICAgIGVsc2U6Ci0gICAgICAg ICAgICAgICAgcHJpbnQgIlRlc3QgJXIgaXMgbm90IHNraXBwZWQgYnkgYW55IHBvcnQuIiAlIHRl c3RfbmFtZQotCi0KIGNsYXNzIFByaW50RXhwZWN0YXRpb25zKEFic3RyYWN0RGVjbGFyYXRpdmVD b21tYW5kKToKICAgICBuYW1lID0gJ3ByaW50LWV4cGVjdGF0aW9ucycKICAgICBoZWxwX3RleHQg PSAnUHJpbnQgdGhlIGV4cGVjdGVkIHJlc3VsdCBmb3IgdGhlIGdpdmVuIHRlc3Qocykgb24gdGhl IGdpdmVuIHBvcnQocyknCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvcXVlcmllc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9jb21tYW5kcy9xdWVyaWVzX3VuaXR0ZXN0LnB5CmluZGV4IGFjNGI4ZmM3OTc4ZDlmYzM5ZGI3 ZWNkMWE2MzVhMjdmZGZlOGI4ZTUuLjBmYjU5YTg1M2UxYzVmYjU2MDIxYzIyYzgyYTIzMjI2OGZl NDEzNjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9x dWVyaWVzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9xdWVyaWVzX3VuaXR0ZXN0LnB5CkBAIC05MSwxOSArOTEsNiBAQCBjbGFzcyBRdWVyeUNv bW1hbmRzVGVzdChDb21tYW5kc1Rlc3QpOgogICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAib2sg ICA6IEJ1aWxkZXIxXG5vayAgIDogQnVpbGRlcjJcbiIKICAgICAgICAgc2VsZi5hc3NlcnRfZXhl Y3V0ZV9vdXRwdXRzKFRyZWVTdGF0dXMoKSwgTm9uZSwgZXhwZWN0ZWRfc3Rkb3V0KQogCi0gICAg ZGVmIHRlc3Rfc2tpcHBlZF9wb3J0cyhzZWxmKToKLSAgICAgICAgdG9vbCA9IE1vY2tUb29sKCkK LSAgICAgICAgdG9vbC5wb3J0X2ZhY3RvcnkgPSBNb2NrUG9ydEZhY3RvcnkoKQotCi0gICAgICAg IGV4cGVjdGVkX3N0ZG91dCA9ICJQb3J0cyBza2lwcGluZyB0ZXN0ICdtZWRpYS9mb28vYmFyLmh0 bWwnOiB0ZXN0X3BvcnQxLCB0ZXN0X3BvcnQyXG4iCi0gICAgICAgIHNlbGYuYXNzZXJ0X2V4ZWN1 dGVfb3V0cHV0cyhTa2lwcGVkUG9ydHMoKSwgKCJtZWRpYS9mb28vYmFyLmh0bWwiLCksIGV4cGVj dGVkX3N0ZG91dCwgdG9vbD10b29sKQotCi0gICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJQb3J0 cyBza2lwcGluZyB0ZXN0ICdmb28nOiB0ZXN0X3BvcnQxXG4iCi0gICAgICAgIHNlbGYuYXNzZXJ0 X2V4ZWN1dGVfb3V0cHV0cyhTa2lwcGVkUG9ydHMoKSwgKCJmb28iLCksIGV4cGVjdGVkX3N0ZG91 dCwgdG9vbD10b29sKQotCi0gICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJUZXN0ICdtZWRpYScg aXMgbm90IHNraXBwZWQgYnkgYW55IHBvcnQuXG4iCi0gICAgICAgIHNlbGYuYXNzZXJ0X2V4ZWN1 dGVfb3V0cHV0cyhTa2lwcGVkUG9ydHMoKSwgKCJtZWRpYSIsKSwgZXhwZWN0ZWRfc3Rkb3V0LCB0 b29sPXRvb2wpCi0KIAogY2xhc3MgRmFpbHVyZVJlYXNvblRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgIGRlZiB0ZXN0X2JsYW1lX2xpbmVfZm9yX3JldmlzaW9uKHNlbGYpOgo=