97894 2012-09-28 04:48:37 -0700 [Qt] Make NRWT use wk2/TestExpectations file 2012-09-28 12:24:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P1 Blocker --- 1 ossy ossy abarth dpranke galpeter kkristof ojan ossy webkit.review.bot oldest_to_newest 730499 0 ossy 2012-09-28 04:48:37 -0700 After https://trac.webkit.org/changeset/129788 many tests starting to fail on Qt WK2, because now NRWT uses only wk2/Skipped file, but not wk2/TestExpectations. Fix is coming soon. 730537 1 166224 ossy 2012-09-28 05:25:23 -0700 Created attachment 166224 Patch 730543 2 ossy 2012-09-28 05:29:22 -0700 Additionally I removed the unnecessary skip list functions. 730554 3 galpeter 2012-09-28 05:56:30 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=166224&action=review > Tools/Scripts/webkitpy/layout_tests/port/qt.py:148 > + if self.get_option('webkit_test_runner'): > + paths.append('wk2') Here is a loss of check for Qt 5.0, but if the webkit_test_runner is true it is wk2 by default. Am I right? > Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py:98 > + if case['use_webkit2']: > + case['search_paths'].append("wk2") This could lead to some strange things if I'm not mistaken. Like: if the test_baseline_search_path method executes after this. 730584 4 ossy 2012-09-28 06:21:17 -0700 (In reply to comment #3) > View in context: https://bugs.webkit.org/attachment.cgi?id=166224&action=review > > > Tools/Scripts/webkitpy/layout_tests/port/qt.py:148 > > + if self.get_option('webkit_test_runner'): > > + paths.append('wk2') > > Here is a loss of check for Qt 5.0, but if the webkit_test_runner is true it is wk2 by default. Am I right? WK2 build is impossible with Qt 4.8, so running WK2 test with Qt 4.8 will fail because of missing WTR, search path won't be real problem. :) > > Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py:98 > > + if case['use_webkit2']: > > + case['search_paths'].append("wk2") > > This could lead to some strange things if I'm not mistaken. Like: if the test_baseline_search_path method executes after this. Good point. Will fix. 730585 5 166237 ossy 2012-09-28 06:21:32 -0700 Created attachment 166237 updated patch 730589 6 galpeter 2012-09-28 06:27:34 -0700 (In reply to comment #5) > Created an attachment (id=166237) [details] > updated patch LBTM :) 730602 7 166237 hausmann 2012-09-28 06:43:07 -0700 Comment on attachment 166237 updated patch rs=me 730609 8 166237 ossy 2012-09-28 06:47:08 -0700 Comment on attachment 166237 updated patch Clearing flags on attachment: 166237 Committed r129887: <http://trac.webkit.org/changeset/129887> 730611 9 ossy 2012-09-28 06:47:14 -0700 All reviewed patches have been landed. Closing bug. 730880 10 dpranke 2012-09-28 12:24:22 -0700 Sorry about this ... I forgot to check the Qt waterfall for failures :(. 166224 2012-09-28 05:25:23 -0700 2012-09-28 06:21:26 -0700 Patch bug-97894-20120928052440.patch text/plain 4441 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5ODc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDQ2OTIxNjUxMjA3MTNhZjNmMjNkMDMxYzc4OWFlMWU5 MDY0ZWZmMC4uNWQwNGM0NWEwZTQwNjdkYTY2NWFkZTg4MjNkMWViYzAzOGIxYjcwYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEyLTA5LTI4ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgW1F0XSBNYWtlIE5SV1QgdXNlIHdrMi9UZXN0RXhwZWN0YXRpb25zIGZpbGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3ODk0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5OgorICAgICAgICAoUXRQb3J0LmRlZmF1bHRf YmFzZWxpbmVfc2VhcmNoX3BhdGgpOgorICAgICAgICAoUXRQb3J0LmV4cGVjdGF0aW9uc19maWxl cyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0 dGVzdC5weToKKyAgICAgICAgKFF0UG9ydFRlc3QuX2Fzc2VydF9zZWFyY2hfcGF0aCk6CisgICAg ICAgIChRdFBvcnRUZXN0LnRlc3RfYmFzZWxpbmVfc2VhcmNoX3BhdGgpOgorICAgICAgICAoUXRQ b3J0VGVzdC50ZXN0X2V4cGVjdGF0aW9uc19maWxlcyk6CisKIDIwMTItMDktMjggIE1pa2hhaWwg UG96ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CiAKICAgICAgICAgW0VG TF1bRFJUXSBFRkwgRFJUIHNob3VsZCBkaXNhYmxlIHZpc2l0ZWQgbGlua3MgdHJhY2tpbmcgYnkg ZGVmYXVsdApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9xdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQu cHkKaW5kZXggODI4YTgwZDY0OTZkOGQ5OTI1NjZjMjcwMWE1YjVjNWE1ZGI1NGJkZC4uMmU3M2M3 NWE4NjcxYzUxOGM4MTQ2NGIxYjVhMzg5NzM2NjVhMDY2MiAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CkBAIC0xNDIsMTYgKzE0MiwxNCBAQCBj bGFzcyBRdFBvcnQoUG9ydCk6CiAgICAgZGVmIGRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgo c2VsZik6CiAgICAgICAgIHJldHVybiBtYXAoc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIHNl bGYuX3NlYXJjaF9wYXRocygpKQogCi0gICAgZGVmIF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhz KHNlbGYpOgotICAgICAgICBza2lwcGVkX3BhdGggPSBzZWxmLl9zZWFyY2hfcGF0aHMoKQotICAg ICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpIGFuZCAnNS4wJyBp biBzZWxmLnF0X3ZlcnNpb24oKToKLSAgICAgICAgICAgIHNraXBwZWRfcGF0aC5hcHBlbmQoJ3dr MicpCi0gICAgICAgIHJldHVybiBza2lwcGVkX3BhdGgKLQogICAgIGRlZiBleHBlY3RhdGlvbnNf ZmlsZXMoc2VsZik6CisgICAgICAgIHBhdGhzID0gc2VsZi5fc2VhcmNoX3BhdGhzKCkKKyAgICAg ICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKKyAgICAgICAgICAg IHBhdGhzLmFwcGVuZCgnd2syJykKKwogICAgICAgICAjIGV4cGVjdGF0aW9uc19maWxlcygpIHVz ZXMgdGhlIGRpcmVjdG9yaWVzIGxpc3RlZCBpbiBfc2VhcmNoX3BhdGhzIHJldmVyc2VkLgogICAg ICAgICAjIGUuZy4gcXQgLT4gcXQtbGludXggLT4gcXQtNC44Ci0gICAgICAgIHJldHVybiBsaXN0 KHJldmVyc2VkKFtzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3Bh dGgocCksICdUZXN0RXhwZWN0YXRpb25zJykgZm9yIHAgaW4gc2VsZi5fc2VhcmNoX3BhdGhzKCld KSkKKyAgICAgICAgcmV0dXJuIGxpc3QocmV2ZXJzZWQoW3NlbGYuX2ZpbGVzeXN0ZW0uam9pbihz ZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aChwKSwgJ1Rlc3RFeHBlY3RhdGlvbnMnKSBmb3IgcCBp biBwYXRoc10pKQogCiAgICAgZGVmIHNldHVwX2Vudmlyb25fZm9yX3NlcnZlcihzZWxmLCBzZXJ2 ZXJfbmFtZT1Ob25lKToKICAgICAgICAgY2xlYW5fZW52ID0gc3VwZXIoUXRQb3J0LCBzZWxmKS5z ZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoc2VydmVyX25hbWUpCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weQppbmRleCAz NzRiMTAyNzAwYmMwOTViNzliYTFmODJlNzdmN2YyZDk2YzM2NzJhLi4yZWU1M2Y3OGNjMTc2Mzc3 MDY4MTNhNzAxMmI3Yjc1ODA4NzJiNTM2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkKQEAgLTcxLDE0ICs3MSw2 IEBAIGNsYXNzIFF0UG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAg ICBhYnNvbHV0ZV9zZWFyY2hfcGF0aHMgPSBtYXAocG9ydC5fd2Via2l0X2Jhc2VsaW5lX3BhdGgs IHNlYXJjaF9wYXRocykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5iYXNlbGluZV9z ZWFyY2hfcGF0aCgpLCBhYnNvbHV0ZV9zZWFyY2hfcGF0aHMpCiAKLSAgICBkZWYgX2Fzc2VydF9z a2lwcGVkX3BhdGgoc2VsZiwgc2VhcmNoX3BhdGhzLCBvc19uYW1lLCB1c2Vfd2Via2l0Mj1GYWxz ZSwgcXRfdmVyc2lvbj0nNC44Jyk6Ci0gICAgICAgIGhvc3QgPSBNb2NrU3lzdGVtSG9zdChvc19u YW1lPW9zX25hbWUpCi0gICAgICAgIGhvc3QuZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIoc2Vs Zi5fcXRfdmVyc2lvbihxdF92ZXJzaW9uKSkKLSAgICAgICAgcG9ydF9uYW1lID0gJ3F0LScgKyBv c19uYW1lCi0gICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChob3N0PWhvc3QsIHF0X3ZlcnNp b249cXRfdmVyc2lvbiwgcG9ydF9uYW1lPXBvcnRfbmFtZSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG9wdGlvbnM9TW9ja09wdGlvbnMod2Via2l0X3Rlc3RfcnVubmVyPXVzZV93ZWJr aXQyLCBwbGF0Zm9ybT0ncXQnKSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5fc2tp cHBlZF9maWxlX3NlYXJjaF9wYXRocygpLCBzZWFyY2hfcGF0aHMpCi0KICAgICBkZWYgX2Fzc2Vy dF9leHBlY3RhdGlvbnNfZmlsZXMoc2VsZiwgc2VhcmNoX3BhdGhzLCBvc19uYW1lLCB1c2Vfd2Vi a2l0Mj1GYWxzZSwgcXRfdmVyc2lvbj0nNC44Jyk6CiAgICAgICAgICMgRklYTUU6IFBvcnQgY29u c3RydWN0b3JzIHNob3VsZCBub3QgInBhcnNlIiB0aGUgcG9ydCBuYW1lLCBidXQKICAgICAgICAg IyByYXRoZXIgYmUgcGFzc2VkIGNvbXBvbmVudHMgKGRpcmVjdGx5IG9yIHZpYSBzZXR0ZXJzKS4g IE9uY2UKQEAgLTEwMCwxNSArOTIsMTAgQEAgY2xhc3MgUXRQb3J0VGVzdChwb3J0X3Rlc3RjYXNl LlBvcnRUZXN0Q2FzZSk6CiAgICAgICAgIGZvciBjYXNlIGluIHNlbGYuc2VhcmNoX3BhdGhzX2Nh c2VzOgogICAgICAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKCoqY2FzZSkKIAotICAg IGRlZiB0ZXN0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aChzZWxmKToKLSAgICAgICAgY2FzZWxp c3QgPSBzZWxmLnNlYXJjaF9wYXRoc19jYXNlc1s6XQotICAgICAgICBmb3IgY2FzZSBpbiBjYXNl bGlzdDoKLSAgICAgICAgICAgIGlmIGNhc2VbJ3VzZV93ZWJraXQyJ10gYW5kIGNhc2VbJ3F0X3Zl cnNpb24nXSA9PSAnNS4wJzoKLSAgICAgICAgICAgICAgICBjYXNlWydzZWFyY2hfcGF0aHMnXS5h cHBlbmQoIndrMiIpCi0gICAgICAgICAgICBzZWxmLl9hc3NlcnRfc2tpcHBlZF9wYXRoKCoqY2Fz ZSkKLQogICAgIGRlZiB0ZXN0X2V4cGVjdGF0aW9uc19maWxlcyhzZWxmKToKICAgICAgICAgZm9y IGNhc2UgaW4gc2VsZi5zZWFyY2hfcGF0aHNfY2FzZXM6CisgICAgICAgICAgICBpZiBjYXNlWyd1 c2Vfd2Via2l0MiddOgorICAgICAgICAgICAgICAgIGNhc2VbJ3NlYXJjaF9wYXRocyddLmFwcGVu ZCgid2syIikKICAgICAgICAgICAgIGV4cGVjdGF0aW9uc19jYXNlID0gZGVlcGNvcHkoY2FzZSkK ICAgICAgICAgICAgIGV4cGVjdGF0aW9uc19jYXNlWydzZWFyY2hfcGF0aHMnXSA9IFtdCiAgICAg ICAgICAgICBmb3IgcGF0aCBpbiByZXZlcnNlZChjYXNlWydzZWFyY2hfcGF0aHMnXSk6Cg== 166237 2012-09-28 06:21:32 -0700 2012-09-28 06:47:07 -0700 updated patch bug-97894-20120928062048.patch text/plain 5070 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5ODgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDQ2OTIxNjUxMjA3MTNhZjNmMjNkMDMxYzc4OWFlMWU5 MDY0ZWZmMC4uMjdjY2MzODQ3MTM3YTliMGM4MWYzZTg5N2YyMDE4MzJmYjYyYjIxZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTA5LTI4ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgW1F0XSBNYWtlIE5SV1QgdXNlIHdrMi9UZXN0RXhwZWN0YXRpb25zIGZpbGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3ODk0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5OiBSZW1vdmUgdW5uZWNlc3NhcnkgX3NraXBw ZWRfZmlsZV9zZWFyY2hfcGF0aHMgZnVuY3Rpb24uCisgICAgICAgIChRdFBvcnQuZXhwZWN0YXRp b25zX2ZpbGVzKTogQWRkIHdrMiBpZiAtLXdlYmtpdC10ZXN0LXJ1bm5lciBvcHRpb24gYWRkZWQu CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVz dC5weTogUmVtb3ZlIHVubmVjZXNzYXJ5IHRlc3RfX3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMg ZnVuY3Rpb24uCisgICAgICAgIChRdFBvcnRUZXN0Ll9hc3NlcnRfc2VhcmNoX3BhdGgpOiBSZW1v dmVkLgorICAgICAgICAoUXRQb3J0VGVzdC50ZXN0X2V4cGVjdGF0aW9uc19maWxlcyk6IEFkZCB3 azIgaWYgLS13ZWJraXQtdGVzdC1ydW5uZXIgb3B0aW9uIGFkZGVkLCBhbmQgY29kZSBjbGVhbnVw LgorCiAyMDEyLTA5LTI4ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZA aW50ZWwuY29tPgogCiAgICAgICAgIFtFRkxdW0RSVF0gRUZMIERSVCBzaG91bGQgZGlzYWJsZSB2 aXNpdGVkIGxpbmtzIHRyYWNraW5nIGJ5IGRlZmF1bHQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CmluZGV4IDgyOGE4MGQ2NDk2ZDhkOTkyNTY2YzI3 MDFhNWI1YzVhNWRiNTRiZGQuLjJlNzNjNzVhODY3MWM1MThjODE0NjRiMWI1YTM4OTczNjY1YTA2 NjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5w eQpAQCAtMTQyLDE2ICsxNDIsMTQgQEAgY2xhc3MgUXRQb3J0KFBvcnQpOgogICAgIGRlZiBkZWZh dWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgogICAgICAgICByZXR1cm4gbWFwKHNlbGYu X3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWxmLl9zZWFyY2hfcGF0aHMoKSkKIAotICAgIGRlZiBf c2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocyhzZWxmKToKLSAgICAgICAgc2tpcHBlZF9wYXRoID0g c2VsZi5fc2VhcmNoX3BhdGhzKCkKLSAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRf dGVzdF9ydW5uZXInKSBhbmQgJzUuMCcgaW4gc2VsZi5xdF92ZXJzaW9uKCk6Ci0gICAgICAgICAg ICBza2lwcGVkX3BhdGguYXBwZW5kKCd3azInKQotICAgICAgICByZXR1cm4gc2tpcHBlZF9wYXRo Ci0KICAgICBkZWYgZXhwZWN0YXRpb25zX2ZpbGVzKHNlbGYpOgorICAgICAgICBwYXRocyA9IHNl bGYuX3NlYXJjaF9wYXRocygpCisgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbignd2Via2l0X3Rl c3RfcnVubmVyJyk6CisgICAgICAgICAgICBwYXRocy5hcHBlbmQoJ3drMicpCisKICAgICAgICAg IyBleHBlY3RhdGlvbnNfZmlsZXMoKSB1c2VzIHRoZSBkaXJlY3RvcmllcyBsaXN0ZWQgaW4gX3Nl YXJjaF9wYXRocyByZXZlcnNlZC4KICAgICAgICAgIyBlLmcuIHF0IC0+IHF0LWxpbnV4IC0+IHF0 LTQuOAotICAgICAgICByZXR1cm4gbGlzdChyZXZlcnNlZChbc2VsZi5fZmlsZXN5c3RlbS5qb2lu KHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoKHApLCAnVGVzdEV4cGVjdGF0aW9ucycpIGZvciBw IGluIHNlbGYuX3NlYXJjaF9wYXRocygpXSkpCisgICAgICAgIHJldHVybiBsaXN0KHJldmVyc2Vk KFtzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgocCksICdU ZXN0RXhwZWN0YXRpb25zJykgZm9yIHAgaW4gcGF0aHNdKSkKIAogICAgIGRlZiBzZXR1cF9lbnZp cm9uX2Zvcl9zZXJ2ZXIoc2VsZiwgc2VydmVyX25hbWU9Tm9uZSk6CiAgICAgICAgIGNsZWFuX2Vu diA9IHN1cGVyKFF0UG9ydCwgc2VsZikuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKHNlcnZlcl9u YW1lKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9xdF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvcXRfdW5pdHRlc3QucHkKaW5kZXggMzc0YjEwMjcwMGJjMDk1Yjc5YmExZjgyZTc3ZjdmMmQ5 NmMzNjcyYS4uY2YwOWJkOGUwZTQ0NWVhZmRkM2YwNDNiMjEyM2U0MTRhODZiOTQ5ZiAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVz dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3Vu aXR0ZXN0LnB5CkBAIC03MSwxNCArNzEsNiBAQCBjbGFzcyBRdFBvcnRUZXN0KHBvcnRfdGVzdGNh c2UuUG9ydFRlc3RDYXNlKToKICAgICAgICAgYWJzb2x1dGVfc2VhcmNoX3BhdGhzID0gbWFwKHBv cnQuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWFyY2hfcGF0aHMpCiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKHBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKSwgYWJzb2x1dGVfc2VhcmNoX3Bh dGhzKQogCi0gICAgZGVmIF9hc3NlcnRfc2tpcHBlZF9wYXRoKHNlbGYsIHNlYXJjaF9wYXRocywg b3NfbmFtZSwgdXNlX3dlYmtpdDI9RmFsc2UsIHF0X3ZlcnNpb249JzQuOCcpOgotICAgICAgICBo b3N0ID0gTW9ja1N5c3RlbUhvc3Qob3NfbmFtZT1vc19uYW1lKQotICAgICAgICBob3N0LmV4ZWN1 dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKHNlbGYuX3F0X3ZlcnNpb24ocXRfdmVyc2lvbikpCi0gICAg ICAgIHBvcnRfbmFtZSA9ICdxdC0nICsgb3NfbmFtZQotICAgICAgICBwb3J0ID0gc2VsZi5tYWtl X3BvcnQoaG9zdD1ob3N0LCBxdF92ZXJzaW9uPXF0X3ZlcnNpb24sIHBvcnRfbmFtZT1wb3J0X25h bWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25zPU1vY2tPcHRpb25zKHdl YmtpdF90ZXN0X3J1bm5lcj11c2Vfd2Via2l0MiwgcGxhdGZvcm09J3F0JykpCi0gICAgICAgIHNl bGYuYXNzZXJ0RXF1YWxzKHBvcnQuX3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoKSwgc2VhcmNo X3BhdGhzKQotCiAgICAgZGVmIF9hc3NlcnRfZXhwZWN0YXRpb25zX2ZpbGVzKHNlbGYsIHNlYXJj aF9wYXRocywgb3NfbmFtZSwgdXNlX3dlYmtpdDI9RmFsc2UsIHF0X3ZlcnNpb249JzQuOCcpOgog ICAgICAgICAjIEZJWE1FOiBQb3J0IGNvbnN0cnVjdG9ycyBzaG91bGQgbm90ICJwYXJzZSIgdGhl IHBvcnQgbmFtZSwgYnV0CiAgICAgICAgICMgcmF0aGVyIGJlIHBhc3NlZCBjb21wb25lbnRzIChk aXJlY3RseSBvciB2aWEgc2V0dGVycykuICBPbmNlCkBAIC0xMDAsMTkgKzkyLDEzIEBAIGNsYXNz IFF0UG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICBmb3IgY2Fz ZSBpbiBzZWxmLnNlYXJjaF9wYXRoc19jYXNlczoKICAgICAgICAgICAgIHNlbGYuX2Fzc2VydF9z ZWFyY2hfcGF0aCgqKmNhc2UpCiAKLSAgICBkZWYgdGVzdF9za2lwcGVkX2ZpbGVfc2VhcmNoX3Bh dGgoc2VsZik6Ci0gICAgICAgIGNhc2VsaXN0ID0gc2VsZi5zZWFyY2hfcGF0aHNfY2FzZXNbOl0K LSAgICAgICAgZm9yIGNhc2UgaW4gY2FzZWxpc3Q6Ci0gICAgICAgICAgICBpZiBjYXNlWyd1c2Vf d2Via2l0MiddIGFuZCBjYXNlWydxdF92ZXJzaW9uJ10gPT0gJzUuMCc6Ci0gICAgICAgICAgICAg ICAgY2FzZVsnc2VhcmNoX3BhdGhzJ10uYXBwZW5kKCJ3azIiKQotICAgICAgICAgICAgc2VsZi5f YXNzZXJ0X3NraXBwZWRfcGF0aCgqKmNhc2UpCi0KICAgICBkZWYgdGVzdF9leHBlY3RhdGlvbnNf ZmlsZXMoc2VsZik6CiAgICAgICAgIGZvciBjYXNlIGluIHNlbGYuc2VhcmNoX3BhdGhzX2Nhc2Vz OgogICAgICAgICAgICAgZXhwZWN0YXRpb25zX2Nhc2UgPSBkZWVwY29weShjYXNlKQotICAgICAg ICAgICAgZXhwZWN0YXRpb25zX2Nhc2VbJ3NlYXJjaF9wYXRocyddID0gW10KLSAgICAgICAgICAg IGZvciBwYXRoIGluIHJldmVyc2VkKGNhc2VbJ3NlYXJjaF9wYXRocyddKToKLSAgICAgICAgICAg ICAgICBleHBlY3RhdGlvbnNfY2FzZVsnc2VhcmNoX3BhdGhzJ10uYXBwZW5kKCcvbW9jay1jaGVj a291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS8lcy9UZXN0RXhwZWN0YXRpb25zJyAlIChwYXRoKSkK KyAgICAgICAgICAgIGlmIGV4cGVjdGF0aW9uc19jYXNlWyd1c2Vfd2Via2l0MiddOgorICAgICAg ICAgICAgICAgIGV4cGVjdGF0aW9uc19jYXNlWydzZWFyY2hfcGF0aHMnXS5hcHBlbmQoIndrMiIp CisgICAgICAgICAgICBleHBlY3RhdGlvbnNfY2FzZVsnc2VhcmNoX3BhdGhzJ10ucmV2ZXJzZSgp CisgICAgICAgICAgICBleHBlY3RhdGlvbnNfY2FzZVsnc2VhcmNoX3BhdGhzJ10gPSBtYXAobGFt YmRhIHBhdGg6ICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS8lcy9UZXN0RXhw ZWN0YXRpb25zJyAlIChwYXRoKSwgZXhwZWN0YXRpb25zX2Nhc2VbJ3NlYXJjaF9wYXRocyddKQog ICAgICAgICAgICAgc2VsZi5fYXNzZXJ0X2V4cGVjdGF0aW9uc19maWxlcygqKmV4cGVjdGF0aW9u c19jYXNlKQogCiAgICAgZGVmIHRlc3Rfc2hvd19yZXN1bHRzX2h0bWxfZmlsZShzZWxmKToK