37482 2010-04-12 20:19:40 -0700 new-run-webkit-tests should only build java support files on Mac 2010-04-12 21:00:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth aroben dpranke oldest_to_newest 211822 0 eric 2010-04-12 20:19:40 -0700 new-run-webkit-tests should only build java support files on Mac 211824 1 53216 eric 2010-04-12 20:21:54 -0700 Created attachment 53216 Patch 211829 2 53218 eric 2010-04-12 20:53:26 -0700 Created attachment 53218 Patch 211830 3 53218 abarth 2010-04-12 20:57:24 -0700 Comment on attachment 53218 Patch I'd remove the redundant comment. Yay for patches where the minus lines outnumber the plus lines. 211831 4 eric 2010-04-12 21:00:56 -0700 Committed r57499: <http://trac.webkit.org/changeset/57499> 53216 2010-04-12 20:21:54 -0700 2010-04-12 20:53:22 -0700 Patch bug-37482-20100412202152.patch text/plain 3706 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjNTVlMmMyLi5jYTRjZDJiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTAtMDQt MTIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3RzIHNob3VsZCBv bmx5IGJ1aWxkIGphdmEgc3VwcG9ydCBmaWxlcyBvbiBNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3NDgyCisKKyAgICAgICAgQWRkZWQgYSBuZXcg X2NoZWNrX3BvcnRfYnVpbGQgbWV0aG9kIGFuZCB1c2VkIGl0CisgICAgICAgIHRvIGFsbG93IHRo ZSBNYWMgcG9ydCB0byBob29vayBpbnRvIGNoZWNrX2J1aWxkIHRvIGJ1aWxkIEphdmEuCisgICAg ICAgIEkgYWxzbyBtYWRlIGNoZWNrX2J1aWxkIG9ubHkgY2FsbCBjaGVja19pbWFnZV9kaWZmIHdo ZW4gcGl4ZWwKKyAgICAgICAgdGVzdHMgYXJlIGVuYWJsZWQuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weToKKworMjAxMC0wNC0xMiAgRXJpYyBT ZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKICAgICAgICAgVW5yZXZpZXdlZC4KIAogICAgICAg ICBBZGQgc3R1YiBHdGsgaW1wbGVtZW50YXRpb24gZm9yIG5ldy1ydW4td2Via2l0LXRlc3RzLgpk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9tYWMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L21hYy5weQppbmRleCAyMTg4ZGFiLi4xMjNkODBhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQpAQCAtMTA2LDYgKzEw NiwxOCBAQCBjbGFzcyBNYWNQb3J0KFdlYktpdFBvcnQpOgogICAgICAgICAgICAgcmV0dXJuICct c25vd2xlb3BhcmQnCiAgICAgICAgIHJldHVybiAnJwogCisgICAgZGVmIF9idWlsZF9qYXZhX3Rl c3Rfc3VwcG9ydChzZWxmKToKKyAgICAgICAgamF2YV90ZXN0c19wYXRoID0gb3MucGF0aC5qb2lu KHNlbGYubGF5b3V0X3Rlc3RzX2RpcigpLCAiamF2YSIpCisgICAgICAgIGJ1aWxkX2phdmEgPSBb Ii91c3IvYmluL21ha2UiLCAiLUMiLCBqYXZhX3Rlc3RzX3BhdGhdCisgICAgICAgIGlmIHNlbGYu X2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChidWlsZF9qYXZhLCByZXR1cm5fZXhpdF9jb2RlPVRydWUp OgorICAgICAgICAgICAgX2xvZy5lcnJvcigiRmFpbGVkIHRvIGJ1aWxkIEphdmEgc3VwcG9ydCBm aWxlczogJXMiICUgYnVpbGRfamF2YSkKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorICAgICAg ICByZXR1cm4gVHJ1ZQorCisgICAgZGVmIF9jaGVja19wb3J0X2J1aWxkKHNlbGYpOgorICAgICAg ICAjIFBvcnRzIGNhbiBvdmVycmlkZSB0aGlzIG1ldGhvZCB0byBkbyBhZGRpdGlvbmFsIGNoZWNr cy4KKyAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX2phdmFfdGVzdF9zdXBwb3J0KCkKKwogICAg IGRlZiBfdGVzdHNfZm9yX290aGVyX3BsYXRmb3JtcyhzZWxmKToKICAgICAgICAgIyBUaGUgb3Jp Z2luYWwgcnVuLXdlYmtpdC10ZXN0cyBidWlsZHMgdXAgYSAid2hpdGVsaXN0IiBvZiB0ZXN0cyB0 bwogICAgICAgICAjIHJ1biwgYW5kIHBhc3NlcyB0aGF0IHRvIER1bXBSZW5kZXJUcmVlLiBuZXct cnVuLXdlYmtpdC10ZXN0cyBhc3N1bWVzCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weSBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CmluZGV4IGRkOGQxODAuLjAz YmI1MDQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvd2Via2l0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CkBAIC03NywxNCArNzcsNiBAQCBjbGFzcyBXZWJLaXRQ b3J0KGJhc2UuUG9ydCk6CiAgICAgICAgICAgICBzZWxmLmZsYWdfZnJvbV9jb25maWd1cmF0aW9u KHNlbGYuX29wdGlvbnMuY29uZmlndXJhdGlvbiksCiAgICAgICAgIF0sIHJldHVybl9leGl0X2Nv ZGU9VHJ1ZSkKIAotICAgIGRlZiBfYnVpbGRfamF2YShzZWxmKToKLSAgICAgICAgamF2YV90ZXN0 c19wYXRoID0gb3MucGF0aC5qb2luKHNlbGYubGF5b3V0X3Rlc3RzX2RpcigpLCAiamF2YSIpCi0g ICAgICAgIGJ1aWxkX2phdmEgPSBbIi91c3IvYmluL21ha2UiLCAiLUMiLCBqYXZhX3Rlc3RzX3Bh dGhdCi0gICAgICAgIGlmIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChidWlsZF9qYXZhLCBy ZXR1cm5fZXhpdF9jb2RlPVRydWUpOgotICAgICAgICAgICAgX2xvZy5lcnJvcigiRmFpbGVkIHRv IGJ1aWxkIEphdmEgc3VwcG9ydCBmaWxlczogJXMiICUgYnVpbGRfamF2YSkKLSAgICAgICAgICAg IHJldHVybiBGYWxzZQotICAgICAgICByZXR1cm4gVHJ1ZQotCiAgICAgZGVmIF9jaGVja19kcml2 ZXIoc2VsZik6CiAgICAgICAgIGRyaXZlcl9wYXRoID0gc2VsZi5fcGF0aF90b19kcml2ZXIoKQog ICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoZHJpdmVyX3BhdGgpOgpAQCAtOTUsMTQgKzg3 LDE5IEBAIGNsYXNzIFdlYktpdFBvcnQoYmFzZS5Qb3J0KToKICAgICBkZWYgY2hlY2tfYnVpbGQo c2VsZiwgbmVlZHNfaHR0cCk6CiAgICAgICAgIGlmIG5vdCBzZWxmLl9idWlsZF9kcml2ZXIoKToK ICAgICAgICAgICAgIHJldHVybiBGYWxzZQotICAgICAgICBpZiBub3Qgc2VsZi5jaGVja19pbWFn ZV9kaWZmKCk6Ci0gICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgaWYgbm90IHNlbGYu X2NoZWNrX2RyaXZlcigpOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCi0gICAgICAgIGlmIG5v dCBzZWxmLl9idWlsZF9qYXZhKCk6CisgICAgICAgIGlmIHNlbGYuX29wdGlvbnMucGl4ZWxfdGVz dHM6CisgICAgICAgICAgICBpZiBub3Qgc2VsZi5jaGVja19pbWFnZV9kaWZmKCk6CisgICAgICAg ICAgICAgICAgcmV0dXJuIEZhbHNlCisgICAgICAgIGlmIG5vdCBzZWxmLl9jaGVja19wb3J0X2J1 aWxkKCk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgcmV0dXJuIFRydWUKIAor ICAgIGRlZiBfY2hlY2tfcG9ydF9idWlsZChzZWxmKToKKyAgICAgICAgIyBQb3J0cyBjYW4gb3Zl cnJpZGUgdGhpcyBtZXRob2QgdG8gZG8gYWRkaXRpb25hbCBjaGVja3MuCisgICAgICAgIHBhc3MK KwogICAgIGRlZiBjaGVja19pbWFnZV9kaWZmKHNlbGYsIG92ZXJyaWRlX3N0ZXA9Tm9uZSwgbG9n Z2luZz1UcnVlKToKICAgICAgICAgaW1hZ2VfZGlmZl9wYXRoID0gc2VsZi5fcGF0aF90b19pbWFn ZV9kaWZmKCkKICAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKGltYWdlX2RpZmZfcGF0aCk6 Cg== 53218 2010-04-12 20:53:26 -0700 2010-04-12 20:57:23 -0700 Patch bug-37482-20100412205324.patch text/plain 11483 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyNzYzMzc2Li4xMThhY2ZjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDQt MTIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3RzIHNob3VsZCBv bmx5IGJ1aWxkIGphdmEgc3VwcG9ydCBmaWxlcyBvbiBNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3NDgyCisKKyAgICAgICAgT25seSB0aGUgbWFj IG5lZWRzIGphdmEgc3VwcG9ydCBmaWxlcywgc28gSSBwdXNoZWQgX2J1aWxkX2phdmEKKyAgICAg ICAgZG93biBpbnRvIHRoZSBNYWMgcG9ydCB1c2luZyBhIG5ldyBob29rICJfY2hlY2tfcG9ydF9i dWlsZCIuCisgICAgICAgIEluIHRoZSBwcm9jZXNzIEkgbm90aWNlZCBhIGJ1bmNoIG9mIGNvZGUg d2hpY2ggY291bGQgYmUgc2hhcmVkCisgICAgICAgIGJldHdlZW4gYWxsIHBvcnRzIGFuZCB0aHVz IGdvdCByaWQgb2YgX3Rlc3RzX2Zvcl9kaXNhYmxlZF9mZWF0dXJlcworICAgICAgICBhbmQgdmVy c2lvbigpIGNvcHkvcGFzdGUgYmV0d2VlbiBhbGwgd2Via2l0IHBvcnRzLgorICAgICAgICBJIGFs c28gbWFkZSBjaGVja19idWlsZCBvbmx5IGJvdGhlciB0byBjaGVjayBmb3IgSW1hZ2VEaWZmIGlm IHdlJ3JlCisgICAgICAgIHVzaW5nIHBpeGVsIHRlc3RzLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3dpbi5weToKKwogMjAxMC0wNC0xMiAgRHVtaXRydSBEYW5pbGl1YyAg PGR1bWlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHRyeWluZyB0byBtYWtl IHNjcmlwdHMgd29yayBvbiBtYWNoaW5lcyB3aXRob3V0CmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weSBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5CmluZGV4IDE4ZmViNWIu LmRlNWUyOGEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvZ3RrLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5CkBAIC00NSw5ICs0NSw2IEBAIGNsYXNzIEd0a1BvcnQoV2Vi S2l0UG9ydCk6CiAgICAgICAgICAgICBwb3J0X25hbWUgPSAnZ3RrJwogICAgICAgICBXZWJLaXRQ b3J0Ll9faW5pdF9fKHNlbGYsIHBvcnRfbmFtZSwgb3B0aW9ucykKIAotICAgIGRlZiB2ZXJzaW9u KHNlbGYpOgotICAgICAgICByZXR1cm4gJycKLQogICAgIGRlZiBfdGVzdHNfZm9yX290aGVyX3Bs YXRmb3JtcyhzZWxmKToKICAgICAgICAgIyBGSVhNRTogVGhpcyBsaXN0IGNvdWxkIGJlIGR5bmFt aWMgYmFzZWQgb24gcGxhdGZvcm0gbmFtZSBhbmQKICAgICAgICAgIyBwdXNoZWQgaW50byBiYXNl LlBvcnQuCkBAIC01OSwzMCArNTYsNiBAQCBjbGFzcyBHdGtQb3J0KFdlYktpdFBvcnQpOgogICAg ICAgICAgICAgInBsYXRmb3JtL21hYyIsCiAgICAgICAgIF0KIAotICAgICMgRklYTUU6IFZhbGlk YXRlIHRoaXMgbGlzdC4KLSAgICBkZWYgX3Rlc3RzX2Zvcl9kaXNhYmxlZF9mZWF0dXJlcyhzZWxm KToKLSAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQgdXNlIHRoZSBmZWF0dXJlIGRldGVjdGlv biBmcm9tCi0gICAgICAgICMgd2Via2l0cGVybC9mZWF0dXJlcy5wbSB0byBtYXRjaCBydW4td2Vi a2l0LXRlc3RzLgotICAgICAgICAjIEZvciBub3cgd2UgaGFyZC1jb2RlIGEgbGlzdCBvZiBmZWF0 dXJlcyBrbm93biB0byBiZSBkaXNhYmxlZCBvbgotICAgICAgICAjIHRoZSBXaW4gcGxhdGZvcm0u Ci0gICAgICAgIGRpc2FibGVkX2ZlYXR1cmVfdGVzdHMgPSBbCi0gICAgICAgICAgICAiZmFzdC94 aHRtbG1wIiwKLSAgICAgICAgICAgICJodHRwL3Rlc3RzL3dtbCIsCi0gICAgICAgICAgICAibWF0 aG1sIiwKLSAgICAgICAgICAgICJ3bWwiLAotICAgICAgICBdCi0gICAgICAgICMgRklYTUU6IHdl YmFyY2hpdmUgdGVzdHMgZXhwZWN0IHRvIHJlYWQtd3JpdGUgZnJvbQotICAgICAgICAjIC1leHBl Y3RlZC53ZWJhcmNoaXZlIGZpbGVzIGluc3RlYWQgb2YgLnR4dCBmaWxlcy4KLSAgICAgICAgIyBU aGlzIHNjcmlwdCBkb2Vzbid0IGtub3cgaG93IHRvIGRvIHRoYXQgeWV0LCBzbyBwcmV0ZW5kIHRo ZXkncmUKLSAgICAgICAgIyBqdXN0ICJkaXNhYmxlZCIuCi0gICAgICAgIHdlYmFyY2hpdmVfdGVz dHMgPSBbCi0gICAgICAgICAgICAid2ViYXJjaGl2ZSIsCi0gICAgICAgICAgICAic3ZnL3dlYmFy Y2hpdmUiLAotICAgICAgICAgICAgImh0dHAvdGVzdHMvd2ViYXJjaGl2ZSIsCi0gICAgICAgICAg ICAic3ZnL2N1c3RvbS9pbWFnZS13aXRoLXByZWZpeC1pbi13ZWJhcmNoaXZlLnN2ZyIsCi0gICAg ICAgIF0KLSAgICAgICAgcmV0dXJuIGRpc2FibGVkX2ZlYXR1cmVfdGVzdHMgKyB3ZWJhcmNoaXZl X3Rlc3RzCi0KICAgICBkZWYgX3BhdGhfdG9fYXBhY2hlX2NvbmZpZ19maWxlKHNlbGYpOgogICAg ICAgICAjIEZJWE1FOiBUaGlzIG5lZWRzIHRvIGRldGVjdCB0aGUgZGlzdHJpYnV0aW9uIGFuZCBj aGFuZ2UgY29uZmlnIGZpbGVzLgogICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNlbGYubGF5 b3V0X3Rlc3RzX2RpcigpLCAnaHR0cCcsICdjb25mJywKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5IGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKaW5kZXggMjE4OGRhYi4u MDg4MDExNSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9tYWMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9tYWMucHkKQEAgLTEwNiw2ICsxMDYsMTggQEAgY2xhc3MgTWFjUG9ydChX ZWJLaXRQb3J0KToKICAgICAgICAgICAgIHJldHVybiAnLXNub3dsZW9wYXJkJwogICAgICAgICBy ZXR1cm4gJycKIAorICAgIGRlZiBfYnVpbGRfamF2YV90ZXN0X3N1cHBvcnQoc2VsZik6CisgICAg ICAgIGphdmFfdGVzdHNfcGF0aCA9IG9zLnBhdGguam9pbihzZWxmLmxheW91dF90ZXN0c19kaXIo KSwgImphdmEiKQorICAgICAgICBidWlsZF9qYXZhID0gWyIvdXNyL2Jpbi9tYWtlIiwgIi1DIiwg amF2YV90ZXN0c19wYXRoXQorICAgICAgICBpZiBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQo YnVpbGRfamF2YSwgcmV0dXJuX2V4aXRfY29kZT1UcnVlKToKKyAgICAgICAgICAgIF9sb2cuZXJy b3IoIkZhaWxlZCB0byBidWlsZCBKYXZhIHN1cHBvcnQgZmlsZXM6ICVzIiAlIGJ1aWxkX2phdmEp CisgICAgICAgICAgICByZXR1cm4gRmFsc2UKKyAgICAgICAgcmV0dXJuIFRydWUKKworICAgIGRl ZiBfY2hlY2tfcG9ydF9idWlsZChzZWxmKToKKyAgICAgICAgIyBQb3J0cyBjYW4gb3ZlcnJpZGUg dGhpcyBtZXRob2QgdG8gZG8gYWRkaXRpb25hbCBjaGVja3MuCisgICAgICAgIHJldHVybiBzZWxm Ll9idWlsZF9qYXZhX3Rlc3Rfc3VwcG9ydCgpCisKICAgICBkZWYgX3Rlc3RzX2Zvcl9vdGhlcl9w bGF0Zm9ybXMoc2VsZik6CiAgICAgICAgICMgVGhlIG9yaWdpbmFsIHJ1bi13ZWJraXQtdGVzdHMg YnVpbGRzIHVwIGEgIndoaXRlbGlzdCIgb2YgdGVzdHMgdG8KICAgICAgICAgIyBydW4sIGFuZCBw YXNzZXMgdGhhdCB0byBEdW1wUmVuZGVyVHJlZS4gbmV3LXJ1bi13ZWJraXQtdGVzdHMgYXNzdW1l cwpAQCAtMTIwLDI5ICsxMzIsNiBAQCBjbGFzcyBNYWNQb3J0KFdlYktpdFBvcnQpOgogICAgICAg ICAgICAgInBsYXRmb3JtL3dpbiIsCiAgICAgICAgIF0KIAotICAgIGRlZiBfdGVzdHNfZm9yX2Rp c2FibGVkX2ZlYXR1cmVzKHNlbGYpOgotICAgICAgICAjIEZJWE1FOiBUaGlzIHNob3VsZCB1c2Ug dGhlIGZlYXR1cmUgZGV0ZWN0aW9uIGZyb20KLSAgICAgICAgIyB3ZWJraXRwZXJsL2ZlYXR1cmVz LnBtIHRvIG1hdGNoIHJ1bi13ZWJraXQtdGVzdHMuCi0gICAgICAgICMgRm9yIG5vdyB3ZSBoYXJk LWNvZGUgYSBsaXN0IG9mIGZlYXR1cmVzIGtub3duIHRvIGJlIGRpc2FibGVkIG9uCi0gICAgICAg ICMgdGhlIE1hYyBwbGF0Zm9ybS4KLSAgICAgICAgZGlzYWJsZWRfZmVhdHVyZV90ZXN0cyA9IFsK LSAgICAgICAgICAgICJmYXN0L3hodG1sbXAiLAotICAgICAgICAgICAgImh0dHAvdGVzdHMvd21s IiwKLSAgICAgICAgICAgICJtYXRobWwiLAotICAgICAgICAgICAgIndtbCIsCi0gICAgICAgIF0K LSAgICAgICAgIyBGSVhNRTogd2ViYXJjaGl2ZSB0ZXN0cyBleHBlY3QgdG8gcmVhZC13cml0ZSBm cm9tCi0gICAgICAgICMgLWV4cGVjdGVkLndlYmFyY2hpdmUgZmlsZXMgaW5zdGVhZCBvZiAudHh0 IGZpbGVzLgotICAgICAgICAjIFRoaXMgc2NyaXB0IGRvZXNuJ3Qga25vdyBob3cgdG8gZG8gdGhh dCB5ZXQsIHNvIHByZXRlbmQgdGhleSdyZQotICAgICAgICAjIGp1c3QgImRpc2FibGVkIi4KLSAg ICAgICAgd2ViYXJjaGl2ZV90ZXN0cyA9IFsKLSAgICAgICAgICAgICJ3ZWJhcmNoaXZlIiwKLSAg ICAgICAgICAgICJzdmcvd2ViYXJjaGl2ZSIsCi0gICAgICAgICAgICAiaHR0cC90ZXN0cy93ZWJh cmNoaXZlIiwKLSAgICAgICAgICAgICJzdmcvY3VzdG9tL2ltYWdlLXdpdGgtcHJlZml4LWluLXdl YmFyY2hpdmUuc3ZnIiwKLSAgICAgICAgXQotICAgICAgICByZXR1cm4gZGlzYWJsZWRfZmVhdHVy ZV90ZXN0cyArIHdlYmFyY2hpdmVfdGVzdHMKLQogICAgICMgRklYTUU6IFRoaXMgZG9lc24ndCBo YXZlIGFueXRoaW5nIHRvIGRvIHdpdGggV2ViS2l0LgogICAgIGRlZiBfa2lsbF9hbGxfcHJvY2Vz cyhzZWxmLCBwcm9jZXNzX25hbWUpOgogICAgICAgICAjIE9uIE1hYyBPUyBYIDEwLjYsIGtpbGxh bGwgaGFzIGEgbmV3IGNvbnN0cmFpbnQ6IC1TSUdOQUxOQU1FIG9yCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQppbmRleCBlZWRi ZjQzLi44OWEzNWU4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3F0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKQEAgLTQ1LDkgKzQ1LDYgQEAgY2xhc3MgUXRQb3J0KFdl YktpdFBvcnQpOgogICAgICAgICAgICAgcG9ydF9uYW1lID0gJ3F0JwogICAgICAgICBXZWJLaXRQ b3J0Ll9faW5pdF9fKHNlbGYsIHBvcnRfbmFtZSwgb3B0aW9ucykKIAotICAgIGRlZiB2ZXJzaW9u KHNlbGYpOgotICAgICAgICByZXR1cm4gJycKLQogICAgIGRlZiBfdGVzdHNfZm9yX290aGVyX3Bs YXRmb3JtcyhzZWxmKToKICAgICAgICAgIyBGSVhNRTogVGhpcyBsaXN0IGNvdWxkIGJlIGR5bmFt aWMgYmFzZWQgb24gcGxhdGZvcm0gbmFtZSBhbmQKICAgICAgICAgIyBwdXNoZWQgaW50byBiYXNl LlBvcnQuCkBAIC01OSwzMCArNTYsNiBAQCBjbGFzcyBRdFBvcnQoV2ViS2l0UG9ydCk6CiAgICAg ICAgICAgICAicGxhdGZvcm0vbWFjIiwKICAgICAgICAgXQogCi0gICAgIyBGSVhNRTogVmFsaWRh dGUgdGhpcyBsaXN0LgotICAgIGRlZiBfdGVzdHNfZm9yX2Rpc2FibGVkX2ZlYXR1cmVzKHNlbGYp OgotICAgICAgICAjIEZJWE1FOiBUaGlzIHNob3VsZCB1c2UgdGhlIGZlYXR1cmUgZGV0ZWN0aW9u IGZyb20KLSAgICAgICAgIyB3ZWJraXRwZXJsL2ZlYXR1cmVzLnBtIHRvIG1hdGNoIHJ1bi13ZWJr aXQtdGVzdHMuCi0gICAgICAgICMgRm9yIG5vdyB3ZSBoYXJkLWNvZGUgYSBsaXN0IG9mIGZlYXR1 cmVzIGtub3duIHRvIGJlIGRpc2FibGVkIG9uCi0gICAgICAgICMgdGhlIFF0IHBsYXRmb3JtLgot ICAgICAgICBkaXNhYmxlZF9mZWF0dXJlX3Rlc3RzID0gWwotICAgICAgICAgICAgImZhc3QveGh0 bWxtcCIsCi0gICAgICAgICAgICAiaHR0cC90ZXN0cy93bWwiLAotICAgICAgICAgICAgIm1hdGht bCIsCi0gICAgICAgICAgICAid21sIiwKLSAgICAgICAgXQotICAgICAgICAjIEZJWE1FOiB3ZWJh cmNoaXZlIHRlc3RzIGV4cGVjdCB0byByZWFkLXdyaXRlIGZyb20KLSAgICAgICAgIyAtZXhwZWN0 ZWQud2ViYXJjaGl2ZSBmaWxlcyBpbnN0ZWFkIG9mIC50eHQgZmlsZXMuCi0gICAgICAgICMgVGhp cyBzY3JpcHQgZG9lc24ndCBrbm93IGhvdyB0byBkbyB0aGF0IHlldCwgc28gcHJldGVuZCB0aGV5 J3JlCi0gICAgICAgICMganVzdCAiZGlzYWJsZWQiLgotICAgICAgICB3ZWJhcmNoaXZlX3Rlc3Rz ID0gWwotICAgICAgICAgICAgIndlYmFyY2hpdmUiLAotICAgICAgICAgICAgInN2Zy93ZWJhcmNo aXZlIiwKLSAgICAgICAgICAgICJodHRwL3Rlc3RzL3dlYmFyY2hpdmUiLAotICAgICAgICAgICAg InN2Zy9jdXN0b20vaW1hZ2Utd2l0aC1wcmVmaXgtaW4td2ViYXJjaGl2ZS5zdmciLAotICAgICAg ICBdCi0gICAgICAgIHJldHVybiBkaXNhYmxlZF9mZWF0dXJlX3Rlc3RzICsgd2ViYXJjaGl2ZV90 ZXN0cwotCiAgICAgZGVmIF9wYXRoX3RvX2FwYWNoZV9jb25maWdfZmlsZShzZWxmKToKICAgICAg ICAgIyBGSVhNRTogVGhpcyBuZWVkcyB0byBkZXRlY3QgdGhlIGRpc3RyaWJ1dGlvbiBhbmQgY2hh bmdlIGNvbmZpZyBmaWxlcy4KICAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbihzZWxmLmxheW91 dF90ZXN0c19kaXIoKSwgJ2h0dHAnLCAnY29uZicsCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weSBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CmluZGV4IGRkOGQx ODAuLjgxNDgwOGUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CkBAIC03MSwyMCArNzEsMTYgQEAgY2xhc3Mg V2ViS2l0UG9ydChiYXNlLlBvcnQpOgogICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNlbGYu X3dlYmtpdF9iYXNlbGluZV9wYXRoKHNlbGYuX25hbWUpLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICd0ZXN0X2V4cGVjdGF0aW9ucy50eHQnKQogCisgICAgIyBPbmx5IG5lZWRlZCBieSBw b3J0cyB3aGljaCBtYWludGFpbiB2ZXJzaW9uZWQgdGVzdCBleHBlY3RhdGlvbnMgKGxpa2UgbWFj LXRpZ2VyIHZzLiBtYWMtbGVvcGFyZCkKKyAgICBkZWYgdmVyc2lvbihzZWxmKToKKyAgICAgICAg cmV0dXJuICcnCisKICAgICBkZWYgX2J1aWxkX2RyaXZlcihzZWxmKToKICAgICAgICAgcmV0dXJu IG5vdCBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWwogICAgICAgICAgICAgc2VsZi5zY3Jp cHRfcGF0aCgiYnVpbGQtZHVtcHJlbmRlcnRyZWUiKSwKICAgICAgICAgICAgIHNlbGYuZmxhZ19m cm9tX2NvbmZpZ3VyYXRpb24oc2VsZi5fb3B0aW9ucy5jb25maWd1cmF0aW9uKSwKICAgICAgICAg XSwgcmV0dXJuX2V4aXRfY29kZT1UcnVlKQogCi0gICAgZGVmIF9idWlsZF9qYXZhKHNlbGYpOgot ICAgICAgICBqYXZhX3Rlc3RzX3BhdGggPSBvcy5wYXRoLmpvaW4oc2VsZi5sYXlvdXRfdGVzdHNf ZGlyKCksICJqYXZhIikKLSAgICAgICAgYnVpbGRfamF2YSA9IFsiL3Vzci9iaW4vbWFrZSIsICIt QyIsIGphdmFfdGVzdHNfcGF0aF0KLSAgICAgICAgaWYgc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21t YW5kKGJ1aWxkX2phdmEsIHJldHVybl9leGl0X2NvZGU9VHJ1ZSk6Ci0gICAgICAgICAgICBfbG9n LmVycm9yKCJGYWlsZWQgdG8gYnVpbGQgSmF2YSBzdXBwb3J0IGZpbGVzOiAlcyIgJSBidWlsZF9q YXZhKQotICAgICAgICAgICAgcmV0dXJuIEZhbHNlCi0gICAgICAgIHJldHVybiBUcnVlCi0KICAg ICBkZWYgX2NoZWNrX2RyaXZlcihzZWxmKToKICAgICAgICAgZHJpdmVyX3BhdGggPSBzZWxmLl9w YXRoX3RvX2RyaXZlcigpCiAgICAgICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhkcml2ZXJfcGF0 aCk6CkBAIC05NSwxNCArOTEsMTkgQEAgY2xhc3MgV2ViS2l0UG9ydChiYXNlLlBvcnQpOgogICAg IGRlZiBjaGVja19idWlsZChzZWxmLCBuZWVkc19odHRwKToKICAgICAgICAgaWYgbm90IHNlbGYu X2J1aWxkX2RyaXZlcigpOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCi0gICAgICAgIGlmIG5v dCBzZWxmLmNoZWNrX2ltYWdlX2RpZmYoKToKLSAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAg ICAgICBpZiBub3Qgc2VsZi5fY2hlY2tfZHJpdmVyKCk6CiAgICAgICAgICAgICByZXR1cm4gRmFs c2UKLSAgICAgICAgaWYgbm90IHNlbGYuX2J1aWxkX2phdmEoKToKKyAgICAgICAgaWYgc2VsZi5f b3B0aW9ucy5waXhlbF90ZXN0czoKKyAgICAgICAgICAgIGlmIG5vdCBzZWxmLmNoZWNrX2ltYWdl X2RpZmYoKToKKyAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKKyAgICAgICAgaWYgbm90IHNl bGYuX2NoZWNrX3BvcnRfYnVpbGQoKToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAg ICByZXR1cm4gVHJ1ZQogCisgICAgZGVmIF9jaGVja19wb3J0X2J1aWxkKHNlbGYpOgorICAgICAg ICAjIFBvcnRzIGNhbiBvdmVycmlkZSB0aGlzIG1ldGhvZCB0byBkbyBhZGRpdGlvbmFsIGNoZWNr cy4KKyAgICAgICAgcGFzcworCiAgICAgZGVmIGNoZWNrX2ltYWdlX2RpZmYoc2VsZiwgb3ZlcnJp ZGVfc3RlcD1Ob25lLCBsb2dnaW5nPVRydWUpOgogICAgICAgICBpbWFnZV9kaWZmX3BhdGggPSBz ZWxmLl9wYXRoX3RvX2ltYWdlX2RpZmYoKQogICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMo aW1hZ2VfZGlmZl9wYXRoKToKQEAgLTIwOSw3ICsyMTAsNiBAQCBjbGFzcyBXZWJLaXRQb3J0KGJh c2UuUG9ydCk6CiAgICAgICAgIF0KIAogICAgIGRlZiBfdGVzdHNfZm9yX2Rpc2FibGVkX2ZlYXR1 cmVzKHNlbGYpOgotICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCdXZWJLaXRQb3J0 Ll90ZXN0c19mb3JfZGlzYWJsZWRfZmVhdHVyZXMnKQogICAgICAgICAjIEZJWE1FOiBUaGlzIHNo b3VsZCB1c2UgdGhlIGZlYXR1cmUgZGV0ZWN0aW9uIGZyb20KICAgICAgICAgIyB3ZWJraXRwZXJs L2ZlYXR1cmVzLnBtIHRvIG1hdGNoIHJ1bi13ZWJraXQtdGVzdHMuCiAgICAgICAgICMgRm9yIG5v dyB3ZSBoYXJkLWNvZGUgYSBsaXN0IG9mIGZlYXR1cmVzIGtub3duIHRvIGJlIGRpc2FibGVkIG9u CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3dpbi5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvd2luLnB5CmluZGV4IDc2N2RlM2EuLjJiZjY5MmIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2luLnB5CisrKyBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2luLnB5CkBAIC00NSw5ICs0 NSw2IEBAIGNsYXNzIFdpblBvcnQoV2ViS2l0UG9ydCk6CiAgICAgICAgICAgICBwb3J0X25hbWUg PSAnd2luJwogICAgICAgICBXZWJLaXRQb3J0Ll9faW5pdF9fKHNlbGYsIHBvcnRfbmFtZSwgb3B0 aW9ucykKIAotICAgIGRlZiB2ZXJzaW9uKHNlbGYpOgotICAgICAgICByZXR1cm4gJycKLQogICAg IGRlZiBfdGVzdHNfZm9yX290aGVyX3BsYXRmb3JtcyhzZWxmKToKICAgICAgICAgIyBGSVhNRTog VGhpcyBsaXN0IGNvdWxkIGJlIGR5bmFtaWMgYmFzZWQgb24gcGxhdGZvcm0gbmFtZSBhbmQKICAg ICAgICAgIyBwdXNoZWQgaW50byBiYXNlLlBvcnQuCkBAIC01OSwzMCArNTYsNiBAQCBjbGFzcyBX aW5Qb3J0KFdlYktpdFBvcnQpOgogICAgICAgICAgICAgInBsYXRmb3JtL21hYyIsCiAgICAgICAg IF0KIAotICAgICMgRklYTUU6IFZhbGlkYXRlIHRoaXMgbGlzdC4KLSAgICBkZWYgX3Rlc3RzX2Zv cl9kaXNhYmxlZF9mZWF0dXJlcyhzZWxmKToKLSAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQg dXNlIHRoZSBmZWF0dXJlIGRldGVjdGlvbiBmcm9tCi0gICAgICAgICMgd2Via2l0cGVybC9mZWF0 dXJlcy5wbSB0byBtYXRjaCBydW4td2Via2l0LXRlc3RzLgotICAgICAgICAjIEZvciBub3cgd2Ug aGFyZC1jb2RlIGEgbGlzdCBvZiBmZWF0dXJlcyBrbm93biB0byBiZSBkaXNhYmxlZCBvbgotICAg ICAgICAjIHRoZSBXaW4gcGxhdGZvcm0uCi0gICAgICAgIGRpc2FibGVkX2ZlYXR1cmVfdGVzdHMg PSBbCi0gICAgICAgICAgICAiZmFzdC94aHRtbG1wIiwKLSAgICAgICAgICAgICJodHRwL3Rlc3Rz L3dtbCIsCi0gICAgICAgICAgICAibWF0aG1sIiwKLSAgICAgICAgICAgICJ3bWwiLAotICAgICAg ICBdCi0gICAgICAgICMgRklYTUU6IHdlYmFyY2hpdmUgdGVzdHMgZXhwZWN0IHRvIHJlYWQtd3Jp dGUgZnJvbQotICAgICAgICAjIC1leHBlY3RlZC53ZWJhcmNoaXZlIGZpbGVzIGluc3RlYWQgb2Yg LnR4dCBmaWxlcy4KLSAgICAgICAgIyBUaGlzIHNjcmlwdCBkb2Vzbid0IGtub3cgaG93IHRvIGRv IHRoYXQgeWV0LCBzbyBwcmV0ZW5kIHRoZXkncmUKLSAgICAgICAgIyBqdXN0ICJkaXNhYmxlZCIu Ci0gICAgICAgIHdlYmFyY2hpdmVfdGVzdHMgPSBbCi0gICAgICAgICAgICAid2ViYXJjaGl2ZSIs Ci0gICAgICAgICAgICAic3ZnL3dlYmFyY2hpdmUiLAotICAgICAgICAgICAgImh0dHAvdGVzdHMv d2ViYXJjaGl2ZSIsCi0gICAgICAgICAgICAic3ZnL2N1c3RvbS9pbWFnZS13aXRoLXByZWZpeC1p bi13ZWJhcmNoaXZlLnN2ZyIsCi0gICAgICAgIF0KLSAgICAgICAgcmV0dXJuIGRpc2FibGVkX2Zl YXR1cmVfdGVzdHMgKyB3ZWJhcmNoaXZlX3Rlc3RzCi0KICAgICBkZWYgX3BhdGhfdG9fYXBhY2hl X2NvbmZpZ19maWxlKHNlbGYpOgogICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNlbGYubGF5 b3V0X3Rlc3RzX2RpcigpLCAnaHR0cCcsICdjb25mJywKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnY3lnd2luLWh0dHBkLmNvbmYnKQo=