120207 2013-08-23 06:31:17 -0700 [Qt] Support architecture specific test expectations in NRWT 2014-02-03 03:26:59 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 67777 1 allan.jensen allan.jensen abrhm commit-queue dpranke galpeter glenn jturcotte kadam ossy rniwa zarvai oldest_to_newest 920207 0 allan.jensen 2013-08-23 06:31:17 -0700 We have been missing support for adding qt-arm to the search path in NRWT for some time and since many tests also fail specifically on 32bit x86, it would be great if we could specifically skip tests on either of these platforms. 920208 1 209455 allan.jensen 2013-08-23 06:34:49 -0700 Created attachment 209455 Patch 920929 2 ossy 2013-08-26 02:23:57 -0700 *** Bug 67777 has been marked as a duplicate of this bug. *** 920930 3 209455 ossy 2013-08-26 02:28:37 -0700 Comment on attachment 209455 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=209455&action=review > Tools/Scripts/webkitpy/port/qt.py:146 > + # | > + # (qt-x86|qt-x64|qt-arm) > # \ > # (qt-linux|qt-mac|qt-win) > # | What if removing qt-linux, qt-mac and qt-mac at all? - qt-linux: empty, haven't been used ever - qt-win: empty, nobody tried to run layout tests on win in the past - qt-mac: no bot, not maintained long long time ago (last skipping was on 2012.Jun 20. - r120808) 920939 4 galpeter 2013-08-26 03:02:28 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=209455&action=review > Tools/Scripts/webkitpy/port/qt.py:133 > + return py_machine Shouldn't we give some kind of warning/error in case that there is no match to any of the known architecture? It should not be a really common case, but maybe it's better if we play it really safe. 920951 5 allan.jensen 2013-08-26 03:34:43 -0700 (In reply to comment #4) > View in context: https://bugs.webkit.org/attachment.cgi?id=209455&action=review > > > Tools/Scripts/webkitpy/port/qt.py:133 > > + return py_machine > > Shouldn't we give some kind of warning/error in case that there is no match to any of the known architecture? It should not be a really common case, but maybe it's better if we play it really safe. It could return empty string that would make sure the architecture search path doesn't get added. Though this version means anyone running a sh4 or mips architecture could add their own expectations. 923907 6 210337 allan.jensen 2013-09-03 02:07:13 -0700 Created attachment 210337 Patch Do not add search paths for unknown architectures 923909 7 allan.jensen 2013-09-03 02:09:20 -0700 (In reply to comment #3) > (From update of attachment 209455 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=209455&action=review > > > Tools/Scripts/webkitpy/port/qt.py:146 > > + # | > > + # (qt-x86|qt-x64|qt-arm) > > # \ > > # (qt-linux|qt-mac|qt-win) > > # | > > What if removing qt-linux, qt-mac and qt-mac at all? > - qt-linux: empty, haven't been used ever > - qt-win: empty, nobody tried to run layout tests on win in the past > - qt-mac: no bot, not maintained long long time ago (last skipping was on 2012.Jun 20. - r120808) I doubt it will ever be used in trunk, but I might try to run the test on other platforms in the branch (if possible). Anyway, we can remove the other operating systems in another patch. 935702 8 210337 andersca 2013-10-02 21:41:52 -0700 Comment on attachment 210337 Patch Qt has been removed, clearing review flags. 975776 9 jturcotte 2014-02-03 03:26:59 -0800 === Bulk closing of Qt bugs === If you believe that this bug report is still relevant for a non-Qt port of webkit.org, please re-open it and remove [Qt] from the summary. If you believe that this is still an important QtWebKit bug, please fill a new report at https://bugreports.qt-project.org and add a link to this issue. See http://qt-project.org/wiki/ReportingBugsInQt for additional guidelines. 209455 2013-08-23 06:34:49 -0700 2013-09-03 02:07:06 -0700 Patch bug-120207-20130823153448.patch text/plain 9009 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0NDgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzNlN2FhMWRjMjgwM2ZmZDZiM2Y4ODdjZDdkZmQ5OTAx MzkxNWYwZC4uZWFjMGIwZTk1ZGY4NGVlNmU5Yzc4YjMxNjc0NzUyNGIxY2QzNzc4NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDEzLTA4LTIzICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGln aWEuY29tPgorCisgICAgICAgIFtRdF0gU3VwcG9ydCBhcmNoaXRlY3R1cmUgc3BlY2lmaWMgdGVz dCBleHBlY3RhdGlvbnMgaW4gTlJXVAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIwMjA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGFyY2hpdGVjdHVyZSBzcGVjaWZpYyB0ZXN0IGV4cGVjdGF0aW9u cyB0byB0aGUgc2VhcmNoIHBhdGguCisgICAgICAgIFdlIHVzZSB0aGUgcG9ydC5fYXJjaGl0ZWN0 dXJlIGFuZCBwb3J0LmFyY2hpdGVjdHVyZSgpIHByb3BlcnRpZXMKKyAgICAgICAgYW5kIG1ldGhv ZCBhbHNvIHVzZWQgYnkgTWFjLCBhbmQgdXBkYXRlIHRoZSB1bml0LXRlc3RzIHRvIGNvdmVyCisg ICAgICAgIHRoZSBuZXcgc2VhcmNoIHBhdGhzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9wb3J0L3F0LnB5OgorICAgICAgICAoUXRQb3J0KToKKyAgICAgICAgKFF0UG9ydC5fX2luaXRf Xyk6CisgICAgICAgIChRdFBvcnQuX2dlbmVyYXRlX2FsbF90ZXN0X2NvbmZpZ3VyYXRpb25zKToK KyAgICAgICAgKFF0UG9ydC5wb3J0X2FyY2hpdGVjdHVyZSk6CisgICAgICAgIChRdFBvcnQuX3Nl YXJjaF9wYXRocyk6CisgICAgICAgIChRdFBvcnQuX3BvcnRfc3BlY2lmaWNfZXhwZWN0YXRpb25z X2ZpbGVzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvcXRfdW5pdHRlc3QucHk6 CisgICAgICAgIChRdFBvcnRUZXN0KToKKyAgICAgICAgKFF0UG9ydFRlc3QuX2Fzc2VydF9zZWFy Y2hfcGF0aCk6CisgICAgICAgIChRdFBvcnRUZXN0Ll9hc3NlcnRfZXhwZWN0YXRpb25zX2ZpbGVz KToKKwogMjAxMy0wOC0yMyAgUGV0ZXIgR2FsICA8Z2FscGV0ZXJAaW5mLnUtc3plZ2VkLmh1Pgog CiAgICAgICAgIFtXVFJdIFNob3VsZCBkdW1wIGFzIHRleHQgd2hlbiB0aGUgbWltZXR5cGUgaXMg dGV4dC9wbGFpbgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3F0LnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3F0LnB5CmluZGV4IDZkODJkNTQ1Y2ZlMjE3 MTQzMmNlMTJiMTJhMmQ4NjUzNGFiMGJjM2EuLmJlYmZhOWY0ODViOTM0NGU0YzJiMjhkOWQ3Y2Zi ZDU5ZGYwYmI2ZmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9xdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvcXQucHkKQEAgLTQ1LDYgKzQ1LDcg QEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiBjbGFzcyBRdFBvcnQoUG9y dCk6CiAgICAgQUxMX1ZFUlNJT05TID0gWydsaW51eCcsICd3aW4nLCAnbWFjJ10KKyAgICBBTExf QVJDSElURUNUVVJFUyA9IFsneDg2JywgJ3g2NCcsICdhcm0nXQogICAgIHBvcnRfbmFtZSA9ICJx dCIKIAogICAgIGRlZiBfd2syX3BvcnRfbmFtZShzZWxmKToKQEAgLTYzLDYgKzY0LDEwIEBAIGNs YXNzIFF0UG9ydChQb3J0KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1l LCAqKmt3YXJncyk6CiAgICAgICAgIHN1cGVyKFF0UG9ydCwgc2VsZikuX19pbml0X18oaG9zdCwg cG9ydF9uYW1lLCAqKmt3YXJncykKIAorICAgICAgICBzZWxmLl9hcmNoaXRlY3R1cmUgPSBzZWxm LmdldF9vcHRpb24oJ2FyY2hpdGVjdHVyZScpCisgICAgICAgIGlmIG5vdCBzZWxmLl9hcmNoaXRl Y3R1cmU6CisgICAgICAgICAgICBzZWxmLl9hcmNoaXRlY3R1cmUgPSBzZWxmLnBvcnRfYXJjaGl0 ZWN0dXJlKCkKKwogICAgICAgICBzZWxmLl9vcGVyYXRpbmdfc3lzdGVtID0gcG9ydF9uYW1lLnJl cGxhY2UoJ3F0LScsICcnKQogCiAgICAgICAgICMgRklYTUU6IFdoeSBpcyB0aGlzIGJlaW5nIHNl dCBhdCBhbGw/CkBAIC03Miw3ICs3Nyw4IEBAIGNsYXNzIFF0UG9ydChQb3J0KToKICAgICAgICAg Y29uZmlndXJhdGlvbnMgPSBbXQogICAgICAgICBmb3IgdmVyc2lvbiBpbiBzZWxmLkFMTF9WRVJT SU9OUzoKICAgICAgICAgICAgIGZvciBidWlsZF90eXBlIGluIHNlbGYuQUxMX0JVSUxEX1RZUEVT OgotICAgICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb25zLmFwcGVuZChUZXN0Q29uZmlndXJhdGlv bih2ZXJzaW9uPXZlcnNpb24sIGFyY2hpdGVjdHVyZT0neDg2JywgYnVpbGRfdHlwZT1idWlsZF90 eXBlKSkKKyAgICAgICAgICAgICAgICBmb3IgYXJjaCBpbiBzZWxmLkFMTF9BUkNISVRFQ1RVUkVT OgorICAgICAgICAgICAgICAgICAgICBjb25maWd1cmF0aW9ucy5hcHBlbmQoVGVzdENvbmZpZ3Vy YXRpb24odmVyc2lvbj12ZXJzaW9uLCBhcmNoaXRlY3R1cmU9YXJjaCwgYnVpbGRfdHlwZT1idWls ZF90eXBlKSkKICAgICAgICAgcmV0dXJuIGNvbmZpZ3VyYXRpb25zCiAKICAgICBkZWYgX2J1aWxk X2RyaXZlcihzZWxmKToKQEAgLTExNiwxMiArMTIyLDI1IEBAIGNsYXNzIFF0UG9ydChQb3J0KToK ICAgICAgICAgICAgIHZlcnNpb24gPSAnNS4wJwogICAgICAgICByZXR1cm4gdmVyc2lvbgogCisg ICAgZGVmIHBvcnRfYXJjaGl0ZWN0dXJlKHNlbGYpOgorICAgICAgICBweV9tYWNoaW5lID0gcGxh dGZvcm0ubWFjaGluZSgpCisgICAgICAgIGlmICdpMzg2JyA9PSBweV9tYWNoaW5lOgorICAgICAg ICAgICAgcmV0dXJuICd4ODYnCisgICAgICAgIGlmICd4ODZfNjQnID09IHB5X21hY2hpbmU6Cisg ICAgICAgICAgICByZXR1cm4gJ3g2NCcKKyAgICAgICAgaWYgJ2FybScgaW4gcHlfbWFjaGluZToK KyAgICAgICAgICAgIHJldHVybiAnYXJtJworICAgICAgICByZXR1cm4gcHlfbWFjaGluZQorCisK ICAgICBkZWYgX3NlYXJjaF9wYXRocyhzZWxmKToKICAgICAgICAgIyAgICAgICAgICAgICAgICAg cXQtbWFjLXdrMgogICAgICAgICAjICAgICAgICAgICAgICAgIC8KICAgICAgICAgIyAgICAgICBx dC13azEgIHF0LXdrMgogICAgICAgICAjICAgICAgICAgICAgIFwvCiAgICAgICAgICMgICAgICAg ICAgIHF0LTUueAorICAgICAgICAjICAgICAgICAgICAgICB8CisgICAgICAgICMgICAgIChxdC14 ODZ8cXQteDY0fHF0LWFybSkKICAgICAgICAgIyAgICAgICAgICAgICAgIFwKICAgICAgICAgIyAg ICAocXQtbGludXh8cXQtbWFjfHF0LXdpbikKICAgICAgICAgIyAgICAgICAgICAgICAgICB8CkBA IC0xMzgsNiArMTU3LDEwIEBAIGNsYXNzIFF0UG9ydChQb3J0KToKIAogICAgICAgICBzZWFyY2hf cGF0aHMuYXBwZW5kKCdxdC0nICsgc2VsZi5xdF92ZXJzaW9uKCkpCiAKKyAgICAgICAgYXJjaGl0 ZWN0dXJlID0gc2VsZi5hcmNoaXRlY3R1cmUoKQorICAgICAgICBpZiBhcmNoaXRlY3R1cmU6Cisg ICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCdxdC0nICsgYXJjaGl0ZWN0dXJlKQorCiAg ICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5wb3J0X25hbWUgKyAnLScgKyBzZWxmLm9w ZXJhdGluZ19zeXN0ZW0oKSkKICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLnBvcnRf bmFtZSkKICAgICAgICAgcmV0dXJuIHNlYXJjaF9wYXRocwpAQCAtMTUxLDcgKzE3NCw3IEBAIGNs YXNzIFF0UG9ydChQb3J0KToKICAgICAgICAgICAgIHBhdGhzLmFwcGVuZCgnd2syJykKIAogICAg ICAgICAjIGV4cGVjdGF0aW9uc19maWxlcygpIHVzZXMgdGhlIGRpcmVjdG9yaWVzIGxpc3RlZCBp biBfc2VhcmNoX3BhdGhzIHJldmVyc2VkLgotICAgICAgICAjIGUuZy4gcXQgLT4gcXQtbGludXgg LT4gcXQtNS54IC0+IHF0LXdrMQorICAgICAgICAjIGUuZy4gcXQgLT4gcXQtbGludXggLT4gcXQt eDg2IC0+IHF0LTUueCAtPiBxdC13azEKICAgICAgICAgcmV0dXJuIGxpc3QocmV2ZXJzZWQoW3Nl bGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aChwKSwgJ1Rlc3RF eHBlY3RhdGlvbnMnKSBmb3IgcCBpbiBwYXRoc10pKQogCiAgICAgZGVmIHNldHVwX2Vudmlyb25f Zm9yX3NlcnZlcihzZWxmLCBzZXJ2ZXJfbmFtZT1Ob25lKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC9xdF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9xdF91bml0dGVzdC5weQppbmRleCAwZjBmNWYxN2NjOGE0MmE2NWY3MjcxMTkzZjEx OGJhODRkZWI1ZDg5Li5jNGY4YTA3YWUwN2QxNTRmODc1NmYzNjk2ODRkNDM3NWFmODkyY2FiIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvcXRfdW5pdHRlc3QucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3F0X3VuaXR0ZXN0LnB5CkBAIC00MiwxNyAr NDIsMTkgQEAgY2xhc3MgUXRQb3J0VGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAg ICAgcG9ydF9uYW1lID0gJ3F0LW1hYycKICAgICBwb3J0X21ha2VyID0gUXRQb3J0CiAgICAgc2Vh cmNoX3BhdGhzX2Nhc2VzID0gWwotICAgICAgICB7J3NlYXJjaF9wYXRocyc6WydxdC1tYWMtd2sy JywgJ3F0LXdrMicsICdxdC01LjAtd2syJywgJ3F0LTUuMCcsICdxdC1tYWMnLCAncXQnXSwgJ29z X25hbWUnOidtYWMnLCAndXNlX3dlYmtpdDInOlRydWUsICdxdF92ZXJzaW9uJzonNS4wJ30sCi0g ICAgICAgIHsnc2VhcmNoX3BhdGhzJzpbJ3F0LXdrMicsICdxdC01LjAtd2syJywgJ3F0LTUuMCcs ICdxdC13aW4nLCAncXQnXSwgJ29zX25hbWUnOid3aW4nLCAndXNlX3dlYmtpdDInOlRydWUsICdx dF92ZXJzaW9uJzonNS4wJ30sCi0gICAgICAgIHsnc2VhcmNoX3BhdGhzJzpbJ3F0LXdrMicsICdx dC01LjAtd2syJywgJ3F0LTUuMCcsICdxdC1saW51eCcsICdxdCddLCAnb3NfbmFtZSc6J2xpbnV4 JywgJ3VzZV93ZWJraXQyJzpUcnVlLCAncXRfdmVyc2lvbic6JzUuMCd9LAotCi0gICAgICAgIHsn c2VhcmNoX3BhdGhzJzpbJ3F0LXdrMScsICdxdC01LjAnLCAncXQtbWFjJywgJ3F0J10sICdvc19u YW1lJzonbWFjJywgJ3VzZV93ZWJraXQyJzpGYWxzZSwgJ3F0X3ZlcnNpb24nOic1LjAnfSwKLSAg ICAgICAgeydzZWFyY2hfcGF0aHMnOlsncXQtd2sxJywgJ3F0LTUuMCcsICdxdC13aW4nLCAncXQn XSwgJ29zX25hbWUnOid3aW4nLCAndXNlX3dlYmtpdDInOkZhbHNlLCAncXRfdmVyc2lvbic6JzUu MCd9LAotICAgICAgICB7J3NlYXJjaF9wYXRocyc6WydxdC13azEnLCAncXQtNS4wJywgJ3F0LWxp bnV4JywgJ3F0J10sICdvc19uYW1lJzonbGludXgnLCAndXNlX3dlYmtpdDInOkZhbHNlLCAncXRf dmVyc2lvbic6JzUuMCd9LAotICAgICAgICB7J3NlYXJjaF9wYXRocyc6WydxdC13azEnLCAncXQt NS4xJywgJ3F0LWxpbnV4JywgJ3F0J10sICdvc19uYW1lJzonbGludXgnLCAndXNlX3dlYmtpdDIn OkZhbHNlLCAncXRfdmVyc2lvbic6JzUuMSd9LAorICAgICAgICB7J3NlYXJjaF9wYXRocyc6Wydx dC1tYWMtd2syJywgJ3F0LXdrMicsICdxdC01LjAtd2syJywgJ3F0LTUuMCcsICdxdC14ODYnLCAn cXQtbWFjJywgJ3F0J10sICdvc19uYW1lJzonbWFjJywgJ3VzZV93ZWJraXQyJzpUcnVlLCAncXRf dmVyc2lvbic6JzUuMCd9LAorICAgICAgICB7J3NlYXJjaF9wYXRocyc6WydxdC13azInLCAncXQt NS4wLXdrMicsICdxdC01LjAnLCAncXQteDg2JywgJ3F0LXdpbicsICdxdCddLCAnb3NfbmFtZSc6 J3dpbicsICd1c2Vfd2Via2l0Mic6VHJ1ZSwgJ3F0X3ZlcnNpb24nOic1LjAnfSwKKyAgICAgICAg eydzZWFyY2hfcGF0aHMnOlsncXQtd2syJywgJ3F0LTUuMC13azInLCAncXQtNS4wJywgJ3F0LXg4 NicsICdxdC1saW51eCcsICdxdCddLCAnb3NfbmFtZSc6J2xpbnV4JywgJ3VzZV93ZWJraXQyJzpU cnVlLCAncXRfdmVyc2lvbic6JzUuMCd9LAorCisgICAgICAgIHsnc2VhcmNoX3BhdGhzJzpbJ3F0 LXdrMScsICdxdC01LjAnLCAncXQteDg2JywgJ3F0LW1hYycsICdxdCddLCAnb3NfbmFtZSc6J21h YycsICd1c2Vfd2Via2l0Mic6RmFsc2UsICdxdF92ZXJzaW9uJzonNS4wJ30sCisgICAgICAgIHsn c2VhcmNoX3BhdGhzJzpbJ3F0LXdrMScsICdxdC01LjAnLCAncXQteDg2JywgJ3F0LXdpbicsICdx dCddLCAnb3NfbmFtZSc6J3dpbicsICd1c2Vfd2Via2l0Mic6RmFsc2UsICdxdF92ZXJzaW9uJzon NS4wJ30sCisgICAgICAgIHsnc2VhcmNoX3BhdGhzJzpbJ3F0LXdrMScsICdxdC01LjAnLCAncXQt eDg2JywgJ3F0LWxpbnV4JywgJ3F0J10sICdvc19uYW1lJzonbGludXgnLCAndXNlX3dlYmtpdDIn OkZhbHNlLCAncXRfdmVyc2lvbic6JzUuMCd9LAorICAgICAgICB7J3NlYXJjaF9wYXRocyc6Wydx dC13azEnLCAncXQtNS4xJywgJ3F0LXg4NicsICdxdC1saW51eCcsICdxdCddLCAnb3NfbmFtZSc6 J2xpbnV4JywgJ3VzZV93ZWJraXQyJzpGYWxzZSwgJ3F0X3ZlcnNpb24nOic1LjEnfSwKKyAgICAg ICAgeydzZWFyY2hfcGF0aHMnOlsncXQtd2sxJywgJ3F0LTUuMScsICdxdC1hcm0nLCAncXQtbGlu dXgnLCAncXQnXSwgJ29zX25hbWUnOidsaW51eCcsICd1c2Vfd2Via2l0Mic6RmFsc2UsICdxdF92 ZXJzaW9uJzonNS4xJywgJ2FyY2hpdGVjdHVyZSc6J2FybSd9LAorICAgICAgICB7J3NlYXJjaF9w YXRocyc6WydxdC13azEnLCAncXQtNS4xJywgJ3F0LXg2NCcsICdxdC13aW4nLCAncXQnXSwgJ29z X25hbWUnOid3aW4nLCAndXNlX3dlYmtpdDInOkZhbHNlLCAncXRfdmVyc2lvbic6JzUuMScsICdh cmNoaXRlY3R1cmUnOid4NjQnfSwKICAgICBdCiAKLSAgICBkZWYgX2Fzc2VydF9zZWFyY2hfcGF0 aChzZWxmLCBzZWFyY2hfcGF0aHMsIG9zX25hbWUsIHVzZV93ZWJraXQyPUZhbHNlLCBxdF92ZXJz aW9uPSc1LjAnKToKKyAgICBkZWYgX2Fzc2VydF9zZWFyY2hfcGF0aChzZWxmLCBzZWFyY2hfcGF0 aHMsIG9zX25hbWUsIHVzZV93ZWJraXQyPUZhbHNlLCBxdF92ZXJzaW9uPSc1LjAnLCBhcmNoaXRl Y3R1cmU9J3g4NicpOgogICAgICAgICAjIEZJWE1FOiBQb3J0IGNvbnN0cnVjdG9ycyBzaG91bGQg bm90ICJwYXJzZSIgdGhlIHBvcnQgbmFtZSwgYnV0CiAgICAgICAgICMgcmF0aGVyIGJlIHBhc3Nl ZCBjb21wb25lbnRzIChkaXJlY3RseSBvciB2aWEgc2V0dGVycykuICBPbmNlCiAgICAgICAgICMg d2UgZml4IHRoYXQsIHRoaXMgbWV0aG9kIHdpbGwgbmVlZCBhIHJlLXdyaXRlLgpAQCAtNjAsMTEg KzYyLDExIEBAIGNsYXNzIFF0UG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgog ICAgICAgICBob3N0LmV4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKHNlbGYuX3F0X3ZlcnNpb24o cXRfdmVyc2lvbikpCiAgICAgICAgIHBvcnRfbmFtZSA9ICdxdC0nICsgb3NfbmFtZQogICAgICAg ICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoaG9zdD1ob3N0LCBxdF92ZXJzaW9uPXF0X3ZlcnNpb24s IHBvcnRfbmFtZT1wb3J0X25hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcHRp b25zPU1vY2tPcHRpb25zKHdlYmtpdF90ZXN0X3J1bm5lcj11c2Vfd2Via2l0MiwgcGxhdGZvcm09 J3F0JykpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25zPU1vY2tPcHRpb25z KHdlYmtpdF90ZXN0X3J1bm5lcj11c2Vfd2Via2l0MiwgcGxhdGZvcm09J3F0JywgYXJjaGl0ZWN0 dXJlPWFyY2hpdGVjdHVyZSkpCiAgICAgICAgIGFic29sdXRlX3NlYXJjaF9wYXRocyA9IG1hcChw b3J0Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCwgc2VhcmNoX3BhdGhzKQogICAgICAgICBzZWxmLmFz c2VydEVxdWFsKHBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKSwgYWJzb2x1dGVfc2VhcmNoX3Bh dGhzKQogCi0gICAgZGVmIF9hc3NlcnRfZXhwZWN0YXRpb25zX2ZpbGVzKHNlbGYsIHNlYXJjaF9w YXRocywgb3NfbmFtZSwgdXNlX3dlYmtpdDI9RmFsc2UsIHF0X3ZlcnNpb249JzUuMCcpOgorICAg IGRlZiBfYXNzZXJ0X2V4cGVjdGF0aW9uc19maWxlcyhzZWxmLCBzZWFyY2hfcGF0aHMsIG9zX25h bWUsIHVzZV93ZWJraXQyPUZhbHNlLCBxdF92ZXJzaW9uPSc1LjAnLCBhcmNoaXRlY3R1cmU9J3g4 NicpOgogICAgICAgICAjIEZJWE1FOiBQb3J0IGNvbnN0cnVjdG9ycyBzaG91bGQgbm90ICJwYXJz ZSIgdGhlIHBvcnQgbmFtZSwgYnV0CiAgICAgICAgICMgcmF0aGVyIGJlIHBhc3NlZCBjb21wb25l bnRzIChkaXJlY3RseSBvciB2aWEgc2V0dGVycykuICBPbmNlCiAgICAgICAgICMgd2UgZml4IHRo YXQsIHRoaXMgbWV0aG9kIHdpbGwgbmVlZCBhIHJlLXdyaXRlLgpAQCAtNzIsNyArNzQsNyBAQCBj bGFzcyBRdFBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAgICAgICAgaG9z dC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihzZWxmLl9xdF92ZXJzaW9uKHF0X3ZlcnNpb24p KQogICAgICAgICBwb3J0X25hbWUgPSAncXQtJyArIG9zX25hbWUKICAgICAgICAgcG9ydCA9IHNl bGYubWFrZV9wb3J0KGhvc3Q9aG9zdCwgcXRfdmVyc2lvbj1xdF92ZXJzaW9uLCBwb3J0X25hbWU9 cG9ydF9uYW1lLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3B0aW9ucz1Nb2NrT3B0 aW9ucyh3ZWJraXRfdGVzdF9ydW5uZXI9dXNlX3dlYmtpdDIsIHBsYXRmb3JtPSdxdCcpKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgb3B0aW9ucz1Nb2NrT3B0aW9ucyh3ZWJraXRfdGVz dF9ydW5uZXI9dXNlX3dlYmtpdDIsIHBsYXRmb3JtPSdxdCcsIGFyY2hpdGVjdHVyZT1hcmNoaXRl Y3R1cmUpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuZXhwZWN0YXRpb25zX2ZpbGVz KCksIHNlYXJjaF9wYXRocykKIAogICAgIGRlZiBfcXRfdmVyc2lvbihzZWxmLCBxdF92ZXJzaW9u KToK 210337 2013-09-03 02:07:13 -0700 2013-10-02 21:41:52 -0700 Patch bug-120207-20130903110711.patch text/plain 8836 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0OTc0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODBlODdiMWU1MjU2NzUxODFlMTI1N2RhM2UxODdjMTQz NDg5ZTQ2YS4uODcxNjQxN2RhMzIzOTAxNTdmNzFmNjEyOWQyZmFmOGNhOTU4YThhMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5 IEBACiAyMDEzLTA5LTAzICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGln aWEuY29tPgogCisgICAgICAgIFtRdF0gU3VwcG9ydCBhcmNoaXRlY3R1cmUgc3BlY2lmaWMgdGVz dCBleHBlY3RhdGlvbnMgaW4gTlJXVAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIwMjA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGFyY2hpdGVjdHVyZSBzcGVjaWZpYyB0ZXN0IGV4cGVjdGF0aW9u cyB0byB0aGUgc2VhcmNoIHBhdGguCisgICAgICAgIFdlIHVzZSB0aGUgcG9ydC5fYXJjaGl0ZWN0 dXJlIGFuZCBwb3J0LmFyY2hpdGVjdHVyZSgpIHByb3BlcnRpZXMKKyAgICAgICAgYW5kIG1ldGhv ZCBhbHNvIHVzZWQgYnkgTWFjLCBhbmQgdXBkYXRlIHRoZSB1bml0LXRlc3RzIHRvIGNvdmVyCisg ICAgICAgIHRoZSBuZXcgc2VhcmNoIHBhdGhzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9wb3J0L3F0LnB5OgorICAgICAgICAoUXRQb3J0KToKKyAgICAgICAgKFF0UG9ydC5fX2luaXRf Xyk6CisgICAgICAgIChRdFBvcnQuX2dlbmVyYXRlX2FsbF90ZXN0X2NvbmZpZ3VyYXRpb25zKToK KyAgICAgICAgKFF0UG9ydC5wb3J0X2FyY2hpdGVjdHVyZSk6CisgICAgICAgIChRdFBvcnQuX3Nl YXJjaF9wYXRocyk6CisgICAgICAgIChRdFBvcnQuX3BvcnRfc3BlY2lmaWNfZXhwZWN0YXRpb25z X2ZpbGVzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvcXRfdW5pdHRlc3QucHk6 CisgICAgICAgIChRdFBvcnRUZXN0KToKKyAgICAgICAgKFF0UG9ydFRlc3QuX2Fzc2VydF9zZWFy Y2hfcGF0aCk6CisgICAgICAgIChRdFBvcnRUZXN0Ll9hc3NlcnRfZXhwZWN0YXRpb25zX2ZpbGVz KToKKworMjAxMy0wOS0wMyAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQGRp Z2lhLmNvbT4KKwogICAgICAgICBbUXRdW1dLMV0gUGFnZVZpc2liaWxpdHkgdGVzdHMgYXJlIGZs YWt5CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA0 MTgKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3F0LnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3F0LnB5CmluZGV4IDVkYjVkOGVlYTZlNjE4NTcyMGVh YmU1YmJmYjc4ODM5ODA1YzU1NmIuLjBhNDQ3ZTg4ZDlhODRmNDBjN2RhYWM5Y2MwNGRkMWRmMWVm ODRkYWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9xdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvcXQucHkKQEAgLTQ1LDYgKzQ1LDcgQEAgX2xv ZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiBjbGFzcyBRdFBvcnQoUG9ydCk6CiAg ICAgQUxMX1ZFUlNJT05TID0gWydsaW51eCcsICd3aW4nLCAnbWFjJ10KKyAgICBBTExfQVJDSElU RUNUVVJFUyA9IFsneDg2JywgJ3g2NCcsICdhcm0nXQogICAgIHBvcnRfbmFtZSA9ICJxdCIKIAog ICAgIGRlZiBfd2syX3BvcnRfbmFtZShzZWxmKToKQEAgLTYzLDYgKzY0LDEwIEBAIGNsYXNzIFF0 UG9ydChQb3J0KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lLCAqKmt3 YXJncyk6CiAgICAgICAgIHN1cGVyKFF0UG9ydCwgc2VsZikuX19pbml0X18oaG9zdCwgcG9ydF9u YW1lLCAqKmt3YXJncykKIAorICAgICAgICBzZWxmLl9hcmNoaXRlY3R1cmUgPSBzZWxmLmdldF9v cHRpb24oJ2FyY2hpdGVjdHVyZScpCisgICAgICAgIGlmIG5vdCBzZWxmLl9hcmNoaXRlY3R1cmU6 CisgICAgICAgICAgICBzZWxmLl9hcmNoaXRlY3R1cmUgPSBzZWxmLnBvcnRfYXJjaGl0ZWN0dXJl KCkKKwogICAgICAgICBzZWxmLl9vcGVyYXRpbmdfc3lzdGVtID0gcG9ydF9uYW1lLnJlcGxhY2Uo J3F0LScsICcnKQogCiAgICAgICAgICMgRklYTUU6IFdoeSBpcyB0aGlzIGJlaW5nIHNldCBhdCBh bGw/CkBAIC03Miw3ICs3Nyw4IEBAIGNsYXNzIFF0UG9ydChQb3J0KToKICAgICAgICAgY29uZmln dXJhdGlvbnMgPSBbXQogICAgICAgICBmb3IgdmVyc2lvbiBpbiBzZWxmLkFMTF9WRVJTSU9OUzoK ICAgICAgICAgICAgIGZvciBidWlsZF90eXBlIGluIHNlbGYuQUxMX0JVSUxEX1RZUEVTOgotICAg ICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb25zLmFwcGVuZChUZXN0Q29uZmlndXJhdGlvbih2ZXJz aW9uPXZlcnNpb24sIGFyY2hpdGVjdHVyZT0neDg2JywgYnVpbGRfdHlwZT1idWlsZF90eXBlKSkK KyAgICAgICAgICAgICAgICBmb3IgYXJjaCBpbiBzZWxmLkFMTF9BUkNISVRFQ1RVUkVTOgorICAg ICAgICAgICAgICAgICAgICBjb25maWd1cmF0aW9ucy5hcHBlbmQoVGVzdENvbmZpZ3VyYXRpb24o dmVyc2lvbj12ZXJzaW9uLCBhcmNoaXRlY3R1cmU9YXJjaCwgYnVpbGRfdHlwZT1idWlsZF90eXBl KSkKICAgICAgICAgcmV0dXJuIGNvbmZpZ3VyYXRpb25zCiAKICAgICBkZWYgX2J1aWxkX2RyaXZl cihzZWxmKToKQEAgLTExNiwxMiArMTIyLDI1IEBAIGNsYXNzIFF0UG9ydChQb3J0KToKICAgICAg ICAgICAgIHZlcnNpb24gPSAnNS4wJwogICAgICAgICByZXR1cm4gdmVyc2lvbgogCisgICAgZGVm IHBvcnRfYXJjaGl0ZWN0dXJlKHNlbGYpOgorICAgICAgICBweV9tYWNoaW5lID0gcGxhdGZvcm0u bWFjaGluZSgpCisgICAgICAgIGlmICdpMzg2JyA9PSBweV9tYWNoaW5lOgorICAgICAgICAgICAg cmV0dXJuICd4ODYnCisgICAgICAgIGlmICd4ODZfNjQnID09IHB5X21hY2hpbmU6CisgICAgICAg ICAgICByZXR1cm4gJ3g2NCcKKyAgICAgICAgaWYgJ2FybScgaW4gcHlfbWFjaGluZToKKyAgICAg ICAgICAgIHJldHVybiAnYXJtJworICAgICAgICByZXR1cm4gJycKKworCiAgICAgZGVmIF9zZWFy Y2hfcGF0aHMoc2VsZik6CiAgICAgICAgICMgICAgICAgICAgICAgICAgIHF0LW1hYy13azIKICAg ICAgICAgIyAgICAgICAgICAgICAgICAvCiAgICAgICAgICMgICAgICAgcXQtd2sxICBxdC13azIK ICAgICAgICAgIyAgICAgICAgICAgICBcLwogICAgICAgICAjICAgICAgICAgICBxdC01LngKKyAg ICAgICAgIyAgICAgICAgICAgICAgfAorICAgICAgICAjICAgICAocXQteDg2fHF0LXg2NHxxdC1h cm0pCiAgICAgICAgICMgICAgICAgICAgICAgICBcCiAgICAgICAgICMgICAgKHF0LWxpbnV4fHF0 LW1hY3xxdC13aW4pCiAgICAgICAgICMgICAgICAgICAgICAgICAgfApAQCAtMTM2LDYgKzE1NSwx MCBAQCBjbGFzcyBRdFBvcnQoUG9ydCk6CiAKICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgn cXQtJyArIHNlbGYucXRfdmVyc2lvbigpKQogCisgICAgICAgIGFyY2hpdGVjdHVyZSA9IHNlbGYu YXJjaGl0ZWN0dXJlKCkKKyAgICAgICAgaWYgYXJjaGl0ZWN0dXJlOgorICAgICAgICAgICAgc2Vh cmNoX3BhdGhzLmFwcGVuZCgncXQtJyArIGFyY2hpdGVjdHVyZSkKKwogICAgICAgICBzZWFyY2hf cGF0aHMuYXBwZW5kKHNlbGYucG9ydF9uYW1lICsgJy0nICsgc2VsZi5vcGVyYXRpbmdfc3lzdGVt KCkpCiAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5wb3J0X25hbWUpCiAgICAgICAg IHJldHVybiBzZWFyY2hfcGF0aHMKQEAgLTE0OSw3ICsxNzIsNyBAQCBjbGFzcyBRdFBvcnQoUG9y dCk6CiAgICAgICAgICAgICBwYXRocy5hcHBlbmQoJ3drMicpCiAKICAgICAgICAgIyBleHBlY3Rh dGlvbnNfZmlsZXMoKSB1c2VzIHRoZSBkaXJlY3RvcmllcyBsaXN0ZWQgaW4gX3NlYXJjaF9wYXRo cyByZXZlcnNlZC4KLSAgICAgICAgIyBlLmcuIHF0IC0+IHF0LWxpbnV4IC0+IHF0LTUueCAtPiBx dC13azEKKyAgICAgICAgIyBlLmcuIHF0IC0+IHF0LWxpbnV4IC0+IHF0LXg4NiAtPiBxdC01Lngg LT4gcXQtd2sxCiAgICAgICAgIHJldHVybiBsaXN0KHJldmVyc2VkKFtzZWxmLl9maWxlc3lzdGVt LmpvaW4oc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgocCksICdUZXN0RXhwZWN0YXRpb25zJykg Zm9yIHAgaW4gcGF0aHNdKSkKIAogICAgIGRlZiBzZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoc2Vs Ziwgc2VydmVyX25hbWU9Tm9uZSk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvcXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvcXRfdW5p dHRlc3QucHkKaW5kZXggMjMzOGY2NzNiZTk1YmFjMjA2ZjNhMmM3YjkzN2VhODU5YmVhMzA0Yy4u OWQ5MGI3NjQ1MmY3YzQ4MjQ2NDBiNmJmYTg1NjVlOThiZjBjMzczNiAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3F0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9xdF91bml0dGVzdC5weQpAQCAtNDIsMTcgKzQyLDE4IEBAIGNsYXNz IFF0UG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgIHBvcnRfbmFtZSA9 ICdxdC1tYWMnCiAgICAgcG9ydF9tYWtlciA9IFF0UG9ydAogICAgIHNlYXJjaF9wYXRoc19jYXNl cyA9IFsKLSAgICAgICAgeydzZWFyY2hfcGF0aHMnOlsncXQtbWFjLXdrMicsICdxdC13azInLCAn cXQtNS4wJywgJ3F0LW1hYycsICdxdCddLCAnb3NfbmFtZSc6J21hYycsICd1c2Vfd2Via2l0Mic6 VHJ1ZSwgJ3F0X3ZlcnNpb24nOic1LjAnfSwKLSAgICAgICAgeydzZWFyY2hfcGF0aHMnOlsncXQt d2syJywgJ3F0LTUuMCcsICdxdC13aW4nLCAncXQnXSwgJ29zX25hbWUnOid3aW4nLCAndXNlX3dl YmtpdDInOlRydWUsICdxdF92ZXJzaW9uJzonNS4wJ30sCi0gICAgICAgIHsnc2VhcmNoX3BhdGhz JzpbJ3F0LXdrMicsICdxdC01LjAnLCAncXQtbGludXgnLCAncXQnXSwgJ29zX25hbWUnOidsaW51 eCcsICd1c2Vfd2Via2l0Mic6VHJ1ZSwgJ3F0X3ZlcnNpb24nOic1LjAnfSwKLQotICAgICAgICB7 J3NlYXJjaF9wYXRocyc6WydxdC13azEnLCAncXQtNS4wJywgJ3F0LW1hYycsICdxdCddLCAnb3Nf bmFtZSc6J21hYycsICd1c2Vfd2Via2l0Mic6RmFsc2UsICdxdF92ZXJzaW9uJzonNS4wJ30sCi0g ICAgICAgIHsnc2VhcmNoX3BhdGhzJzpbJ3F0LXdrMScsICdxdC01LjAnLCAncXQtd2luJywgJ3F0 J10sICdvc19uYW1lJzond2luJywgJ3VzZV93ZWJraXQyJzpGYWxzZSwgJ3F0X3ZlcnNpb24nOic1 LjAnfSwKLSAgICAgICAgeydzZWFyY2hfcGF0aHMnOlsncXQtd2sxJywgJ3F0LTUuMCcsICdxdC1s aW51eCcsICdxdCddLCAnb3NfbmFtZSc6J2xpbnV4JywgJ3VzZV93ZWJraXQyJzpGYWxzZSwgJ3F0 X3ZlcnNpb24nOic1LjAnfSwKLSAgICAgICAgeydzZWFyY2hfcGF0aHMnOlsncXQtd2sxJywgJ3F0 LTUuMScsICdxdC1saW51eCcsICdxdCddLCAnb3NfbmFtZSc6J2xpbnV4JywgJ3VzZV93ZWJraXQy JzpGYWxzZSwgJ3F0X3ZlcnNpb24nOic1LjEnfSwKKyAgICAgICAgeydzZWFyY2hfcGF0aHMnOlsn cXQtbWFjLXdrMicsICdxdC13azInLCAncXQtNS4wJywgJ3F0LXg4NicsICdxdC1tYWMnLCAncXQn XSwgJ29zX25hbWUnOidtYWMnLCAndXNlX3dlYmtpdDInOlRydWUsICdxdF92ZXJzaW9uJzonNS4w J30sCisgICAgICAgIHsnc2VhcmNoX3BhdGhzJzpbJ3F0LXdrMicsICdxdC01LjAnLCAncXQteDg2 JywgJ3F0LXdpbicsICdxdCddLCAnb3NfbmFtZSc6J3dpbicsICd1c2Vfd2Via2l0Mic6VHJ1ZSwg J3F0X3ZlcnNpb24nOic1LjAnfSwKKyAgICAgICAgeydzZWFyY2hfcGF0aHMnOlsncXQtd2syJywg J3F0LTUuMCcsICdxdC14ODYnLCAncXQtbGludXgnLCAncXQnXSwgJ29zX25hbWUnOidsaW51eCcs ICd1c2Vfd2Via2l0Mic6VHJ1ZSwgJ3F0X3ZlcnNpb24nOic1LjAnfSwKKworICAgICAgICB7J3Nl YXJjaF9wYXRocyc6WydxdC13azEnLCAncXQtNS4wJywgJ3F0LXg4NicsICdxdC1tYWMnLCAncXQn XSwgJ29zX25hbWUnOidtYWMnLCAndXNlX3dlYmtpdDInOkZhbHNlLCAncXRfdmVyc2lvbic6JzUu MCd9LAorICAgICAgICB7J3NlYXJjaF9wYXRocyc6WydxdC13azEnLCAncXQtNS4wJywgJ3F0LXg4 NicsICdxdC13aW4nLCAncXQnXSwgJ29zX25hbWUnOid3aW4nLCAndXNlX3dlYmtpdDInOkZhbHNl LCAncXRfdmVyc2lvbic6JzUuMCd9LAorICAgICAgICB7J3NlYXJjaF9wYXRocyc6WydxdC13azEn LCAncXQtNS4wJywgJ3F0LXg4NicsICdxdC1saW51eCcsICdxdCddLCAnb3NfbmFtZSc6J2xpbnV4 JywgJ3VzZV93ZWJraXQyJzpGYWxzZSwgJ3F0X3ZlcnNpb24nOic1LjAnfSwKKyAgICAgICAgeydz ZWFyY2hfcGF0aHMnOlsncXQtd2sxJywgJ3F0LTUuMScsICdxdC1hcm0nLCAncXQtbGludXgnLCAn cXQnXSwgJ29zX25hbWUnOidsaW51eCcsICd1c2Vfd2Via2l0Mic6RmFsc2UsICdxdF92ZXJzaW9u JzonNS4xJywgJ2FyY2hpdGVjdHVyZSc6J2FybSd9LAorICAgICAgICB7J3NlYXJjaF9wYXRocyc6 WydxdC13azEnLCAncXQtNS4xJywgJ3F0LXg2NCcsICdxdC1saW51eCcsICdxdCddLCAnb3NfbmFt ZSc6J2xpbnV4JywgJ3VzZV93ZWJraXQyJzpGYWxzZSwgJ3F0X3ZlcnNpb24nOic1LjEnLCAnYXJj aGl0ZWN0dXJlJzoneDY0J30sCiAgICAgXQogCi0gICAgZGVmIF9hc3NlcnRfc2VhcmNoX3BhdGgo c2VsZiwgc2VhcmNoX3BhdGhzLCBvc19uYW1lLCB1c2Vfd2Via2l0Mj1GYWxzZSwgcXRfdmVyc2lv bj0nNS4wJyk6CisgICAgZGVmIF9hc3NlcnRfc2VhcmNoX3BhdGgoc2VsZiwgc2VhcmNoX3BhdGhz LCBvc19uYW1lLCB1c2Vfd2Via2l0Mj1GYWxzZSwgcXRfdmVyc2lvbj0nNS4wJywgYXJjaGl0ZWN0 dXJlPSd4ODYnKToKICAgICAgICAgIyBGSVhNRTogUG9ydCBjb25zdHJ1Y3RvcnMgc2hvdWxkIG5v dCAicGFyc2UiIHRoZSBwb3J0IG5hbWUsIGJ1dAogICAgICAgICAjIHJhdGhlciBiZSBwYXNzZWQg Y29tcG9uZW50cyAoZGlyZWN0bHkgb3IgdmlhIHNldHRlcnMpLiAgT25jZQogICAgICAgICAjIHdl IGZpeCB0aGF0LCB0aGlzIG1ldGhvZCB3aWxsIG5lZWQgYSByZS13cml0ZS4KQEAgLTYwLDExICs2 MSwxMSBAQCBjbGFzcyBRdFBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAg ICAgICAgaG9zdC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihzZWxmLl9xdF92ZXJzaW9uKHF0 X3ZlcnNpb24pKQogICAgICAgICBwb3J0X25hbWUgPSAncXQtJyArIG9zX25hbWUKICAgICAgICAg cG9ydCA9IHNlbGYubWFrZV9wb3J0KGhvc3Q9aG9zdCwgcXRfdmVyc2lvbj1xdF92ZXJzaW9uLCBw b3J0X25hbWU9cG9ydF9uYW1lLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3B0aW9u cz1Nb2NrT3B0aW9ucyh3ZWJraXRfdGVzdF9ydW5uZXI9dXNlX3dlYmtpdDIsIHBsYXRmb3JtPSdx dCcpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3B0aW9ucz1Nb2NrT3B0aW9ucyh3 ZWJraXRfdGVzdF9ydW5uZXI9dXNlX3dlYmtpdDIsIHBsYXRmb3JtPSdxdCcsIGFyY2hpdGVjdHVy ZT1hcmNoaXRlY3R1cmUpKQogICAgICAgICBhYnNvbHV0ZV9zZWFyY2hfcGF0aHMgPSBtYXAocG9y dC5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIHNlYXJjaF9wYXRocykKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChwb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRoKCksIGFic29sdXRlX3NlYXJjaF9wYXRo cykKIAotICAgIGRlZiBfYXNzZXJ0X2V4cGVjdGF0aW9uc19maWxlcyhzZWxmLCBzZWFyY2hfcGF0 aHMsIG9zX25hbWUsIHVzZV93ZWJraXQyPUZhbHNlLCBxdF92ZXJzaW9uPSc1LjAnKToKKyAgICBk ZWYgX2Fzc2VydF9leHBlY3RhdGlvbnNfZmlsZXMoc2VsZiwgc2VhcmNoX3BhdGhzLCBvc19uYW1l LCB1c2Vfd2Via2l0Mj1GYWxzZSwgcXRfdmVyc2lvbj0nNS4wJywgYXJjaGl0ZWN0dXJlPSd4ODYn KToKICAgICAgICAgIyBGSVhNRTogUG9ydCBjb25zdHJ1Y3RvcnMgc2hvdWxkIG5vdCAicGFyc2Ui IHRoZSBwb3J0IG5hbWUsIGJ1dAogICAgICAgICAjIHJhdGhlciBiZSBwYXNzZWQgY29tcG9uZW50 cyAoZGlyZWN0bHkgb3IgdmlhIHNldHRlcnMpLiAgT25jZQogICAgICAgICAjIHdlIGZpeCB0aGF0 LCB0aGlzIG1ldGhvZCB3aWxsIG5lZWQgYSByZS13cml0ZS4KQEAgLTcyLDcgKzczLDcgQEAgY2xh c3MgUXRQb3J0VGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAgICAgICAgIGhvc3Qu ZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIoc2VsZi5fcXRfdmVyc2lvbihxdF92ZXJzaW9uKSkK ICAgICAgICAgcG9ydF9uYW1lID0gJ3F0LScgKyBvc19uYW1lCiAgICAgICAgIHBvcnQgPSBzZWxm Lm1ha2VfcG9ydChob3N0PWhvc3QsIHF0X3ZlcnNpb249cXRfdmVyc2lvbiwgcG9ydF9uYW1lPXBv cnRfbmFtZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbnM9TW9ja09wdGlv bnMod2Via2l0X3Rlc3RfcnVubmVyPXVzZV93ZWJraXQyLCBwbGF0Zm9ybT0ncXQnKSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbnM9TW9ja09wdGlvbnMod2Via2l0X3Rlc3Rf cnVubmVyPXVzZV93ZWJraXQyLCBwbGF0Zm9ybT0ncXQnLCBhcmNoaXRlY3R1cmU9YXJjaGl0ZWN0 dXJlKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LmV4cGVjdGF0aW9uc19maWxlcygp LCBzZWFyY2hfcGF0aHMpCiAKICAgICBkZWYgX3F0X3ZlcnNpb24oc2VsZiwgcXRfdmVyc2lvbik6 Cg==