49360 2010-11-10 19:30:46 -0800 new-run-webkit-tests: respect set-webkit-configuration again 2010-11-12 18:01:07 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 49361 1 dpranke dpranke aroben bulach eric mihaip oldest_to_newest 307695 0 dpranke 2010-11-10 19:30:46 -0800 the refactoring out of the Config object had a typo that caused NRWT to stop respecting set-webkit-configuration again :( 307696 1 73571 dpranke 2010-11-10 19:32:03 -0800 Created attachment 73571 Patch 308160 2 73665 dpranke 2010-11-11 14:32:41 -0800 Created attachment 73665 Patch 308165 3 73665 aroben 2010-11-11 14:38:13 -0800 Comment on attachment 73665 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=73665&action=review > WebKitTools/Scripts/webkitpy/layout_tests/port/config_standalone.py:56 > + else: > + e = executive.Executive() > + fs = filesystem.FileSystem() Is this really needed? It's never used. 308167 4 dpranke 2010-11-11 14:39:09 -0800 (In reply to comment #3) > (From update of attachment 73665 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=73665&action=review > > > WebKitTools/Scripts/webkitpy/layout_tests/port/config_standalone.py:56 > > + else: > > + e = executive.Executive() > > + fs = filesystem.FileSystem() > > Is this really needed? It's never used. Yeah, I've used it by hand to verify that the actual codepath works, and I'll probably use it in the future when we have "integration tests". 308202 5 73665 eric 2010-11-11 15:21:12 -0800 Comment on attachment 73665 Patch Sigh. We really need to kill that static. Thanks for fixing. 308232 6 73665 dpranke 2010-11-11 15:51:11 -0800 Comment on attachment 73665 Patch Clearing flags on attachment: 73665 Committed r71858: <http://trac.webkit.org/changeset/71858> 308233 7 dpranke 2010-11-11 15:51:15 -0800 All reviewed patches have been landed. Closing bug. 308574 8 mihaip 2010-11-12 08:31:16 -0800 This broke the NaCl tests, which use new-run-webkit-httpd, which also tries to get the configuration (unclear if it needs it): http://build.chromium.org/p/chromium/builders/NACL%20Tests/builds/1636/steps/nacl_ui_tests/logs/stdio The breakage is preventing WebKit rolls, so I'm going to roll this out for now. 308578 9 mihaip 2010-11-12 08:38:25 -0800 (In reply to comment #8) > The breakage is preventing WebKit rolls, so I'm going to roll this out for now. Rolled out with http://trac.webkit.org/changeset/71916. 308882 10 73801 dpranke 2010-11-12 17:51:30 -0800 Created attachment 73801 Patch 308887 11 73801 dpranke 2010-11-12 18:01:03 -0800 Comment on attachment 73801 Patch Clearing flags on attachment: 73801 Committed r71960: <http://trac.webkit.org/changeset/71960> 308888 12 dpranke 2010-11-12 18:01:07 -0800 All reviewed patches have been landed. Closing bug. 73571 2010-11-10 19:32:03 -0800 2010-11-11 14:32:38 -0800 Patch bug-49360-20101110193202.patch text/plain 3307 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1ODllZGM5YTgyMzliOWRhZTBiZTIzNDhhY2IzY2VmM2Y4NWE1ZWZjLi41MTg3ZmRk MTAzMDA1OGEwYzE5YTdiM2U2OGFiNTJiNWIwYmM3YWFmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAK KzIwMTAtMTEtMTAgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IE5SV1QgdG8gcmVz cGVjdCBzZXQtd2Via2l0LWNvbmZpZ3VyYXRpb24gYWdhaW4gOigKKworICAgICAgICBUaGlzIGNo YW5nZSBmaXhlcyBhIHR5cG8gaW4gY29uZmlnLnB5IHRoYXQgd2FzIGNhdXNpbmcgdGhlIHdyb25n CisgICAgICAgIHZhbHVlIHRvIGJlIHJlYWQgaW5pdGlhbGx5IGFuZCB1cyBuZXZlciBhY3R1YWxs eSBsb29raW5nIGludG8KKyAgICAgICAgdGhlIGZpbGVzeXN0ZW0gdG8gZ2V0IHRoZSBkZWZhdWx0 IGNvbmZpZ3VyYXRpb24uCisgICAgICAgIAorICAgICAgICBUZXN0cyB3aWxsIGZvbGxvdyBpbiBh IHNlcGFyYXRlIHBhdGNoIGJlY2F1c2UgdGhlIHdheSB0byB0ZXN0CisgICAgICAgIHRoaXMgcHJv cGVybHkgaXMgc29tZXdoYXQgY29tcGxpY2F0ZWQgOigKKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnLnB5OgorCiAyMDEwLTExLTA4ICBEaXJrIFBy YW5rZSA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2NvbmZpZy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY29uZmlnLnB5CmluZGV4IDRhMGRlOTYzNDZhYjRjYWI4NzA2Y2RmNzljZTI1 YjFkMTdlNTgyZmIuLjFkN2Y0ZmVlNjA5NWJlMTYxMjU2MTQ4ODg0YWY4NjgxNWExZjljYWMgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Y29uZmlnLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY29uZmlnLnB5CkBAIC00MCwxNiArNDAsMjAgQEAgZnJvbSB3ZWJraXRweS5jb21tb24u c3lzdGVtIGltcG9ydCBsb2d1dGlscwogX2xvZyA9IGxvZ3V0aWxzLmdldF9sb2dnZXIoX19maWxl X18pCiAKICMKLSMgVGhpcyBpcyB1c2VkIHRvIHJlY29yZCBpZiB3ZSd2ZSBhbHJlYWR5IGhpdCB0 aGUgZmlsZXN5c3RlbSB0byBsb29rCisjIEZJWE1FOiBUaGlzIGlzIHVzZWQgdG8gcmVjb3JkIGlm IHdlJ3ZlIGFscmVhZHkgaGl0IHRoZSBmaWxlc3lzdGVtIHRvIGxvb2sKICMgZm9yIGEgZGVmYXVs dCBjb25maWd1cmF0aW9uLiBXZSBjYWNoZSB0aGlzIHRvIHNwZWVkIHVwIHRoZSB1bml0IHRlc3Rz LAotIyBidXQgdGhpcyBjYW4gYmUgcmVzZXQgd2l0aCBjbGVhcl9jYWNoZWRfY29uZmlndXJhdGlv bigpLgorIyBidXQgdGhpcyBjYW4gYmUgcmVzZXQgd2l0aCBjbGVhcl9jYWNoZWRfY29uZmlndXJh dGlvbigpLiBUaGlzIHNob3VsZCBiZQorIyByZXBsYWNlZCB3aXRoIHVzIGNvbnNpc3RlbnRseSB1 c2luZyBNb2NrQ29uZmlncygpIGZvciB0ZXN0cyB0aGF0IGRvbid0CisjIGhpdCB0aGUgZmlsZXN5 c3RlbSBhdCBhbGwgYW5kIHByb3ZpZGUgYSByZWxpYWJsZSB2YWx1ZS4KICMKLV9kZXRlcm1pbmVk X2NvbmZpZ3VyYXRpb24gPSBOb25lCitfaGF2ZV9kZXRlcm1pbmVkX2NvbmZpZ3VyYXRpb24gPSBG YWxzZQorX2NvbmZpZ3VyYXRpb24gPSAiUmVsZWFzZSIKIAogCiBkZWYgY2xlYXJfY2FjaGVkX2Nv bmZpZ3VyYXRpb24oKToKLSAgICBnbG9iYWwgX2RldGVybWluZWRfY29uZmlndXJhdGlvbgotICAg IF9kZXRlcm1pbmVkX2NvbmZpZ3VyYXRpb24gPSAtMQorICAgIGdsb2JhbCBfaGF2ZV9kZXRlcm1p bmVkX2NvbmZpZ3VyYXRpb24sIF9jb25maWd1cmF0aW9uCisgICAgX2hhdmVfZGV0ZXJtaW5lZF9j b25maWd1cmF0aW9uID0gRmFsc2UKKyAgICBfY29uZmlndXJhdGlvbiA9ICJSZWxlYXNlIgogCiAK IGNsYXNzIENvbmZpZyhvYmplY3QpOgpAQCAtMTM3LDggKzE0MSwxMSBAQCBjbGFzcyBDb25maWco b2JqZWN0KToKIAogICAgIGRlZiBfZGV0ZXJtaW5lX2NvbmZpZ3VyYXRpb24oc2VsZik6CiAgICAg ICAgICMgVGhpcyBtaXJyb3JzIHRoZSBsb2dpYyBpbiB3ZWJraXRkaXJzLnBtOmRldGVybWluZUNv bmZpZ3VyYXRpb24oKS4KLSAgICAgICAgZ2xvYmFsIF9kZXRlcm1pbmVkX2NvbmZpZ3VyYXRpb24K LSAgICAgICAgaWYgX2RldGVybWluZWRfY29uZmlndXJhdGlvbiA9PSAtMToKKyAgICAgICAgIwor ICAgICAgICAjIEZJWE1FOiBTZWUgdGhlIGNvbW1lbnQgYXQgdGhlIHRvcCBvZiB0aGUgZmlsZSBy ZWdhcmRpbmcgdW5pdCB0ZXN0cworICAgICAgICAjIGFuZCBvdXIgdXNlIG9mIGdsb2JhbCBtdXRh YmxlIHN0YXRpYyB2YXJpYWJsZXMuCisgICAgICAgIGdsb2JhbCBfaGF2ZV9kZXRlcm1pbmVkX2Nv bmZpZ3VyYXRpb24sIF9jb25maWd1cmF0aW9uCisgICAgICAgIGlmIG5vdCBfaGF2ZV9kZXRlcm1p bmVkX2NvbmZpZ3VyYXRpb246CiAgICAgICAgICAgICBjb250ZW50cyA9IHNlbGYuX3JlYWRfY29u ZmlndXJhdGlvbigpCiAgICAgICAgICAgICBpZiBub3QgY29udGVudHM6CiAgICAgICAgICAgICAg ICAgY29udGVudHMgPSAiUmVsZWFzZSIKQEAgLTE0Niw4ICsxNTMsOSBAQCBjbGFzcyBDb25maWco b2JqZWN0KToKICAgICAgICAgICAgICAgICBjb250ZW50cyA9ICJSZWxlYXNlIgogICAgICAgICAg ICAgaWYgY29udGVudHMgPT0gIkRldmVsb3BtZW50IjoKICAgICAgICAgICAgICAgICBjb250ZW50 cyA9ICJEZWJ1ZyIKLSAgICAgICAgICAgIF9kZXRlcm1pbmVkX2NvbmZpZ3VyYXRpb24gPSBjb250 ZW50cwotICAgICAgICByZXR1cm4gX2RldGVybWluZWRfY29uZmlndXJhdGlvbgorICAgICAgICAg ICAgX2NvbmZpZ3VyYXRpb24gPSBjb250ZW50cworICAgICAgICAgICAgX2hhdmVfZGV0ZXJtaW5l ZF9jb25maWd1cmF0aW9uID0gVHJ1ZQorICAgICAgICByZXR1cm4gX2NvbmZpZ3VyYXRpb24KIAog ICAgIGRlZiBfcmVhZF9jb25maWd1cmF0aW9uKHNlbGYpOgogICAgICAgICBjb25maWd1cmF0aW9u X3BhdGggPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5idWlsZF9kaXJlY3RvcnkoTm9uZSks Cg== 73665 2010-11-11 14:32:41 -0800 2010-11-12 17:51:26 -0800 Patch bug-49360-20101111143239.patch text/plain 8484 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmYzY2N2VmYzU0MjllNjlmZDhmOGU3YWNlZmFiNWQzMThlNmVmZjFhLi41Mzg1YWJm NmRhYzRiNWQzNTQxNGZiNzk3MmIzOWI1OWE5MWI5ZmQxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMTEtMTAgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IE5SV1QgdG8gcmVz cGVjdCBzZXQtd2Via2l0LWNvbmZpZ3VyYXRpb24gYWdhaW4gOigKKworICAgICAgICBUaGlzIGNo YW5nZSBmaXhlcyBhIHR5cG8gaW4gY29uZmlnLnB5IHRoYXQgd2FzIGNhdXNpbmcgdGhlIHdyb25n CisgICAgICAgIHZhbHVlIHRvIGJlIHJlYWQgaW5pdGlhbGx5IGFuZCB1cyBuZXZlciBhY3R1YWxs eSBsb29raW5nIGludG8KKyAgICAgICAgdGhlIGZpbGVzeXN0ZW0gdG8gZ2V0IHRoZSBkZWZhdWx0 IGNvbmZpZ3VyYXRpb24uCisgICAgICAgIAorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY29uZmlnLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY29uZmlnX3N0YW5kYWxvbmUucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25maWdfdW5pdHRlc3QucHk6CisKIDIwMTAtMTEt MTAgIENocmlzIEd1aWxsb3J5ICA8Y2hyaXMuZ3VpbGxvcnlAZ29vZ2xlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBDaHJpcyBGbGVpemFjaC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnLnB5IGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25maWcucHkKaW5kZXggNGEwZGU5 NjM0NmFiNGNhYjg3MDZjZGY3OWNlMjViMWQxN2U1ODJmYi4uMWQ3ZjRmZWU2MDk1YmUxNjEyNTYx NDg4ODRhZjg2ODE1YTFmOWNhYyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25maWcucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25maWcucHkKQEAgLTQwLDE2ICs0MCwyMCBA QCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IGxvZ3V0aWxzCiBfbG9nID0gbG9n dXRpbHMuZ2V0X2xvZ2dlcihfX2ZpbGVfXykKIAogIwotIyBUaGlzIGlzIHVzZWQgdG8gcmVjb3Jk IGlmIHdlJ3ZlIGFscmVhZHkgaGl0IHRoZSBmaWxlc3lzdGVtIHRvIGxvb2sKKyMgRklYTUU6IFRo aXMgaXMgdXNlZCB0byByZWNvcmQgaWYgd2UndmUgYWxyZWFkeSBoaXQgdGhlIGZpbGVzeXN0ZW0g dG8gbG9vawogIyBmb3IgYSBkZWZhdWx0IGNvbmZpZ3VyYXRpb24uIFdlIGNhY2hlIHRoaXMgdG8g c3BlZWQgdXAgdGhlIHVuaXQgdGVzdHMsCi0jIGJ1dCB0aGlzIGNhbiBiZSByZXNldCB3aXRoIGNs ZWFyX2NhY2hlZF9jb25maWd1cmF0aW9uKCkuCisjIGJ1dCB0aGlzIGNhbiBiZSByZXNldCB3aXRo IGNsZWFyX2NhY2hlZF9jb25maWd1cmF0aW9uKCkuIFRoaXMgc2hvdWxkIGJlCisjIHJlcGxhY2Vk IHdpdGggdXMgY29uc2lzdGVudGx5IHVzaW5nIE1vY2tDb25maWdzKCkgZm9yIHRlc3RzIHRoYXQg ZG9uJ3QKKyMgaGl0IHRoZSBmaWxlc3lzdGVtIGF0IGFsbCBhbmQgcHJvdmlkZSBhIHJlbGlhYmxl IHZhbHVlLgogIwotX2RldGVybWluZWRfY29uZmlndXJhdGlvbiA9IE5vbmUKK19oYXZlX2RldGVy bWluZWRfY29uZmlndXJhdGlvbiA9IEZhbHNlCitfY29uZmlndXJhdGlvbiA9ICJSZWxlYXNlIgog CiAKIGRlZiBjbGVhcl9jYWNoZWRfY29uZmlndXJhdGlvbigpOgotICAgIGdsb2JhbCBfZGV0ZXJt aW5lZF9jb25maWd1cmF0aW9uCi0gICAgX2RldGVybWluZWRfY29uZmlndXJhdGlvbiA9IC0xCisg ICAgZ2xvYmFsIF9oYXZlX2RldGVybWluZWRfY29uZmlndXJhdGlvbiwgX2NvbmZpZ3VyYXRpb24K KyAgICBfaGF2ZV9kZXRlcm1pbmVkX2NvbmZpZ3VyYXRpb24gPSBGYWxzZQorICAgIF9jb25maWd1 cmF0aW9uID0gIlJlbGVhc2UiCiAKIAogY2xhc3MgQ29uZmlnKG9iamVjdCk6CkBAIC0xMzcsOCAr MTQxLDExIEBAIGNsYXNzIENvbmZpZyhvYmplY3QpOgogCiAgICAgZGVmIF9kZXRlcm1pbmVfY29u ZmlndXJhdGlvbihzZWxmKToKICAgICAgICAgIyBUaGlzIG1pcnJvcnMgdGhlIGxvZ2ljIGluIHdl YmtpdGRpcnMucG06ZGV0ZXJtaW5lQ29uZmlndXJhdGlvbigpLgotICAgICAgICBnbG9iYWwgX2Rl dGVybWluZWRfY29uZmlndXJhdGlvbgotICAgICAgICBpZiBfZGV0ZXJtaW5lZF9jb25maWd1cmF0 aW9uID09IC0xOgorICAgICAgICAjCisgICAgICAgICMgRklYTUU6IFNlZSB0aGUgY29tbWVudCBh dCB0aGUgdG9wIG9mIHRoZSBmaWxlIHJlZ2FyZGluZyB1bml0IHRlc3RzCisgICAgICAgICMgYW5k IG91ciB1c2Ugb2YgZ2xvYmFsIG11dGFibGUgc3RhdGljIHZhcmlhYmxlcy4KKyAgICAgICAgZ2xv YmFsIF9oYXZlX2RldGVybWluZWRfY29uZmlndXJhdGlvbiwgX2NvbmZpZ3VyYXRpb24KKyAgICAg ICAgaWYgbm90IF9oYXZlX2RldGVybWluZWRfY29uZmlndXJhdGlvbjoKICAgICAgICAgICAgIGNv bnRlbnRzID0gc2VsZi5fcmVhZF9jb25maWd1cmF0aW9uKCkKICAgICAgICAgICAgIGlmIG5vdCBj b250ZW50czoKICAgICAgICAgICAgICAgICBjb250ZW50cyA9ICJSZWxlYXNlIgpAQCAtMTQ2LDgg KzE1Myw5IEBAIGNsYXNzIENvbmZpZyhvYmplY3QpOgogICAgICAgICAgICAgICAgIGNvbnRlbnRz ID0gIlJlbGVhc2UiCiAgICAgICAgICAgICBpZiBjb250ZW50cyA9PSAiRGV2ZWxvcG1lbnQiOgog ICAgICAgICAgICAgICAgIGNvbnRlbnRzID0gIkRlYnVnIgotICAgICAgICAgICAgX2RldGVybWlu ZWRfY29uZmlndXJhdGlvbiA9IGNvbnRlbnRzCi0gICAgICAgIHJldHVybiBfZGV0ZXJtaW5lZF9j b25maWd1cmF0aW9uCisgICAgICAgICAgICBfY29uZmlndXJhdGlvbiA9IGNvbnRlbnRzCisgICAg ICAgICAgICBfaGF2ZV9kZXRlcm1pbmVkX2NvbmZpZ3VyYXRpb24gPSBUcnVlCisgICAgICAgIHJl dHVybiBfY29uZmlndXJhdGlvbgogCiAgICAgZGVmIF9yZWFkX2NvbmZpZ3VyYXRpb24oc2VsZik6 CiAgICAgICAgIGNvbmZpZ3VyYXRpb25fcGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxm LmJ1aWxkX2RpcmVjdG9yeShOb25lKSwKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnX3N0YW5kYWxvbmUucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZpZ19zdGFuZGFsb25l LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjFmYzgxZGIyYWU4NjJlMmMyZjg0ZTQ3MjAyNzYxZWRhNDNjMDk3MTYK LS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2NvbmZpZ19zdGFuZGFsb25lLnB5CkBAIC0wLDAgKzEsNjIgQEAKKyMgQ29weXJp Z2h0IChDKSAyMDEwIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgKiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisj ICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBh Ym92ZQorIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhl ciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorIyAgICAqIE5l aXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMgY29u dHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJp dmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4g cGVybWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJ R0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBP UiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBU SEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IK KyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxM IFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5Z IERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1Ig Q09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywg UFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0Us CisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRS QUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgorCisiIiJGSVhNRTogVGhpcyBzY3JpcHQgaXMgdXNlZCBieQorY29uZmlnX3VuaXR0ZXN0 LnRlc3RfZGVmYXVsdF9jb25maWd1cmF0aW9uX19zdGFuZGFsb25lKCkgdG8gcmVhZCB0aGUKK2Rl ZmF1bHQgY29uZmlndXJhdGlvbiB0byB3b3JrIGFyb3VuZCBhbnkgcG9zc2libGUgY2FjaGluZyAv IHJlc2V0IGJ1Z3MuIFNlZQoraHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWc/aWQ9NDkz NjAgZm9yIHRoZSBtb3RpdmF0aW9uLiBXZSBjYW4gcmVtb3ZlCit0aGlzIHRlc3Qgd2hlbiB3ZSBy ZW1vdmUgdGhlIGdsb2JhbCBjb25maWd1cmF0aW9uIGNhY2hlIGluIGNvbmZpZy5weS4iIiIKKwor aW1wb3J0IG9zCitpbXBvcnQgdW5pdHRlc3QKKworZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVt IGltcG9ydCBleGVjdXRpdmUKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgZXhl Y3V0aXZlX21vY2sKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgZmlsZXN5c3Rl bQorZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9ydCBmaWxlc3lzdGVtX21vY2sKKwor aW1wb3J0IHN5cworaW1wb3J0IGNvbmZpZworCisKK2RlZiBtYWluKGFyZ3Y9Tm9uZSk6CisgICAg aWYgbm90IGFyZ3Y6CisgICAgICAgIGFyZ3YgPSBzeXMuYXJndgorCisgICAgaWYgbGVuKGFyZ3Yp ID09IDMgYW5kIGFyZ3ZbMV0gPT0gJy0tbW9jayc6CisgICAgICAgIGUgPSBleGVjdXRpdmVfbW9j ay5Nb2NrRXhlY3V0aXZlMihvdXRwdXQ9J2ZvbycpCisgICAgICAgIGZzID0gZmlsZXN5c3RlbV9t b2NrLk1vY2tGaWxlU3lzdGVtKHsnZm9vL0NvbmZpZ3VyYXRpb24nOiBhcmd2WzJdfSkKKyAgICBl bHNlOgorICAgICAgICBlID0gZXhlY3V0aXZlLkV4ZWN1dGl2ZSgpCisgICAgICAgIGZzID0gZmls ZXN5c3RlbS5GaWxlU3lzdGVtKCkKKworICAgIGMgPSBjb25maWcuQ29uZmlnKGUsIGZzKQorICAg IHByaW50IGMuZGVmYXVsdF9jb25maWd1cmF0aW9uKCkKKworaWYgX19uYW1lX18gPT0gJ19fbWFp bl9fJzoKKyAgICBtYWluKCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25maWdfdW5pdHRlc3QucHkKaW5kZXgg ZWQ1YWI4YjczMDRlMDVkZWE0NzE5OGY5ZTQ0NzJmY2M1ODBkNjVlYi4uZjVlMmQzYTM1ZDE0ZWU5 ZTYyZDVhOTE2ZWRmZTIxNjhmODRmMjZhNyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25maWdfdW5pdHRlc3QucHkKKysrIGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25maWdfdW5pdHRl c3QucHkKQEAgLTI3LDYgKzI3LDcgQEAKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAogaW1wb3J0IG9zCitpbXBv cnQgc3lzCiBpbXBvcnQgdW5pdHRlc3QKIAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGlt cG9ydCBleGVjdXRpdmUKQEAgLTQ4LDcgKzQ5LDcgQEAgY2xhc3MgQ29uZmlnVGVzdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAKICAgICBkZWYgYXNzZXJ0X2NvbmZpZ3VyYXRpb24oc2VsZiwgY29udGVu dHMsIGV4cGVjdGVkKToKICAgICAgICAgIyBUaGlzIHRlc3RzIHRoYXQgYSBjb25maWd1cmF0aW9u IGZpbGUgY29udGFpbmluZwotICAgICAgICAjIF9jb250ZW50c18gZW5kc2QgdXAgYmVpbmcgaW50 ZXJwcmV0ZWQgYXMgX2V4cGVjdGVkXy4KKyAgICAgICAgIyBfY29udGVudHNfIGVuZHMgdXAgYmVp bmcgaW50ZXJwcmV0ZWQgYXMgX2V4cGVjdGVkXy4KICAgICAgICAgYyA9IHNlbGYubWFrZV9jb25m aWcoJ2ZvbycsIHsnZm9vL0NvbmZpZ3VyYXRpb24nOiBjb250ZW50c30pCiAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoYy5kZWZhdWx0X2NvbmZpZ3VyYXRpb24oKSwgZXhwZWN0ZWQpCiAKQEAgLTEx OSw2ICsxMjAsMjUgQEAgY2xhc3MgQ29uZmlnVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAg ICAgIHNlbGYuYXNzZXJ0X2NvbmZpZ3VyYXRpb24oJ1Vua25vd24nLCAnVW5rbm93bicpCiAgICAg ICAgIG9jLnJlc3RvcmVfb3V0cHV0KCkKIAorICAgIGRlZiB0ZXN0X2RlZmF1bHRfY29uZmlndXJh dGlvbl9fc3RhbmRhbG9uZShzZWxmKToKKyAgICAgICAgIyBGSVhNRTogVGhpcyB0ZXN0IHJ1bnMg YSBzdGFuZGFsb25lIHB5dGhvbiBzY3JpcHQgdG8gdGVzdAorICAgICAgICAjIHJlYWRpbmcgdGhl IGRlZmF1bHQgY29uZmlndXJhdGlvbiB0byB3b3JrIGFyb3VuZCBhbnkgcG9zc2libGUKKyAgICAg ICAgIyBjYWNoaW5nIC8gcmVzZXQgYnVncy4gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnP2lkPTQ5MzYwCisgICAgICAgICMgZm9yIHRoZSBtb3RpdmF0aW9uLiBXZSBjYW4gcmVt b3ZlIHRoaXMgdGVzdCB3aGVuIHdlIHJlbW92ZSB0aGUKKyAgICAgICAgIyBnbG9iYWwgY29uZmln dXJhdGlvbiBjYWNoZSBpbiBjb25maWcucHkuCisgICAgICAgIGUgPSBleGVjdXRpdmUuRXhlY3V0 aXZlKCkKKyAgICAgICAgZnMgPSBmaWxlc3lzdGVtLkZpbGVTeXN0ZW0oKQorICAgICAgICBjID0g Y29uZmlnLkNvbmZpZyhlLCBmcykKKyAgICAgICAgc2NyaXB0ID0gYy5wYXRoX2Zyb21fd2Via2l0 X2Jhc2UoJ1dlYktpdFRvb2xzJywgJ1NjcmlwdHMnLAorICAgICAgICAgICAgJ3dlYmtpdHB5Jywg J2xheW91dF90ZXN0cycsICdwb3J0JywgJ2NvbmZpZ19zdGFuZGFsb25lLnB5JykKKworICAgICAg ICAjIE5vdGU6IGRvbid0IHVzZSAnUmVsZWFzZScgaGVyZSwgc2luY2UgdGhhdCdzIHRoZSBub3Jt YWwgZGVmYXVsdC4KKyAgICAgICAgZXhwZWN0ZWQgPSAnRGVidWcnCisKKyAgICAgICAgYXJncyA9 IFtzeXMuZXhlY3V0YWJsZSwgc2NyaXB0LCAnLS1tb2NrJywgZXhwZWN0ZWRdCisgICAgICAgIGFj dHVhbCA9IGUucnVuX2NvbW1hbmQoYXJncykucnN0cmlwKCkKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChhY3R1YWwsIGV4cGVjdGVkKQorCiAgICAgZGVmIHRlc3RfcGF0aF9mcm9tX3dlYmtpdF9i YXNlKHNlbGYpOgogICAgICAgICAjIEZJWE1FOiBXZSB1c2UgYSByZWFsIGZpbGVzeXN0ZW0gaGVy ZS4gU2hvdWxkIHRoaXMgbW92ZSB0byBhCiAgICAgICAgICMgbW9ja2VkIG9uZT8K 73801 2010-11-12 17:51:30 -0800 2010-11-12 18:01:02 -0800 Patch bug-49360-20101112175129.patch text/plain 10777 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmOWU1NjQxNzA3ZmQwOWRkOTZmMzNhMzY3NWI5NmUzZDRhMjgyYmM0Li5iNzQ3MTg1 YjE1NGUyYWRmOTg1ODM1NjE4MWI2NzI5YjM4ODdkMmYzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMTEtMTIgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXR0ZW1wdCB5ZXQgYWdh aW4gdG8gbGFuZCB0aGUgZml4IGZvciBidWcgNDkzNjAgKHJlc3BlY3RpbmcKKyAgICAgICAgc2V0 LXdlYmtpdC1jb25maWd1cmF0aW9uKS4gV2UgbmVlZCB0byBoYW5kbGUgdGhlIGNhc2VzIHdoZXJl CisgICAgICAgIHRyeWluZyB0byBydW4gd2Via2l0LWJ1aWxkLWRpcmVjdG9yeSB0byBmaW5kIG91 dCB3aGVyZSB0aGUKKyAgICAgICAgZGVmYXVsdCBjb25maWd1cmF0aW9uIG1pZ2h0IGJlIGZhaWxz ICh0aGF0IHNob3dzIHVwIG9uIHNvbWUKKyAgICAgICAgQ2hyb21pdW0gYm90cyB0aGF0IGFwcGFy ZW50bHkgZG9uJ3QgaGF2ZSBwZXJsIGluc3RhbGxlZCkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5MzYwCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZpZy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZpZ19zdGFuZGFsb25lLnB5OiBBZGRlZC4KKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZpZ191bml0dGVz dC5weToKKwogMjAxMC0xMS0xMiAgTWloYWkgUGFycGFyaXRhICA8bWloYWlwQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25maWcucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZpZy5weQppbmRl eCA0YTBkZTk2MzQ2YWI0Y2FiODcwNmNkZjc5Y2UyNWIxZDE3ZTU4MmZiLi5jYWQ1ZTM3MDAyN2Vh MjQ0MTg0YzEzMmVhYjA3OWYwZjUxZDQ0ODRiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZpZy5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2NvbmZpZy5weQpAQCAtMzUsMjEg KzM1LDI2IEBACiBpbXBvcnQgb3MKIAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9y dCBsb2d1dGlscworZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9ydCBleGVjdXRpdmUK IAogCiBfbG9nID0gbG9ndXRpbHMuZ2V0X2xvZ2dlcihfX2ZpbGVfXykKIAogIwotIyBUaGlzIGlz IHVzZWQgdG8gcmVjb3JkIGlmIHdlJ3ZlIGFscmVhZHkgaGl0IHRoZSBmaWxlc3lzdGVtIHRvIGxv b2sKKyMgRklYTUU6IFRoaXMgaXMgdXNlZCB0byByZWNvcmQgaWYgd2UndmUgYWxyZWFkeSBoaXQg dGhlIGZpbGVzeXN0ZW0gdG8gbG9vawogIyBmb3IgYSBkZWZhdWx0IGNvbmZpZ3VyYXRpb24uIFdl IGNhY2hlIHRoaXMgdG8gc3BlZWQgdXAgdGhlIHVuaXQgdGVzdHMsCi0jIGJ1dCB0aGlzIGNhbiBi ZSByZXNldCB3aXRoIGNsZWFyX2NhY2hlZF9jb25maWd1cmF0aW9uKCkuCisjIGJ1dCB0aGlzIGNh biBiZSByZXNldCB3aXRoIGNsZWFyX2NhY2hlZF9jb25maWd1cmF0aW9uKCkuIFRoaXMgc2hvdWxk IGJlCisjIHJlcGxhY2VkIHdpdGggdXMgY29uc2lzdGVudGx5IHVzaW5nIE1vY2tDb25maWdzKCkg Zm9yIHRlc3RzIHRoYXQgZG9uJ3QKKyMgaGl0IHRoZSBmaWxlc3lzdGVtIGF0IGFsbCBhbmQgcHJv dmlkZSBhIHJlbGlhYmxlIHZhbHVlLgogIwotX2RldGVybWluZWRfY29uZmlndXJhdGlvbiA9IE5v bmUKK19oYXZlX2RldGVybWluZWRfY29uZmlndXJhdGlvbiA9IEZhbHNlCitfY29uZmlndXJhdGlv biA9ICJSZWxlYXNlIgogCiAKIGRlZiBjbGVhcl9jYWNoZWRfY29uZmlndXJhdGlvbigpOgotICAg IGdsb2JhbCBfZGV0ZXJtaW5lZF9jb25maWd1cmF0aW9uCi0gICAgX2RldGVybWluZWRfY29uZmln dXJhdGlvbiA9IC0xCisgICAgZ2xvYmFsIF9oYXZlX2RldGVybWluZWRfY29uZmlndXJhdGlvbiwg X2NvbmZpZ3VyYXRpb24KKyAgICBfaGF2ZV9kZXRlcm1pbmVkX2NvbmZpZ3VyYXRpb24gPSBGYWxz ZQorICAgIF9jb25maWd1cmF0aW9uID0gIlJlbGVhc2UiCiAKIAogY2xhc3MgQ29uZmlnKG9iamVj dCk6CkBAIC0xMzcsOCArMTQyLDExIEBAIGNsYXNzIENvbmZpZyhvYmplY3QpOgogCiAgICAgZGVm IF9kZXRlcm1pbmVfY29uZmlndXJhdGlvbihzZWxmKToKICAgICAgICAgIyBUaGlzIG1pcnJvcnMg dGhlIGxvZ2ljIGluIHdlYmtpdGRpcnMucG06ZGV0ZXJtaW5lQ29uZmlndXJhdGlvbigpLgotICAg ICAgICBnbG9iYWwgX2RldGVybWluZWRfY29uZmlndXJhdGlvbgotICAgICAgICBpZiBfZGV0ZXJt aW5lZF9jb25maWd1cmF0aW9uID09IC0xOgorICAgICAgICAjCisgICAgICAgICMgRklYTUU6IFNl ZSB0aGUgY29tbWVudCBhdCB0aGUgdG9wIG9mIHRoZSBmaWxlIHJlZ2FyZGluZyB1bml0IHRlc3Rz CisgICAgICAgICMgYW5kIG91ciB1c2Ugb2YgZ2xvYmFsIG11dGFibGUgc3RhdGljIHZhcmlhYmxl cy4KKyAgICAgICAgZ2xvYmFsIF9oYXZlX2RldGVybWluZWRfY29uZmlndXJhdGlvbiwgX2NvbmZp Z3VyYXRpb24KKyAgICAgICAgaWYgbm90IF9oYXZlX2RldGVybWluZWRfY29uZmlndXJhdGlvbjoK ICAgICAgICAgICAgIGNvbnRlbnRzID0gc2VsZi5fcmVhZF9jb25maWd1cmF0aW9uKCkKICAgICAg ICAgICAgIGlmIG5vdCBjb250ZW50czoKICAgICAgICAgICAgICAgICBjb250ZW50cyA9ICJSZWxl YXNlIgpAQCAtMTQ2LDEzICsxNTQsMTcgQEAgY2xhc3MgQ29uZmlnKG9iamVjdCk6CiAgICAgICAg ICAgICAgICAgY29udGVudHMgPSAiUmVsZWFzZSIKICAgICAgICAgICAgIGlmIGNvbnRlbnRzID09 ICJEZXZlbG9wbWVudCI6CiAgICAgICAgICAgICAgICAgY29udGVudHMgPSAiRGVidWciCi0gICAg ICAgICAgICBfZGV0ZXJtaW5lZF9jb25maWd1cmF0aW9uID0gY29udGVudHMKLSAgICAgICAgcmV0 dXJuIF9kZXRlcm1pbmVkX2NvbmZpZ3VyYXRpb24KKyAgICAgICAgICAgIF9jb25maWd1cmF0aW9u ID0gY29udGVudHMKKyAgICAgICAgICAgIF9oYXZlX2RldGVybWluZWRfY29uZmlndXJhdGlvbiA9 IFRydWUKKyAgICAgICAgcmV0dXJuIF9jb25maWd1cmF0aW9uCiAKICAgICBkZWYgX3JlYWRfY29u ZmlndXJhdGlvbihzZWxmKToKLSAgICAgICAgY29uZmlndXJhdGlvbl9wYXRoID0gc2VsZi5fZmls ZXN5c3RlbS5qb2luKHNlbGYuYnVpbGRfZGlyZWN0b3J5KE5vbmUpLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkNvbmZpZ3VyYXRpb24iKQotICAg ICAgICBpZiBub3Qgc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMoY29uZmlndXJhdGlvbl9wYXRoKToK KyAgICAgICAgdHJ5OgorICAgICAgICAgICAgY29uZmlndXJhdGlvbl9wYXRoID0gc2VsZi5fZmls ZXN5c3RlbS5qb2luKHNlbGYuYnVpbGRfZGlyZWN0b3J5KE5vbmUpLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJDb25maWd1cmF0aW9uIikK KyAgICAgICAgICAgIGlmIG5vdCBzZWxmLl9maWxlc3lzdGVtLmV4aXN0cyhjb25maWd1cmF0aW9u X3BhdGgpOgorICAgICAgICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAgIGV4Y2VwdCAoT1NF cnJvciwgZXhlY3V0aXZlLlNjcmlwdEVycm9yKToKICAgICAgICAgICAgIHJldHVybiBOb25lCiAK ICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0ucmVhZF90ZXh0X2ZpbGUoY29uZmlndXJh dGlvbl9wYXRoKS5yc3RyaXAoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25maWdfc3RhbmRhbG9uZS5weSBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnX3N0YW5kYWxvbmUucHkK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uM2RlYzNiOTFjNDU2MmJlY2E5MWJhNTBlN2M3MjE1YjViNDJkZGNhZgotLS0g L2Rldi9udWxsCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY29uZmlnX3N0YW5kYWxvbmUucHkKQEAgLTAsMCArMSw3MCBAQAorIyBDb3B5cmlnaHQg KEMpIDIwMTAgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0OgorIworIyAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBz b3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgICAg KiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl CisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1h dGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjICAgICogTmVpdGhl ciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworIyBjb250cmli dXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQg ZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJt aXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQg SE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElN UExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFRIRSBJ TVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorIyBB IFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhF IENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElS RUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBQUk9D VVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyMg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CisKKyIiIkZJWE1FOiBUaGlzIHNjcmlwdCBpcyB1c2VkIGJ5Citjb25maWdfdW5pdHRlc3QudGVz dF9kZWZhdWx0X2NvbmZpZ3VyYXRpb25fX3N0YW5kYWxvbmUoKSB0byByZWFkIHRoZQorZGVmYXVs dCBjb25maWd1cmF0aW9uIHRvIHdvcmsgYXJvdW5kIGFueSBwb3NzaWJsZSBjYWNoaW5nIC8gcmVz ZXQgYnVncy4gU2VlCitodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zz9pZD00OTM2MCBm b3IgdGhlIG1vdGl2YXRpb24uIFdlIGNhbiByZW1vdmUKK3RoaXMgdGVzdCB3aGVuIHdlIHJlbW92 ZSB0aGUgZ2xvYmFsIGNvbmZpZ3VyYXRpb24gY2FjaGUgaW4gY29uZmlnLnB5LiIiIgorCitpbXBv cnQgb3MKK2ltcG9ydCB1bml0dGVzdAoraW1wb3J0IHN5cworCisKKyMgRW5zdXJlIHRoYXQgd2Vi a2l0cHkgaXMgaW4gUFlUSE9OUEFUSC4KK3RoaXNfZGlyID0gb3MucGF0aC5hYnNwYXRoKHN5cy5w YXRoWzBdKQordXAgPSBvcy5wYXRoLmRpcm5hbWUKK3NjcmlwdF9kaXIgPSB1cCh1cCh1cCh0aGlz X2RpcikpKQoraWYgc2NyaXB0X2RpciBub3QgaW4gc3lzLnBhdGg6CisgICAgc3lzLnBhdGguYXBw ZW5kKHNjcmlwdF9kaXIpCisKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgZXhl Y3V0aXZlCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IGV4ZWN1dGl2ZV9tb2Nr Citmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IGZpbGVzeXN0ZW0KK2Zyb20gd2Vi a2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgZmlsZXN5c3RlbV9tb2NrCisKK2ltcG9ydCBjb25m aWcKKworCitkZWYgbWFpbihhcmd2PU5vbmUpOgorICAgIGlmIG5vdCBhcmd2OgorICAgICAgICBh cmd2ID0gc3lzLmFyZ3YKKworICAgIGlmIGxlbihhcmd2KSA9PSAzIGFuZCBhcmd2WzFdID09ICct LW1vY2snOgorICAgICAgICBlID0gZXhlY3V0aXZlX21vY2suTW9ja0V4ZWN1dGl2ZTIob3V0cHV0 PSdmb28nKQorICAgICAgICBmcyA9IGZpbGVzeXN0ZW1fbW9jay5Nb2NrRmlsZVN5c3RlbSh7J2Zv by9Db25maWd1cmF0aW9uJzogYXJndlsyXX0pCisgICAgZWxzZToKKyAgICAgICAgZSA9IGV4ZWN1 dGl2ZS5FeGVjdXRpdmUoKQorICAgICAgICBmcyA9IGZpbGVzeXN0ZW0uRmlsZVN5c3RlbSgpCisK KyAgICBjID0gY29uZmlnLkNvbmZpZyhlLCBmcykKKyAgICBwcmludCBjLmRlZmF1bHRfY29uZmln dXJhdGlvbigpCisKK2lmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CisgICAgbWFpbigpCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nv bmZpZ191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY29uZmlnX3VuaXR0ZXN0LnB5CmluZGV4IGVkNWFiOGI3MzA0ZTA1ZGVhNDcxOThm OWU0NDcyZmNjNTgwZDY1ZWIuLjliZWEwMTQ0MjAwNzA2OThlZmE2ODA1Yzc0MWQyM2QwZGFhYTNj ZjQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY29uZmlnX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnX3VuaXR0ZXN0LnB5CkBAIC0yNyw2ICsyNyw3IEBA CiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCiAKIGltcG9ydCBvcworaW1wb3J0IHN5cwogaW1wb3J0IHVuaXR0ZXN0 CiAKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgZXhlY3V0aXZlCkBAIC00MSwx NCArNDIsMTUgQEAgY2xhc3MgQ29uZmlnVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVm IHRlYXJEb3duKHNlbGYpOgogICAgICAgICBjb25maWcuY2xlYXJfY2FjaGVkX2NvbmZpZ3VyYXRp b24oKQogCi0gICAgZGVmIG1ha2VfY29uZmlnKHNlbGYsIG91dHB1dD0nJywgZmlsZXM9e30sIGV4 aXRfY29kZT0wKToKLSAgICAgICAgZSA9IGV4ZWN1dGl2ZV9tb2NrLk1vY2tFeGVjdXRpdmUyKG91 dHB1dD1vdXRwdXQsIGV4aXRfY29kZT1leGl0X2NvZGUpCisgICAgZGVmIG1ha2VfY29uZmlnKHNl bGYsIG91dHB1dD0nJywgZmlsZXM9e30sIGV4aXRfY29kZT0wLCBleGNlcHRpb249Tm9uZSk6Cisg ICAgICAgIGUgPSBleGVjdXRpdmVfbW9jay5Nb2NrRXhlY3V0aXZlMihvdXRwdXQ9b3V0cHV0LCBl eGl0X2NvZGU9ZXhpdF9jb2RlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZXhjZXB0aW9uPWV4Y2VwdGlvbikKICAgICAgICAgZnMgPSBmaWxlc3lzdGVtX21vY2su TW9ja0ZpbGVTeXN0ZW0oZmlsZXMpCiAgICAgICAgIHJldHVybiBjb25maWcuQ29uZmlnKGUsIGZz KQogCiAgICAgZGVmIGFzc2VydF9jb25maWd1cmF0aW9uKHNlbGYsIGNvbnRlbnRzLCBleHBlY3Rl ZCk6CiAgICAgICAgICMgVGhpcyB0ZXN0cyB0aGF0IGEgY29uZmlndXJhdGlvbiBmaWxlIGNvbnRh aW5pbmcKLSAgICAgICAgIyBfY29udGVudHNfIGVuZHNkIHVwIGJlaW5nIGludGVycHJldGVkIGFz IF9leHBlY3RlZF8uCisgICAgICAgICMgX2NvbnRlbnRzXyBlbmRzIHVwIGJlaW5nIGludGVycHJl dGVkIGFzIF9leHBlY3RlZF8uCiAgICAgICAgIGMgPSBzZWxmLm1ha2VfY29uZmlnKCdmb28nLCB7 J2Zvby9Db25maWd1cmF0aW9uJzogY29udGVudHN9KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KGMuZGVmYXVsdF9jb25maWd1cmF0aW9uKCksIGV4cGVjdGVkKQogCkBAIC0xMTksNiArMTIxLDQx IEBAIGNsYXNzIENvbmZpZ1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFz c2VydF9jb25maWd1cmF0aW9uKCdVbmtub3duJywgJ1Vua25vd24nKQogICAgICAgICBvYy5yZXN0 b3JlX291dHB1dCgpCiAKKyAgICBkZWYgdGVzdF9kZWZhdWx0X2NvbmZpZ3VyYXRpb25fX3N0YW5k YWxvbmUoc2VsZik6CisgICAgICAgICMgRklYTUU6IFRoaXMgdGVzdCBydW5zIGEgc3RhbmRhbG9u ZSBweXRob24gc2NyaXB0IHRvIHRlc3QKKyAgICAgICAgIyByZWFkaW5nIHRoZSBkZWZhdWx0IGNv bmZpZ3VyYXRpb24gdG8gd29yayBhcm91bmQgYW55IHBvc3NpYmxlCisgICAgICAgICMgY2FjaGlu ZyAvIHJlc2V0IGJ1Z3MuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zz9pZD00 OTM2MAorICAgICAgICAjIGZvciB0aGUgbW90aXZhdGlvbi4gV2UgY2FuIHJlbW92ZSB0aGlzIHRl c3Qgd2hlbiB3ZSByZW1vdmUgdGhlCisgICAgICAgICMgZ2xvYmFsIGNvbmZpZ3VyYXRpb24gY2Fj aGUgaW4gY29uZmlnLnB5LgorICAgICAgICBlID0gZXhlY3V0aXZlLkV4ZWN1dGl2ZSgpCisgICAg ICAgIGZzID0gZmlsZXN5c3RlbS5GaWxlU3lzdGVtKCkKKyAgICAgICAgYyA9IGNvbmZpZy5Db25m aWcoZSwgZnMpCisgICAgICAgIHNjcmlwdCA9IGMucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdXZWJL aXRUb29scycsICdTY3JpcHRzJywKKyAgICAgICAgICAgICd3ZWJraXRweScsICdsYXlvdXRfdGVz dHMnLCAncG9ydCcsICdjb25maWdfc3RhbmRhbG9uZS5weScpCisKKyAgICAgICAgIyBOb3RlOiBk b24ndCB1c2UgJ1JlbGVhc2UnIGhlcmUsIHNpbmNlIHRoYXQncyB0aGUgbm9ybWFsIGRlZmF1bHQu CisgICAgICAgIGV4cGVjdGVkID0gJ0RlYnVnJworCisgICAgICAgIGFyZ3MgPSBbc3lzLmV4ZWN1 dGFibGUsIHNjcmlwdCwgJy0tbW9jaycsIGV4cGVjdGVkXQorICAgICAgICBhY3R1YWwgPSBlLnJ1 bl9jb21tYW5kKGFyZ3MpLnJzdHJpcCgpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoYWN0dWFs LCBleHBlY3RlZCkKKworICAgIGRlZiB0ZXN0X2RlZmF1bHRfY29uZmlndXJhdGlvbl9fbm9fcGVy bChzZWxmKToKKyAgICAgICAgIyBXZSBuZWVkIHBlcmwgdG8gcnVuIHdlYmtpdC1idWlsZC1kaXJl Y3RvcnkgdG8gZmluZCBvdXQgd2hlcmUgdGhlCisgICAgICAgICMgZGVmYXVsdCBjb25maWd1cmF0 aW9uIGZpbGUgaXMuIFNlZSB3aGF0IGhhcHBlbnMgaWYgcGVybCBpc24ndAorICAgICAgICAjIGlu c3RhbGxlZC4gKFdlIHNob3VsZCBnZXQgdGhlIGRlZmF1bHQgdmFsdWUsICdSZWxlYXNlJykuCisg ICAgICAgIGMgPSBzZWxmLm1ha2VfY29uZmlnKGV4Y2VwdGlvbj1PU0Vycm9yKQorICAgICAgICBh Y3R1YWwgPSBjLmRlZmF1bHRfY29uZmlndXJhdGlvbigpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoYWN0dWFsLCAnUmVsZWFzZScpCisKKyAgICBkZWYgdGVzdF9kZWZhdWx0X2NvbmZpZ3VyYXRp b25fX3NjcmlwdGVycm9yKHNlbGYpOgorICAgICAgICAjIFdlIHJ1biB3ZWJraXQtYnVpbGQtZGly ZWN0b3J5IHRvIGZpbmQgb3V0IHdoZXJlIHRoZSBkZWZhdWx0CisgICAgICAgICMgY29uZmlndXJh dGlvbiBmaWxlIGlzLiBTZWUgd2hhdCBoYXBwZW5zIGlmIHRoYXQgc2NyaXB0IGZhaWxzLgorICAg ICAgICAjIChXZSBzaG91bGQgZ2V0IHRoZSBkZWZhdWx0IHZhbHVlLCAnUmVsZWFzZScpLgorICAg ICAgICBjID0gc2VsZi5tYWtlX2NvbmZpZyhleGNlcHRpb249ZXhlY3V0aXZlLlNjcmlwdEVycm9y KCkpCisgICAgICAgIGFjdHVhbCA9IGMuZGVmYXVsdF9jb25maWd1cmF0aW9uKCkKKyAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChhY3R1YWwsICdSZWxlYXNlJykKKwogICAgIGRlZiB0ZXN0X3BhdGhf ZnJvbV93ZWJraXRfYmFzZShzZWxmKToKICAgICAgICAgIyBGSVhNRTogV2UgdXNlIGEgcmVhbCBm aWxlc3lzdGVtIGhlcmUuIFNob3VsZCB0aGlzIG1vdmUgdG8gYQogICAgICAgICAjIG1vY2tlZCBv bmU/Cg==