122465 2013-10-07 13:05:22 -0700 Always force discrete mode when running layout tests 2013-10-07 16:01:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue darin glenn oldest_to_newest 937208 0 andersca 2013-10-07 13:05:22 -0700 Always force discrete mode when running layout tests 937211 1 213615 andersca 2013-10-07 13:10:56 -0700 Created attachment 213615 Patch 937216 2 213615 thorton 2013-10-07 13:20:46 -0700 Comment on attachment 213615 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213615&action=review > Tools/DumpRenderTree/mac/LayoutTestHelper.m:173 > + while ((option = getopt_long(argc, (char * const *)argv, "", options, NULL)) != -1) { not sure those stars are right > Tools/DumpRenderTree/mac/LayoutTestHelper.m:175 > + case '?': // unknown or ambiguous option case shouldn’t be indented 937218 3 andersca 2013-10-07 13:26:58 -0700 Committed r157057: <http://trac.webkit.org/changeset/157057> 937258 4 darin 2013-10-07 16:00:00 -0700 This is causing lots of failures on the test bots. 71 tests are failing on most Mac bots (Lion, Mountain Lion, Release, Debug, WebKit1, WebKit2). 937261 5 darin 2013-10-07 16:01:38 -0700 And I guess you knew that because http://trac.webkit.org/changeset/157063 is an attempt to fix it. 213615 2013-10-07 13:10:56 -0700 2013-10-07 13:20:45 -0700 Patch bug-122465-20131007131057.patch text/plain 10356 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3MDQ5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjFmODUzZjQ3NmUwOTNlOWUzZGEzNTU5MTZhZmIwYjFk ODc4ODZjOS4uOWIxM2VmMTc5YTU4MTI4MzY3ZWNlZTNlZTY3YjJjYTQwYjcxNDNhMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDEzLTEwLTA3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisK KyAgICAgICAgQWx3YXlzIGZvcmNlIGRpc2NyZXRlIG1vZGUgd2hlbiBydW5uaW5nIGxheW91dCB0 ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIy NDY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhp cyBzaG91bGQgc3BlZWQgdXAgV2ViR0wgdGVzdHMgYW5kIGhvcGVmdWxseSBwcmV2ZW50IHJhY2Ug Y29uZGl0aW9ucyB0aGF0IG1heSBjYXVzZSB3aW5kb3cgc2VydmVyIGNyYXNoZXMgZnJvbSBoYXBw ZW5pbmcuCisgICAgICAgIAorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgIExpbmsgd2l0aCBJT0tpdC4KKwor ICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0SGVscGVyLm06CisgICAgICAg IChpbnN0YWxsTGF5b3V0VGVzdENvbG9yUHJvZmlsZSk6CisgICAgICAgIENoZWNrIGluc3RhbGxD b2xvclByb2ZpbGUuCisKKyAgICAgICAgKHJlc3RvcmVVc2VyQ29sb3JQcm9maWxlKToKKyAgICAg ICAgQ2hlY2sgaW5zdGFsbENvbG9yUHJvZmlsZS4KKworICAgICAgICAobG9ja0Rvd25EaXNjcmV0 ZUdyYXBoaWNzKToKKyAgICAgICAgTmV3IGZ1bmN0aW9uIHRvIGZvcmNlIGRpc2NyZXRlIGdyYXBo aWNzLgorCisgICAgICAgIChtYWluKToKKyAgICAgICAgQWRkICctLWluc3RhbGwtY29sb3ItcHJv ZmlsZScgb3B0aW9uLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv Y29udHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKE1hbmFnZXIuX3NldF91cF9ydW4pOgor ICAgICAgICBBbHdheXMgc3RhcnQgdGhlIGhlbHBlciwgYnV0IHBhc3Mgc2VsZi5fb3B0aW9ucy5w aXhlbF90ZXN0cyB0byBpdC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMu cHk6CisgICAgICAgIChNYWNQb3J0LnN0YXJ0X2hlbHBlcik6CisgICAgICAgIFBhc3MgLS1pbnN0 YWxsLWNvbG9yLXByb2ZpbGUnIHRvIHRoZSBoZWxwZXIgaWYgcGl4ZWxfdGVzdHMgaXMgdHJ1ZS4K KwogMjAxMy0xMC0wNyAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNv bGxhYm9yYS5jb20+CiAKICAgICAgICAgW0dUS10gRmFpbHMgdG8gYnVpbGQgd2l0aCBqaGJ1aWxk IHdpdGggbmV3ZXIgc3lzdGVtIGdsaWIKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L0R1bXBSZW5kZXJUcmVlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGQ1 ZjJiYjEzOGEzOTUyNGUwMGU3ZThhODJlZmM2MmE1MzQ4YjdjYzUuLjUwMDlhMDRmYzVhMGI5MTAz MTQ0NzRjYTY0YTBiNzg2OTYyM2YzNTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L0R1bXBSZW5kZXJUcmVlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvVG9vbHMvRHVt cFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAt NDYsNiArNDYsNyBAQAogCQkxQTRDQ0Q0RjE3MTM3NUEzMDA5ODEwNDAgLyogVG9TdHJpbmdBbmRW YWx1ZU9mT2JqZWN0LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDFBNENDRDRFMTcxMzc1QTMwMDk4MTA0MCAvKiBUb1N0cmluZ0FuZFZhbHVlT2ZPYmpl Y3QuY3BwICovOyB9OwogCQkxQTVDQzFGNTEzN0REMkVDMDBBNUQ3RTcgLyogR2V0VVJMV2l0aEph dmFTY3JpcHRVUkwuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMUE1Q0MxRjMxMzdERDJFQzAwQTVEN0U3IC8qIEdldFVSTFdpdGhKYXZhU2NyaXB0VVJM LmNwcCAqLzsgfTsKIAkJMUE2NkMzNTExNDU3NkE5MjAwOTlBMTE1IC8qIENvbnRlbnRzU2NhbGVG YWN0b3IuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g MUE2NkMzNEYxNDU3NkE5MjAwOTlBMTE1IC8qIENvbnRlbnRzU2NhbGVGYWN0b3IuY3BwICovOyB9 OworCQkxQTc5NjEwNzE4MDM0NTRDMDBGRTQyQ0QgLyogSU9LaXQuZnJhbWV3b3JrIGluIEZyYW1l d29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE3OTYxMDYxODAzNDU0 QzAwRkU0MkNEIC8qIElPS2l0LmZyYW1ld29yayAqLzsgfTsKIAkJMUE4RjAyRTgwQkI5QjRFQzAw OENGQTM0IC8qIFRlc3RPYmplY3QuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDFBOEYwMjRDMEJCOUIwNTYwMDhDRkEzNCAvKiBUZXN0T2JqZWN0LmggKi87 IH07CiAJCTFBQzZDODQ5MEQwNzYzODYwMENEMzE2MSAvKiBtYWluLmNwcCBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQzZDNzdGMEQwNzU4OUIwMENEMzE2 MSAvKiBtYWluLmNwcCAqLzsgfTsKIAkJMUFDNkM4NEEwRDA3NjM4NjAwQ0QzMTYxIC8qIFBsdWdp bk9iamVjdC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSAxQUM2Qzc4MDBEMDc1ODlCMDBDRDMxNjEgLyogUGx1Z2luT2JqZWN0LmNwcCAqLzsgfTsKQEAg LTI2Myw2ICsyNjQsNyBAQAogCQkxQTRDQ0Q0RTE3MTM3NUEzMDA5ODEwNDAgLyogVG9TdHJpbmdB bmRWYWx1ZU9mT2JqZWN0LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9 IFRvU3RyaW5nQW5kVmFsdWVPZk9iamVjdC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTFBNUNDMUYzMTM3REQyRUMwMEE1RDdFNyAvKiBHZXRVUkxXaXRoSmF2YVNjcmlwdFVSTC5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBHZXRVUkxXaXRoSmF2YVNj cmlwdFVSTC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBNjZDMzRGMTQ1NzZB OTIwMDk5QTExNSAvKiBDb250ZW50c1NjYWxlRmFjdG9yLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgcGF0aCA9IENvbnRlbnRzU2NhbGVGYWN0b3IuY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OworCQkxQTc5NjEwNjE4MDM0NTRDMDBGRTQyQ0QgLyogSU9LaXQuZnJhbWV3 b3JrICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gd3Jh cHBlci5mcmFtZXdvcms7IG5hbWUgPSBJT0tpdC5mcmFtZXdvcms7IHBhdGggPSAuLi8uLi8uLi8u Li8uLi8uLi8uLi9TeXN0ZW0vTGlicmFyeS9GcmFtZXdvcmtzL0lPS2l0LmZyYW1ld29yazsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUE4RjAyNEMwQkI5QjA1NjAwOENGQTM0IC8qIFRl c3RPYmplY3QuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gVGVzdE9iamVjdC5o OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQUM2Qzc3RjBEMDc1ODlCMDBDRDMxNjEg LyogbWFpbi5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBtYWluLmNw cDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFDNkM3ODAwRDA3NTg5QjAwQ0QzMTYx IC8qIFBsdWdpbk9iamVjdC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGgg PSBQbHVnaW5PYmplY3QuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNDE4LDYg KzQyMCw3IEBACiAJCQkJMkQ0MDNGMDUxNTA4NzFGOTAwNTM1OEQyIC8qIENhcmJvbi5mcmFtZXdv cmsgaW4gRnJhbWV3b3JrcyAqLywKIAkJCQkyRDQwM0YwNjE1MDg3MUY5MDA1MzU4RDIgLyogQ29j b2EuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCiAJCQkJMkQ0MDNGMDgxNTA4NzFGOTAwNTM1 OEQyIC8qIE9wZW5HTC5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLywKKwkJCQkxQTc5NjEwNzE4 MDM0NTRDMDBGRTQyQ0QgLyogSU9LaXQuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCiAJCQkp OwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07CkBAIC02 NTYsNiArNjU5LDcgQEAKIAkJQTgwM0ZGNjQwOUNBQUNDMTAwOUIyQTM3IC8qIEZyYW1ld29ya3Mg Ki8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAorCQkJCTFBNzk2MTA2 MTgwMzQ1NEMwMEZFNDJDRCAvKiBJT0tpdC5mcmFtZXdvcmsgKi8sCiAJCQkJQkNCMjg0QjIwQ0ZB ODJDQjAwN0U1MzNFIC8qIEFwcGxpY2F0aW9uU2VydmljZXMuZnJhbWV3b3JrICovLAogCQkJCUFF ODI1N0VGMDhEMjIzODkwMDA1MDdBQiAvKiBDYXJib24uZnJhbWV3b3JrICovLAogCQkJCUE4NEY2 MDg5MDhCMTM2REEwMEU5NzQ1RiAvKiBDb2NvYS5mcmFtZXdvcmsgKi8sCmRpZmYgLS1naXQgYS9U b29scy9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdEhlbHBlci5tIGIvVG9vbHMvRHVtcFJl bmRlclRyZWUvbWFjL0xheW91dFRlc3RIZWxwZXIubQppbmRleCAxZmU4N2VjNTM4YjI3NjhkZTUw NWQxN2VjNDBhMjcwZjZhMDE0NTQzLi45YzFhMjU3OTdjODU4ZjI0YTg4ZmQ4NmE2MjliYWEwNGY3 YzQ5NmYwIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdEhl bHBlci5tCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0SGVscGVyLm0K QEAgLTMxLDYgKzMxLDcgQEAKIAogI2ltcG9ydCA8QXBwS2l0L0FwcEtpdC5oPgogI2ltcG9ydCA8 QXBwbGljYXRpb25TZXJ2aWNlcy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+CisjaW1wb3J0IDxnZXRv cHQuaD4KICNpbXBvcnQgPHNpZ25hbC5oPgogI2ltcG9ydCA8c3RkaW8uaD4KICNpbXBvcnQgPHN0 ZGxpYi5oPgpAQCAtNDAsMTAgKzQxLDE1IEBACiAvLyB0ZXN0IHNjcmlwdCwgc28gaXQgY2FuIGRv IHRoZSBqb2IgZm9yIG11bHRpcGxlIER1bXBSZW5kZXJUcmVlIHdoaWxlIHRoZXkgYXJlCiAvLyBy dW5uaW5nIGxheW91dCB0ZXN0cy4KIAorc3RhdGljIGludCBpbnN0YWxsQ29sb3JQcm9maWxlID0g ZmFsc2U7CisKIHN0YXRpYyBDRlVSTFJlZiBzVXNlckNvbG9yUHJvZmlsZVVSTDsKIAogc3RhdGlj IHZvaWQgaW5zdGFsbExheW91dFRlc3RDb2xvclByb2ZpbGUoKQogeworICAgIGlmICghaW5zdGFs bENvbG9yUHJvZmlsZSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgLy8gVG8gbWFrZSBzdXJlIHdl IGdldCBjb25zaXN0ZW50IGNvbG9ycyAobm90IGRlcGVuZGVudCBvbiB0aGUgY2hvc2VuIGNvbG9y CiAgICAgLy8gc3BhY2Ugb2YgdGhlIG1haW4gZGlzcGxheSksIHdlIGZvcmNlIHRoZSBnZW5lcmlj IFJHQiBjb2xvciBwcm9maWxlLgogICAgIC8vIFRoaXMgY2F1c2VzIGEgY2hhbmdlIHRoZSB1c2Vy IGNhbiBzZWUuCkBAIC0xMDgsNiArMTE0LDkgQEAgc3RhdGljIHZvaWQgaW5zdGFsbExheW91dFRl c3RDb2xvclByb2ZpbGUoKQogCiBzdGF0aWMgdm9pZCByZXN0b3JlVXNlckNvbG9yUHJvZmlsZSh2 b2lkKQogeworICAgIGlmICghaW5zdGFsbENvbG9yUHJvZmlsZSkKKyAgICAgICAgcmV0dXJuOwor CiAgICAgLy8gVGhpcyBpcyB1c2VkIGFzIGEgc2lnbmFsIGhhbmRsZXIsIGFuZCB0aHVzIHRoZSBj YWxscyBpbnRvIENvbG9yU3luYyBhcmUgdW5zYWZlLgogICAgIC8vIEJ1dCB3ZSBtaWdodCBhcyB3 ZWxsIHRyeSB0byByZXN0b3JlIHRoZSB1c2VyJ3MgY29sb3IgcHJvZmlsZSwgd2UncmUgZ29pbmcg ZG93biBhbnl3YXkuLi4KICAgICAKQEAgLTEyOSw4ICsxMzgsNDcgQEAgc3RhdGljIHZvaWQgc2lt cGxlU2lnbmFsSGFuZGxlcihpbnQgc2lnKQogICAgIGV4aXQoMTI4ICsgc2lnKTsKIH0KIAordm9p ZCBsb2NrRG93bkRpc2NyZXRlR3JhcGhpY3MoKQoreworICAgIG1hY2hfcG9ydF90IG1hc3RlclBv cnQ7CisgICAga2Vybl9yZXR1cm5fdCBrZXJuUmVzdWx0ID0gSU9NYXN0ZXJQb3J0KGJvb3RzdHJh cF9wb3J0LCAmbWFzdGVyUG9ydCk7CisgICAgaWYgKGtlcm5SZXN1bHQgIT0gS0VSTl9TVUNDRVNT KQorICAgICAgICByZXR1cm47CisgICAgQ0ZEaWN0aW9uYXJ5UmVmIGNsYXNzVG9NYXRjaCA9IElP U2VydmljZU1hdGNoaW5nKCJBcHBsZUdyYXBoaWNzQ29udHJvbCIpOworICAgIGlmICghY2xhc3NU b01hdGNoKQorICAgICAgICByZXR1cm47CisKKyAgICBpb19zZXJ2aWNlX3Qgc2VydmljZU9iamVj dCA9IElPU2VydmljZUdldE1hdGNoaW5nU2VydmljZShtYXN0ZXJQb3J0LCBjbGFzc1RvTWF0Y2gp OworICAgIGlmICghc2VydmljZU9iamVjdCkgeworICAgICAgICAvLyBUaGUgbWFjaGluZSBkb2Vz IG5vdCBhbGxvdyBjb250cm9sIG92ZXIgdGhlIGNob2ljZSBvZiBncmFwaGljcyBkZXZpY2UuCisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICAvLyBXZSdyZSBpbnRlbnRpb25hbGx5IGxlYWtp bmcgdGhpcyBpb19jb25uZWN0IGluIG9yZGVyIGZvciB0aGUgcHJvY2VzcyB0byBzdGF5IGxvY2tl ZCB0byBkaXNjcmV0ZSBncmFwaGljcworICAgIC8vIGZvciB0aGUgbGlmZXRpbWUgb2YgdGhlIHNl cnZpY2UgY29ubmVjdGlvbi4KKyAgICBzdGF0aWMgaW9fY29ubmVjdF90IHBlcm1hbmVudExvY2tE b3duU2VydmljZSA9IDA7CisKKyAgICAvLyBUaGlzIGNhbGwgc3RhbGxzIHVudGlsIHRoZSBncmFw aGljcyBkZXZpY2UgbG9jayBpcyBncmFudGVkLgorICAgIGtlcm5SZXN1bHQgPSBJT1NlcnZpY2VP cGVuKHNlcnZpY2VPYmplY3QsIG1hY2hfdGFza19zZWxmKCksIDEsICZwZXJtYW5lbnRMb2NrRG93 blNlcnZpY2UpOworICAgIElPT2JqZWN0UmVsZWFzZShzZXJ2aWNlT2JqZWN0KTsKK30KKwogaW50 IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKIHsKKyAgICBzdHJ1Y3Qgb3B0aW9uIG9wdGlv bnNbXSA9IHsKKyAgICAgICAgeyAiaW5zdGFsbC1jb2xvci1wcm9maWxlIiwgbm9fYXJndW1lbnQs ICZpbnN0YWxsQ29sb3JQcm9maWxlLCB0cnVlIH0sCisgICAgfTsKKworICAgIGludCBvcHRpb247 CisgICAgd2hpbGUgKChvcHRpb24gPSBnZXRvcHRfbG9uZyhhcmdjLCAoY2hhciAqIGNvbnN0ICop YXJndiwgIiIsIG9wdGlvbnMsIE5VTEwpKSAhPSAtMSkgeworICAgICAgICBzd2l0Y2ggKG9wdGlv bikgeworICAgICAgICAgICAgY2FzZSAnPyc6ICAgLy8gdW5rbm93biBvciBhbWJpZ3VvdXMgb3B0 aW9uCisgICAgICAgICAgICBjYXNlICc6JzogICAvLyBtaXNzaW5nIGFyZ3VtZW50CisgICAgICAg ICAgICAgICAgZXhpdCgxKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAg IH0KKwogICAgIE5TQXV0b3JlbGVhc2VQb29sKiBwb29sID0gW1tOU0F1dG9yZWxlYXNlUG9vbCBh bGxvY10gaW5pdF07CiAKICAgICAvLyBIb29rcyB0aGUgd2F5cyB3ZSBtaWdodCBnZXQgdG9sZCB0 byBjbGVhbiB1cC4uLgpAQCAtMTM4LDYgKzE4Niw4IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFy KiBhcmd2W10pCiAgICAgc2lnbmFsKFNJR0hVUCwgc2ltcGxlU2lnbmFsSGFuZGxlcik7CiAgICAg c2lnbmFsKFNJR1RFUk0sIHNpbXBsZVNpZ25hbEhhbmRsZXIpOwogCisgICAgbG9ja0Rvd25EaXNj cmV0ZUdyYXBoaWNzKCk7CisKICAgICAvLyBTYXZlIG9mZiB0aGUgY3VycmVudCBwcm9maWxlLCBh bmQgdGhlbiBpbnN0YWxsIHRoZSBsYXlvdXQgdGVzdCBwcm9maWxlLgogICAgIGluc3RhbGxMYXlv dXRUZXN0Q29sb3JQcm9maWxlKCk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CmluZGV4IDZiZGQ3ZTk1 MjdjODQwMDk4ZWI4OTEzYjdhYzE5MGFjMDJhZTQ2ZTguLjZhNjA0NjA4ZDYxODEwYWZjMDQ4NjQw NjVlM2Y3ZGVjNjcxYjYzYjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQpAQCAtMTQ5LDkgKzE0OSw4 IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKIAogICAgICAgICAjIFRoaXMgbXVzdCBiZSBzdGFy dGVkIGJlZm9yZSB3ZSBjaGVjayB0aGUgc3lzdGVtIGRlcGVuZGVuY2llcywKICAgICAgICAgIyBz aW5jZSB0aGUgaGVscGVyIG1heSBkbyB0aGluZ3MgdG8gbWFrZSB0aGUgc2V0dXAgY29ycmVjdC4K LSAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5waXhlbF90ZXN0czoKLSAgICAgICAgICAgIHNlbGYu X3ByaW50ZXIud3JpdGVfdXBkYXRlKCJTdGFydGluZyBwaXhlbCB0ZXN0IGhlbHBlciAuLi4iKQot ICAgICAgICAgICAgc2VsZi5fcG9ydC5zdGFydF9oZWxwZXIoKQorICAgICAgICBzZWxmLl9wcmlu dGVyLndyaXRlX3VwZGF0ZSgiU3RhcnRpbmcgaGVscGVyIC4uLiIpCisgICAgICAgIHNlbGYuX3Bv cnQuc3RhcnRfaGVscGVyKHNlbGYuX29wdGlvbnMucGl4ZWxfdGVzdHMpCiAKICAgICAgICAgIyBD aGVjayB0aGF0IHRoZSBzeXN0ZW0gZGVwZW5kZW5jaWVzICh0aGVtZXMsIGZvbnRzLCAuLi4pIGFy ZSBjb3JyZWN0LgogICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy5ub2NoZWNrX3N5c19kZXBz OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKaW5kZXggYzc0MzlhYzdiY2IzZWEwMTdmNmZj ZTEyNDZiOGYwY2E5NTE5OGMzZC4uZmQ0ZWQwMDc5MmVlNmEwMTVlMTFhNWM1ZTQ4NDQ5ZWE2MWI1 NDg2YSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjLnB5CkBAIC0yNzEsMTEgKzI3MSwxNCBA QCBjbGFzcyBNYWNQb3J0KEFwcGxlUG9ydCk6CiAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0xheW91 dFRlc3RIZWxwZXInCiAgICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKGJpbmFyeV9uYW1l KQogCi0gICAgZGVmIHN0YXJ0X2hlbHBlcihzZWxmKToKKyAgICBkZWYgc3RhcnRfaGVscGVyKHNl bGYsIHBpeGVsX3Rlc3RzPUZhbHNlKToKICAgICAgICAgaGVscGVyX3BhdGggPSBzZWxmLl9wYXRo X3RvX2hlbHBlcigpCiAgICAgICAgIGlmIGhlbHBlcl9wYXRoOgogICAgICAgICAgICAgX2xvZy5k ZWJ1ZygiU3RhcnRpbmcgbGF5b3V0IGhlbHBlciAlcyIgJSBoZWxwZXJfcGF0aCkKLSAgICAgICAg ICAgIHNlbGYuX2hlbHBlciA9IHNlbGYuX2V4ZWN1dGl2ZS5wb3BlbihbaGVscGVyX3BhdGhdLAor ICAgICAgICAgICAgYXJndW1lbnRzID0gW2hlbHBlcl9wYXRoXQorICAgICAgICAgICAgaWYgcGl4 ZWxfdGVzdHM6CisgICAgICAgICAgICAgICAgYXJndW1lbnRzLmFwcGVuZCgnLS1pbnN0YWxsLWNv bG9yLXByb2ZpbGUnKQorICAgICAgICAgICAgc2VsZi5faGVscGVyID0gc2VsZi5fZXhlY3V0aXZl LnBvcGVuKGFyZ3VtZW50cywKICAgICAgICAgICAgICAgICBzdGRpbj1zZWxmLl9leGVjdXRpdmUu UElQRSwgc3Rkb3V0PXNlbGYuX2V4ZWN1dGl2ZS5QSVBFLCBzdGRlcnI9Tm9uZSkKICAgICAgICAg ICAgIGlzX3JlYWR5ID0gc2VsZi5faGVscGVyLnN0ZG91dC5yZWFkbGluZSgpCiAgICAgICAgICAg ICBpZiBub3QgaXNfcmVhZHkuc3RhcnRzd2l0aCgncmVhZHknKToK