89882 2012-06-25 08:43:26 -0700 [Qt][NRWT] Baseline and skipped file search path cleanup 2012-06-28 15:15:07 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 89108 89966 89880 1 ossy jbadics abarth dpranke ojan ossy webkit.review.bot oldest_to_newest 656591 0 ossy 2012-06-25 08:43:26 -0700 Qt port uses same search paths for Skipped file and baseline search path. (And will for TestExpectations too) We should get rid of copy/paste code for determining paths. 657385 1 149476 jbadics 2012-06-26 01:12:00 -0700 Created attachment 149476 proposed patch 657389 2 webkit.review.bot 2012-06-26 01:15:21 -0700 Attachment 149476 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy..." exit_code: 1 Tools/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 657390 3 149478 jbadics 2012-06-26 01:18:29 -0700 Created attachment 149478 proposed patch Corrected my previous patch 657437 4 149478 ossy 2012-06-26 02:36:17 -0700 Comment on attachment 149478 proposed patch LGTM, r=me. 657443 5 149478 webkit.review.bot 2012-06-26 02:42:24 -0700 Comment on attachment 149478 proposed patch Clearing flags on attachment: 149478 Committed r121244: <http://trac.webkit.org/changeset/121244> 657444 6 webkit.review.bot 2012-06-26 02:42:32 -0700 All reviewed patches have been landed. Closing bug. 657461 7 webkit.review.bot 2012-06-26 03:08:10 -0700 Re-opened since this is blocked by 89966 657469 8 ossy 2012-06-26 03:14:22 -0700 (In reply to comment #5) > (From update of attachment 149478 [details]) > Clearing flags on attachment: 149478 > > Committed r121244: <http://trac.webkit.org/changeset/121244> Rolled out by http://trac.webkit.org/changeset/121247, because skip list path is incorrect. We need one more round. 657473 9 149478 ossy 2012-06-26 03:17:41 -0700 Comment on attachment 149478 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=149478&action=review > Tools/Scripts/webkitpy/layout_tests/port/qt.py:140 > + skipped_path = self._search_paths() > + skipped_path.append('wk2') > + return skipped_path wk2 shouldn't be added unconditionally. We should add it if self.qt_version() is 5.0 and self.get_option('webkit_test_runner') is true. And it seems we don't have unittest for _skipped_file_search_paths. Could you add it too? (without copy/pasting the full test_baseline_search_path) 659430 10 149929 jbadics 2012-06-28 05:09:35 -0700 Created attachment 149929 proposed patch 659495 11 149929 ossy 2012-06-28 07:29:56 -0700 Comment on attachment 149929 proposed patch Nice cleanup, r=me. 659500 12 149929 ossy 2012-06-28 07:33:23 -0700 Comment on attachment 149929 proposed patch Clearing flags on attachment: 149929 Committed r121430: <http://trac.webkit.org/changeset/121430> 659501 13 ossy 2012-06-28 07:33:34 -0700 All reviewed patches have been landed. Closing bug. 659831 14 dpranke 2012-06-28 14:27:23 -0700 Do you actually need a qt-5.0-wk1 directory as well as a qt-5.0-wk2 directory? Can't you just wk1-specific failures in qt-5.0? We don't have a wk1-specific directories for any other ports. 659835 15 ossy 2012-06-28 14:33:34 -0700 (In reply to comment #14) > Do you actually need a qt-5.0-wk1 directory as well as a qt-5.0-wk2 directory? Can't you just wk1-specific failures in qt-5.0? > > We don't have a wk1-specific directories for any other ports. Yes, we need them. If a test fails only on qt-5.0-wk1 platform, we should skip it only on qt-5.0-wk1. If we added it to qt-5.0, it would be skipped on qt-5.0-wk2 too, it would be incorrect. 659869 16 dpranke 2012-06-28 15:15:07 -0700 (In reply to comment #15) > (In reply to comment #14) > > Do you actually need a qt-5.0-wk1 directory as well as a qt-5.0-wk2 directory? Can't you just wk1-specific failures in qt-5.0? > > > > We don't have a wk1-specific directories for any other ports. > > Yes, we need them. If a test fails only on qt-5.0-wk1 platform, > we should skip it only on qt-5.0-wk1. If we added it to qt-5.0, > it would be skipped on qt-5.0-wk2 too, it would be incorrect. I see. I had been thinking of this just from the point of view of storing baselines, and not from managing TestExpectations/Skipped lists. We should probably be more explicit about which directories are allowed to actually contain baselines and which should only have TestExpectations/Skipped files. When I implemented the TestExpectations cascade, that is actually done through a separate function (port.expectations_files()). Maybe we need to duplicate some of the baseline_search_path() logic there instead and use that for Skipped files and TestExpectations files. 149476 2012-06-26 01:12:00 -0700 2012-06-26 01:18:29 -0700 proposed patch nrwt_ossy_blsp_2_changelog.patch text/plain 5871 jbadics ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiNTYz ZjhlLi4yNDQ5MjcxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDYtMjUgIErDoW5vcyBCYWRpY3MgIDxqYmFk aWNzQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBbUXRdW05SV1RdIEZpeCBiYXNlbGluZSBh bmQgc2tpcHBlZCBmaWxlIHNlYXJjaCBwYXRoLgorICAgICAgICBodHRwczovL2dpc3QuZ2l0aHVi LmNvbS8zYjk4MDQ1ZDE4YmQ3OWVlMDkxYworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9x dC5weToKKyAgICAgICAgKFF0UG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aCk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weToKKyAgICAg ICAgKFF0UG9ydFRlc3QudGVzdF9iYXNlbGluZV9zZWFyY2hfcGF0aCk6CisKIDIwMTItMDYtMjUg IFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFtR dF0gRml4IFdpbjMyIGRlYnVnIGJ1aWxkCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9xdC5weQppbmRleCAyNDg4OTM2Li45MTM1NTIxIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKQEAgLTEwNiw3ICsxMDYs MTYgQEAgY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogICAgICAgICAgICAgdmVyc2lvbiA9ICc0 LjgnCiAgICAgICAgIHJldHVybiB2ZXJzaW9uCiAKLSAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3Bh dGgoc2VsZik6CisgICAgZGVmIF9zZWFyY2hfcGF0aHMoc2VsZik6CisgICAgICAgICMgUXQgcG9y dCB1c2VzIHNhbWUgcGF0aHMgZm9yIGJhc2VsaW5lX3NlYXJjaF9wYXRoIGFuZCBfc2tpcHBlZF9m aWxlX3NlYXJjaF9wYXRocworICAgICAgICAjCisgICAgICAgICMgcXQtNS4wLXdrMSAgICBxdC01 LjAtd2syCisgICAgICAgICMgICAgICAgICAgICBcLworICAgICAgICAjICAgICAgICAgcXQtNS4w ICAgIHF0LTQuOAorICAgICAgICAjICAgICAgICAgICAgICAgIFwvCisgICAgICAgICMgICAgKHF0 LWxpbnV4fHF0LW1hY3xxdC13aW4pCisgICAgICAgICMgICAgICAgICAgICAgICAgfAorICAgICAg ICAjICAgICAgICAgICAgICAgcXQKICAgICAgICAgc2VhcmNoX3BhdGhzID0gW10KICAgICAgICAg dmVyc2lvbiA9IHNlbGYucXRfdmVyc2lvbigpCiAgICAgICAgIGlmICc1LjAnIGluIHZlcnNpb246 CkBAIC0xMTQsMjYgKzEyMywyMSBAQCBjbGFzcyBRdFBvcnQoV2ViS2l0UG9ydCk6CiAgICAgICAg ICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNS4wLXdrMicpCiAgICAgICAgICAgICBl bHNlOgogICAgICAgICAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoJ3F0LTUuMC13azEnKQot ICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYubmFtZSgpKQogICAgICAgICBpZiAnNC44 JyBpbiB2ZXJzaW9uOgogICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNC44JykK ICAgICAgICAgZWxpZiB2ZXJzaW9uOgogICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgn cXQtNS4wJykKKyAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLnBvcnRfbmFtZSArICct JyArIHNlbGYuaG9zdC5wbGF0Zm9ybS5vc19uYW1lKQogICAgICAgICBzZWFyY2hfcGF0aHMuYXBw ZW5kKHNlbGYucG9ydF9uYW1lKQotICAgICAgICByZXR1cm4gbWFwKHNlbGYuX3dlYmtpdF9iYXNl bGluZV9wYXRoLCBzZWFyY2hfcGF0aHMpCisgICAgICAgIHJldHVybiBzZWFyY2hfcGF0aHMKKwor ICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKKyAgICAgICAgcmV0dXJuIG1hcChz ZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCwgc2VsZi5fc2VhcmNoX3BhdGhzKCkpCiAKICAgICBk ZWYgX3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoc2VsZik6Ci0gICAgICAgIHNlYXJjaF9wYXRo cyA9IHNldChbc2VsZi5wb3J0X25hbWUsIHNlbGYubmFtZSgpXSkKLSAgICAgICAgdmVyc2lvbiA9 IHNlbGYucXRfdmVyc2lvbigpCi0gICAgICAgIGlmICc0LjgnIGluIHZlcnNpb246Ci0gICAgICAg ICAgICBzZWFyY2hfcGF0aHMuYWRkKCdxdC00LjgnKQotICAgICAgICBlbGlmIHZlcnNpb246Ci0g ICAgICAgICAgICBzZWFyY2hfcGF0aHMuYWRkKCdxdC01LjAnKQotICAgICAgICAgICAgaWYgc2Vs Zi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKLSAgICAgICAgICAgICAgICBzZWFy Y2hfcGF0aHMudXBkYXRlKFsncXQtNS4wLXdrMicsICd3azInXSkKLSAgICAgICAgICAgIGVsc2U6 Ci0gICAgICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFkZCgncXQtNS4wLXdrMScpCi0gICAgICAg IHJldHVybiBzZWFyY2hfcGF0aHMKKyAgICAgICAgc2tpcHBlZF9wYXRoID0gc2VsZi5fc2VhcmNo X3BhdGhzKCkKKyAgICAgICAgc2tpcHBlZF9wYXRoLmFwcGVuZCgnd2syJykKKyAgICAgICAgcmV0 dXJuIHNraXBwZWRfcGF0aAogCiAgICAgZGVmIHNldHVwX2Vudmlyb25fZm9yX3NlcnZlcihzZWxm LCBzZXJ2ZXJfbmFtZT1Ob25lKToKICAgICAgICAgY2xlYW5fZW52ID0gV2ViS2l0UG9ydC5zZXR1 cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoc2VsZiwgc2VydmVyX25hbWUpCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weQppbmRl eCA3MjUyYjk4Li43ZjM5YzY0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkKQEAgLTYwLDIxICs2MCwyMSBAQCBj bGFzcyBRdFBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAgICAgICAgICAg IHJldHVybiAnUU1ha2UgdmVyc2lvbiAyLjAxYVxuVXNpbmcgUXQgdmVyc2lvbiA1LjAuMCBpbiAv dXNyL2xvY2FsL1Ryb2xsdGVjaC9RdC01LjAuMC9saWInCiAKICAgICBkZWYgdGVzdF9iYXNlbGlu ZV9zZWFyY2hfcGF0aChzZWxmKToKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsn cXQtbWFjJywgJ3F0LTQuOCcsICdxdCddLCAnbWFjJywgcXRfdmVyc2lvbj0nNC44JykKLSAgICAg ICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2luJywgJ3F0LTQuOCcsICdxdCddLCAn d2luJywgcXRfdmVyc2lvbj0nNC44JykKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRo KFsncXQtbGludXgnLCAncXQtNC44JywgJ3F0J10sICdsaW51eCcsIHF0X3ZlcnNpb249JzQuOCcp CisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LTQuOCcsICdxdC1tYWMnLCAn cXQnXSwgJ21hYycsIHF0X3ZlcnNpb249JzQuOCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFy Y2hfcGF0aChbJ3F0LTQuOCcsICdxdC13aW4nLCAncXQnXSwgJ3dpbicsIHF0X3ZlcnNpb249JzQu OCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LTQuOCcsICdxdC1saW51 eCcsICdxdCddLCAnbGludXgnLCBxdF92ZXJzaW9uPSc0LjgnKQogCi0gICAgICAgIHNlbGYuX2Fz c2VydF9zZWFyY2hfcGF0aChbJ3F0LW1hYycsICdxdC00LjgnLCAncXQnXSwgJ21hYycpCi0gICAg ICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdpbicsICdxdC00LjgnLCAncXQnXSwg J3dpbicpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LWxpbnV4JywgJ3F0 LTQuOCcsICdxdCddLCAnbGludXgnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgo WydxdC00LjgnLCAncXQtbWFjJywgJ3F0J10sICdtYWMnKQorICAgICAgICBzZWxmLl9hc3NlcnRf c2VhcmNoX3BhdGgoWydxdC00LjgnLCAncXQtd2luJywgJ3F0J10sICd3aW4nKQorICAgICAgICBz ZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC00LjgnLCAncXQtbGludXgnLCAncXQnXSwgJ2xp bnV4JykKIAotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2syJywg J3F0LW1hYycsICdxdC01LjAnLCAncXQnXSwgJ21hYycsIHVzZV93ZWJraXQyPVRydWUsIHF0X3Zl cnNpb249JzUuMCcpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LTUuMC13 azInLCAncXQtd2luJywgJ3F0LTUuMCcsICdxdCddLCAnd2luJywgdXNlX3dlYmtpdDI9VHJ1ZSwg cXRfdmVyc2lvbj0nNS4wJykKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQt NS4wLXdrMicsICdxdC1saW51eCcsICdxdC01LjAnLCAncXQnXSwgJ2xpbnV4JywgdXNlX3dlYmtp dDI9VHJ1ZSwgcXRfdmVyc2lvbj0nNS4wJykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9w YXRoKFsncXQtNS4wLXdrMicsICdxdC01LjAnLCAncXQtbWFjJywgJ3F0J10sICdtYWMnLCB1c2Vf d2Via2l0Mj1UcnVlLCBxdF92ZXJzaW9uPSc1LjAnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2Vh cmNoX3BhdGgoWydxdC01LjAtd2syJywgJ3F0LTUuMCcsICdxdC13aW4nLCAncXQnXSwgJ3dpbics IHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCisgICAgICAgIHNlbGYuX2Fzc2Vy dF9zZWFyY2hfcGF0aChbJ3F0LTUuMC13azInLCAncXQtNS4wJywgJ3F0LWxpbnV4JywgJ3F0J10s ICdsaW51eCcsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCiAKLSAgICAgICAg c2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMScsICdxdC1tYWMnLCAncXQtNS4w JywgJ3F0J10sICdtYWMnLCB1c2Vfd2Via2l0Mj1GYWxzZSwgcXRfdmVyc2lvbj0nNS4wJykKLSAg ICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMScsICdxdC13aW4nLCAn cXQtNS4wJywgJ3F0J10sICd3aW4nLCB1c2Vfd2Via2l0Mj1GYWxzZSwgcXRfdmVyc2lvbj0nNS4w JykKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMScsICdxdC1s aW51eCcsICdxdC01LjAnLCAncXQnXSwgJ2xpbnV4JywgdXNlX3dlYmtpdDI9RmFsc2UsIHF0X3Zl cnNpb249JzUuMCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LTUuMC13 azEnLCAncXQtNS4wJywgJ3F0LW1hYycsICdxdCddLCAnbWFjJywgdXNlX3dlYmtpdDI9RmFsc2Us IHF0X3ZlcnNpb249JzUuMCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0 LTUuMC13azEnLCAncXQtNS4wJywgJ3F0LXdpbicsICdxdCddLCAnd2luJywgdXNlX3dlYmtpdDI9 RmFsc2UsIHF0X3ZlcnNpb249JzUuMCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0 aChbJ3F0LTUuMC13azEnLCAncXQtNS4wJywgJ3F0LWxpbnV4JywgJ3F0J10sICdsaW51eCcsIHVz ZV93ZWJraXQyPUZhbHNlLCBxdF92ZXJzaW9uPSc1LjAnKQogCiAgICAgZGVmIHRlc3Rfc2hvd19y ZXN1bHRzX2h0bWxfZmlsZShzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkK 149478 2012-06-26 01:18:29 -0700 2012-06-28 05:09:35 -0700 proposed patch nrwt_ossy_blsp_2_changelog.patch text/plain 5872 jbadics ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiNTYz ZjhlLi4yNDQ5MjcxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDYtMjUgIErDoW5vcyBCYWRpY3MgIDxqYmFk aWNzQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBbUXRdW05SV1RdIEZpeCBiYXNlbGluZSBh bmQgc2tpcHBlZCBmaWxlIHNlYXJjaCBwYXRoLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk4ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cXQucHk6CisgICAgICAgIChRdFBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgpOgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHk6CisgICAg ICAgIChRdFBvcnRUZXN0LnRlc3RfYmFzZWxpbmVfc2VhcmNoX3BhdGgpOgorCiAyMDEyLTA2LTI1 ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBb UXRdIEZpeCBXaW4zMiBkZWJ1ZyBidWlsZApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvcXQucHkKaW5kZXggMjQ4ODkzNi4uOTEzNTUyMSAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CkBAIC0xMDYsNyArMTA2 LDE2IEBAIGNsYXNzIFF0UG9ydChXZWJLaXRQb3J0KToKICAgICAgICAgICAgIHZlcnNpb24gPSAn NC44JwogICAgICAgICByZXR1cm4gdmVyc2lvbgogCi0gICAgZGVmIGJhc2VsaW5lX3NlYXJjaF9w YXRoKHNlbGYpOgorICAgIGRlZiBfc2VhcmNoX3BhdGhzKHNlbGYpOgorICAgICAgICAjIFF0IHBv cnQgdXNlcyBzYW1lIHBhdGhzIGZvciBiYXNlbGluZV9zZWFyY2hfcGF0aCBhbmQgX3NraXBwZWRf ZmlsZV9zZWFyY2hfcGF0aHMKKyAgICAgICAgIworICAgICAgICAjIHF0LTUuMC13azEgICAgcXQt NS4wLXdrMgorICAgICAgICAjICAgICAgICAgICAgXC8KKyAgICAgICAgIyAgICAgICAgIHF0LTUu MCAgICBxdC00LjgKKyAgICAgICAgIyAgICAgICAgICAgICAgICBcLworICAgICAgICAjICAgIChx dC1saW51eHxxdC1tYWN8cXQtd2luKQorICAgICAgICAjICAgICAgICAgICAgICAgIHwKKyAgICAg ICAgIyAgICAgICAgICAgICAgIHF0CiAgICAgICAgIHNlYXJjaF9wYXRocyA9IFtdCiAgICAgICAg IHZlcnNpb24gPSBzZWxmLnF0X3ZlcnNpb24oKQogICAgICAgICBpZiAnNS4wJyBpbiB2ZXJzaW9u OgpAQCAtMTE0LDI2ICsxMjMsMjEgQEAgY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogICAgICAg ICAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoJ3F0LTUuMC13azInKQogICAgICAgICAgICAg ZWxzZToKICAgICAgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCdxdC01LjAtd2sxJykK LSAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLm5hbWUoKSkKICAgICAgICAgaWYgJzQu OCcgaW4gdmVyc2lvbjoKICAgICAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoJ3F0LTQuOCcp CiAgICAgICAgIGVsaWYgdmVyc2lvbjoKICAgICAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQo J3F0LTUuMCcpCisgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5wb3J0X25hbWUgKyAn LScgKyBzZWxmLmhvc3QucGxhdGZvcm0ub3NfbmFtZSkKICAgICAgICAgc2VhcmNoX3BhdGhzLmFw cGVuZChzZWxmLnBvcnRfbmFtZSkKLSAgICAgICAgcmV0dXJuIG1hcChzZWxmLl93ZWJraXRfYmFz ZWxpbmVfcGF0aCwgc2VhcmNoX3BhdGhzKQorICAgICAgICByZXR1cm4gc2VhcmNoX3BhdGhzCisK KyAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CisgICAgICAgIHJldHVybiBtYXAo c2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIHNlbGYuX3NlYXJjaF9wYXRocygpKQogCiAgICAg ZGVmIF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhzKHNlbGYpOgotICAgICAgICBzZWFyY2hfcGF0 aHMgPSBzZXQoW3NlbGYucG9ydF9uYW1lLCBzZWxmLm5hbWUoKV0pCi0gICAgICAgIHZlcnNpb24g PSBzZWxmLnF0X3ZlcnNpb24oKQotICAgICAgICBpZiAnNC44JyBpbiB2ZXJzaW9uOgotICAgICAg ICAgICAgc2VhcmNoX3BhdGhzLmFkZCgncXQtNC44JykKLSAgICAgICAgZWxpZiB2ZXJzaW9uOgot ICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFkZCgncXQtNS4wJykKLSAgICAgICAgICAgIGlmIHNl bGYuZ2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVubmVyJyk6Ci0gICAgICAgICAgICAgICAgc2Vh cmNoX3BhdGhzLnVwZGF0ZShbJ3F0LTUuMC13azInLCAnd2syJ10pCi0gICAgICAgICAgICBlbHNl OgotICAgICAgICAgICAgICAgIHNlYXJjaF9wYXRocy5hZGQoJ3F0LTUuMC13azEnKQotICAgICAg ICByZXR1cm4gc2VhcmNoX3BhdGhzCisgICAgICAgIHNraXBwZWRfcGF0aCA9IHNlbGYuX3NlYXJj aF9wYXRocygpCisgICAgICAgIHNraXBwZWRfcGF0aC5hcHBlbmQoJ3drMicpCisgICAgICAgIHJl dHVybiBza2lwcGVkX3BhdGgKIAogICAgIGRlZiBzZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoc2Vs Ziwgc2VydmVyX25hbWU9Tm9uZSk6CiAgICAgICAgIGNsZWFuX2VudiA9IFdlYktpdFBvcnQuc2V0 dXBfZW52aXJvbl9mb3Jfc2VydmVyKHNlbGYsIHNlcnZlcl9uYW1lKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkKaW5k ZXggNzI1MmI5OC4uN2YzOWM2NCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CkBAIC02MCwyMSArNjAsMjEgQEAg Y2xhc3MgUXRQb3J0VGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAgICAgICAgICAg ICByZXR1cm4gJ1FNYWtlIHZlcnNpb24gMi4wMWFcblVzaW5nIFF0IHZlcnNpb24gNS4wLjAgaW4g L3Vzci9sb2NhbC9Ucm9sbHRlY2gvUXQtNS4wLjAvbGliJwogCiAgICAgZGVmIHRlc3RfYmFzZWxp bmVfc2VhcmNoX3BhdGgoc2VsZik6Ci0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChb J3F0LW1hYycsICdxdC00LjgnLCAncXQnXSwgJ21hYycsIHF0X3ZlcnNpb249JzQuOCcpCi0gICAg ICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdpbicsICdxdC00LjgnLCAncXQnXSwg J3dpbicsIHF0X3ZlcnNpb249JzQuOCcpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0 aChbJ3F0LWxpbnV4JywgJ3F0LTQuOCcsICdxdCddLCAnbGludXgnLCBxdF92ZXJzaW9uPSc0Ljgn KQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC00LjgnLCAncXQtbWFjJywg J3F0J10sICdtYWMnLCBxdF92ZXJzaW9uPSc0LjgnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2Vh cmNoX3BhdGgoWydxdC00LjgnLCAncXQtd2luJywgJ3F0J10sICd3aW4nLCBxdF92ZXJzaW9uPSc0 LjgnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC00LjgnLCAncXQtbGlu dXgnLCAncXQnXSwgJ2xpbnV4JywgcXRfdmVyc2lvbj0nNC44JykKIAotICAgICAgICBzZWxmLl9h c3NlcnRfc2VhcmNoX3BhdGgoWydxdC1tYWMnLCAncXQtNC44JywgJ3F0J10sICdtYWMnKQotICAg ICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13aW4nLCAncXQtNC44JywgJ3F0J10s ICd3aW4nKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC1saW51eCcsICdx dC00LjgnLCAncXQnXSwgJ2xpbnV4JykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRo KFsncXQtNC44JywgJ3F0LW1hYycsICdxdCddLCAnbWFjJykKKyAgICAgICAgc2VsZi5fYXNzZXJ0 X3NlYXJjaF9wYXRoKFsncXQtNC44JywgJ3F0LXdpbicsICdxdCddLCAnd2luJykKKyAgICAgICAg c2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNC44JywgJ3F0LWxpbnV4JywgJ3F0J10sICds aW51eCcpCiAKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMics ICdxdC1tYWMnLCAncXQtNS4wJywgJ3F0J10sICdtYWMnLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92 ZXJzaW9uPSc1LjAnKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAt d2syJywgJ3F0LXdpbicsICdxdC01LjAnLCAncXQnXSwgJ3dpbicsIHVzZV93ZWJraXQyPVRydWUs IHF0X3ZlcnNpb249JzUuMCcpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0 LTUuMC13azInLCAncXQtbGludXgnLCAncXQtNS4wJywgJ3F0J10sICdsaW51eCcsIHVzZV93ZWJr aXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hf cGF0aChbJ3F0LTUuMC13azInLCAncXQtNS4wJywgJ3F0LW1hYycsICdxdCddLCAnbWFjJywgdXNl X3dlYmtpdDI9VHJ1ZSwgcXRfdmVyc2lvbj0nNS4wJykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3Nl YXJjaF9wYXRoKFsncXQtNS4wLXdrMicsICdxdC01LjAnLCAncXQtd2luJywgJ3F0J10sICd3aW4n LCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJzaW9uPSc1LjAnKQorICAgICAgICBzZWxmLl9hc3Nl cnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2syJywgJ3F0LTUuMCcsICdxdC1saW51eCcsICdxdCdd LCAnbGludXgnLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJzaW9uPSc1LjAnKQogCi0gICAgICAg IHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LTUuMC13azEnLCAncXQtbWFjJywgJ3F0LTUu MCcsICdxdCddLCAnbWFjJywgdXNlX3dlYmtpdDI9RmFsc2UsIHF0X3ZlcnNpb249JzUuMCcpCi0g ICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LTUuMC13azEnLCAncXQtd2luJywg J3F0LTUuMCcsICdxdCddLCAnd2luJywgdXNlX3dlYmtpdDI9RmFsc2UsIHF0X3ZlcnNpb249JzUu MCcpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LTUuMC13azEnLCAncXQt bGludXgnLCAncXQtNS4wJywgJ3F0J10sICdsaW51eCcsIHVzZV93ZWJraXQyPUZhbHNlLCBxdF92 ZXJzaW9uPSc1LjAnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAt d2sxJywgJ3F0LTUuMCcsICdxdC1tYWMnLCAncXQnXSwgJ21hYycsIHVzZV93ZWJraXQyPUZhbHNl LCBxdF92ZXJzaW9uPSc1LjAnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydx dC01LjAtd2sxJywgJ3F0LTUuMCcsICdxdC13aW4nLCAncXQnXSwgJ3dpbicsIHVzZV93ZWJraXQy PUZhbHNlLCBxdF92ZXJzaW9uPSc1LjAnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3Bh dGgoWydxdC01LjAtd2sxJywgJ3F0LTUuMCcsICdxdC1saW51eCcsICdxdCddLCAnbGludXgnLCB1 c2Vfd2Via2l0Mj1GYWxzZSwgcXRfdmVyc2lvbj0nNS4wJykKIAogICAgIGRlZiB0ZXN0X3Nob3df cmVzdWx0c19odG1sX2ZpbGUoc2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgp Cg== 149929 2012-06-28 05:09:35 -0700 2012-06-28 07:33:23 -0700 proposed patch nrwt_ossy_blsp_6_changelog.patch text/plain 8076 jbadics ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1ZDI3 MjcyLi5jYzVmNDQ4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTItMDYtMjggIErDoW5vcyBCYWRpY3MgIDxqYmFk aWNzQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBbUXRdW05SV1RdIEZpeCBiYXNlbGluZSBh bmQgc2tpcHBlZCBmaWxlIHNlYXJjaCBwYXRoLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk4ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cXQucHk6CisgICAgICAgIChRdFBvcnQuX3NlYXJjaF9wYXRocyk6CisgICAgICAgIChRdFBvcnQp OgorICAgICAgICAoUXRQb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRoKToKKyAgICAgICAgKFF0UG9y dC5fc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weToKKyAgICAgICAgKFF0UG9ydFRlc3Qp OgorICAgICAgICAoUXRQb3J0VGVzdC5fYXNzZXJ0X3NraXBwZWRfcGF0aCk6CisgICAgICAgIChR dFBvcnRUZXN0LnRlc3RfYmFzZWxpbmVfc2VhcmNoX3BhdGgpOgorICAgICAgICAoUXRQb3J0VGVz dC50ZXN0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aCk6CisKIDIwMTItMDYtMjYgIEtyaXN0w7Nm IEtvc3p0ecOzICA8a2tyaXN0b2ZAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFtOUldUXSBY dmZiRHJpdmVyIHNob3VsZCBjaG9vc2UgdGhlIG5leHQgZnJlZSBkaXNwbGF5CmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQppbmRleCA1MjA1NzU5Li40 MmJjYzFkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3F0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cXQucHkKQEAgLTEwOSw3ICsxMDksMTYgQEAgY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogICAg ICAgICAgICAgdmVyc2lvbiA9ICc0LjgnCiAgICAgICAgIHJldHVybiB2ZXJzaW9uCiAKLSAgICBk ZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CisgICAgZGVmIF9zZWFyY2hfcGF0aHMoc2Vs Zik6CisgICAgICAgICMgUXQgcG9ydCB1c2VzIHNhbWUgcGF0aHMgZm9yIGJhc2VsaW5lX3NlYXJj aF9wYXRoIGFuZCBfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocworICAgICAgICAjCisgICAgICAg ICMgcXQtNS4wLXdrMSAgICBxdC01LjAtd2syCisgICAgICAgICMgICAgICAgICAgICBcLworICAg ICAgICAjICAgICAgICAgcXQtNS4wICAgIHF0LTQuOAorICAgICAgICAjICAgICAgICAgICAgICAg IFwvCisgICAgICAgICMgICAgKHF0LWxpbnV4fHF0LW1hY3xxdC13aW4pCisgICAgICAgICMgICAg ICAgICAgICAgICAgfAorICAgICAgICAjICAgICAgICAgICAgICAgcXQKICAgICAgICAgc2VhcmNo X3BhdGhzID0gW10KICAgICAgICAgdmVyc2lvbiA9IHNlbGYucXRfdmVyc2lvbigpCiAgICAgICAg IGlmICc1LjAnIGluIHZlcnNpb246CkBAIC0xMTcsMjYgKzEyNiwyMiBAQCBjbGFzcyBRdFBvcnQo V2ViS2l0UG9ydCk6CiAgICAgICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNS4w LXdrMicpCiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIHNlYXJjaF9wYXRocy5h cHBlbmQoJ3F0LTUuMC13azEnKQotICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYubmFt ZSgpKQogICAgICAgICBpZiAnNC44JyBpbiB2ZXJzaW9uOgogICAgICAgICAgICAgc2VhcmNoX3Bh dGhzLmFwcGVuZCgncXQtNC44JykKICAgICAgICAgZWxpZiB2ZXJzaW9uOgogICAgICAgICAgICAg c2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNS4wJykKKyAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVu ZChzZWxmLnBvcnRfbmFtZSArICctJyArIHNlbGYuaG9zdC5wbGF0Zm9ybS5vc19uYW1lKQogICAg ICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYucG9ydF9uYW1lKQotICAgICAgICByZXR1cm4g bWFwKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWFyY2hfcGF0aHMpCisgICAgICAgIHJl dHVybiBzZWFyY2hfcGF0aHMKKworICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToK KyAgICAgICAgcmV0dXJuIG1hcChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCwgc2VsZi5fc2Vh cmNoX3BhdGhzKCkpCiAKICAgICBkZWYgX3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoc2VsZik6 Ci0gICAgICAgIHNlYXJjaF9wYXRocyA9IHNldChbc2VsZi5wb3J0X25hbWUsIHNlbGYubmFtZSgp XSkKLSAgICAgICAgdmVyc2lvbiA9IHNlbGYucXRfdmVyc2lvbigpCi0gICAgICAgIGlmICc0Ljgn IGluIHZlcnNpb246Ci0gICAgICAgICAgICBzZWFyY2hfcGF0aHMuYWRkKCdxdC00LjgnKQotICAg ICAgICBlbGlmIHZlcnNpb246Ci0gICAgICAgICAgICBzZWFyY2hfcGF0aHMuYWRkKCdxdC01LjAn KQotICAgICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToK LSAgICAgICAgICAgICAgICBzZWFyY2hfcGF0aHMudXBkYXRlKFsncXQtNS4wLXdrMicsICd3azIn XSkKLSAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFkZCgn cXQtNS4wLXdrMScpCi0gICAgICAgIHJldHVybiBzZWFyY2hfcGF0aHMKKyAgICAgICAgc2tpcHBl ZF9wYXRoID0gc2VsZi5fc2VhcmNoX3BhdGhzKCkKKyAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9u KCd3ZWJraXRfdGVzdF9ydW5uZXInKSBhbmQgJzUuMCcgaW4gc2VsZi5xdF92ZXJzaW9uKCk6Cisg ICAgICAgICAgICBza2lwcGVkX3BhdGguYXBwZW5kKCd3azInKQorICAgICAgICByZXR1cm4gc2tp cHBlZF9wYXRoCiAKICAgICBkZWYgc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKHNlbGYsIHNlcnZl cl9uYW1lPU5vbmUpOgogICAgICAgICBjbGVhbl9lbnYgPSBXZWJLaXRQb3J0LnNldHVwX2Vudmly b25fZm9yX3NlcnZlcihzZWxmLCBzZXJ2ZXJfbmFtZSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CmluZGV4IDcyNTJi OTguLjkyOWFjYzAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvcXRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weQpAQCAtNDAsNiArNDAsMjMgQEAgZnJvbSB3ZWJr aXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2NrT3B0aW9ucwogY2xhc3MgUXRQb3J0VGVzdChw b3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAgICAgcG9ydF9uYW1lID0gJ3F0LW1hYycKICAg ICBwb3J0X21ha2VyID0gUXRQb3J0CisgICAgc2VhcmNoX3BhdGhzX2Nhc2VzID0gWworICAgICAg ICB7J3NlYXJjaF9wYXRocyc6WydxdC00LjgnLCAncXQtbWFjJywgJ3F0J10sICdvc19uYW1lJzon bWFjJywgJ3VzZV93ZWJraXQyJzpGYWxzZSwgJ3F0X3ZlcnNpb24nOic0LjgnfSwKKyAgICAgICAg eydzZWFyY2hfcGF0aHMnOlsncXQtNC44JywgJ3F0LXdpbicsICdxdCddLCAnb3NfbmFtZSc6J3dp bicsICd1c2Vfd2Via2l0Mic6RmFsc2UsICdxdF92ZXJzaW9uJzonNC44J30sCisgICAgICAgIHsn c2VhcmNoX3BhdGhzJzpbJ3F0LTQuOCcsICdxdC1saW51eCcsICdxdCddLCAnb3NfbmFtZSc6J2xp bnV4JywgJ3VzZV93ZWJraXQyJzpGYWxzZSwgJ3F0X3ZlcnNpb24nOic0LjgnfSwKKworICAgICAg ICB7J3NlYXJjaF9wYXRocyc6WydxdC00LjgnLCAncXQtbWFjJywgJ3F0J10sICdvc19uYW1lJzon bWFjJywgJ3VzZV93ZWJraXQyJzpGYWxzZX0sCisgICAgICAgIHsnc2VhcmNoX3BhdGhzJzpbJ3F0 LTQuOCcsICdxdC13aW4nLCAncXQnXSwgJ29zX25hbWUnOid3aW4nLCAndXNlX3dlYmtpdDInOkZh bHNlfSwKKyAgICAgICAgeydzZWFyY2hfcGF0aHMnOlsncXQtNC44JywgJ3F0LWxpbnV4JywgJ3F0 J10sICdvc19uYW1lJzonbGludXgnLCAndXNlX3dlYmtpdDInOkZhbHNlfSwKKworICAgICAgICB7 J3NlYXJjaF9wYXRocyc6WydxdC01LjAtd2syJywgJ3F0LTUuMCcsICdxdC1tYWMnLCAncXQnXSwg J29zX25hbWUnOidtYWMnLCAndXNlX3dlYmtpdDInOlRydWUsICdxdF92ZXJzaW9uJzonNS4wJ30s CisgICAgICAgIHsnc2VhcmNoX3BhdGhzJzpbJ3F0LTUuMC13azInLCAncXQtNS4wJywgJ3F0LXdp bicsICdxdCddLCAnb3NfbmFtZSc6J3dpbicsICd1c2Vfd2Via2l0Mic6VHJ1ZSwgJ3F0X3ZlcnNp b24nOic1LjAnfSwKKyAgICAgICAgeydzZWFyY2hfcGF0aHMnOlsncXQtNS4wLXdrMicsICdxdC01 LjAnLCAncXQtbGludXgnLCAncXQnXSwgJ29zX25hbWUnOidsaW51eCcsICd1c2Vfd2Via2l0Mic6 VHJ1ZSwgJ3F0X3ZlcnNpb24nOic1LjAnfSwKKworICAgICAgICB7J3NlYXJjaF9wYXRocyc6Wydx dC01LjAtd2sxJywgJ3F0LTUuMCcsICdxdC1tYWMnLCAncXQnXSwgJ29zX25hbWUnOidtYWMnLCAn dXNlX3dlYmtpdDInOkZhbHNlLCAncXRfdmVyc2lvbic6JzUuMCd9LAorICAgICAgICB7J3NlYXJj aF9wYXRocyc6WydxdC01LjAtd2sxJywgJ3F0LTUuMCcsICdxdC13aW4nLCAncXQnXSwgJ29zX25h bWUnOid3aW4nLCAndXNlX3dlYmtpdDInOkZhbHNlLCAncXRfdmVyc2lvbic6JzUuMCd9LAorICAg ICAgICB7J3NlYXJjaF9wYXRocyc6WydxdC01LjAtd2sxJywgJ3F0LTUuMCcsICdxdC1saW51eCcs ICdxdCddLCAnb3NfbmFtZSc6J2xpbnV4JywgJ3VzZV93ZWJraXQyJzpGYWxzZSwgJ3F0X3ZlcnNp b24nOic1LjAnfSwKKyAgICBdCiAKICAgICBkZWYgX2Fzc2VydF9zZWFyY2hfcGF0aChzZWxmLCBz ZWFyY2hfcGF0aHMsIG9zX25hbWU9Tm9uZSwgdXNlX3dlYmtpdDI9RmFsc2UsIHF0X3ZlcnNpb249 JzQuOCcpOgogICAgICAgICAjIEZJWE1FOiBQb3J0IGNvbnN0cnVjdG9ycyBzaG91bGQgbm90ICJw YXJzZSIgdGhlIHBvcnQgbmFtZSwgYnV0CkBAIC01Myw2ICs3MCwxNCBAQCBjbGFzcyBRdFBvcnRU ZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAgICAgICAgYWJzb2x1dGVfc2VhcmNo X3BhdGhzID0gbWFwKHBvcnQuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWFyY2hfcGF0aHMpCiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKSwgYWJz b2x1dGVfc2VhcmNoX3BhdGhzKQogCisgICAgZGVmIF9hc3NlcnRfc2tpcHBlZF9wYXRoKHNlbGYs IHNlYXJjaF9wYXRocywgb3NfbmFtZT1Ob25lLCB1c2Vfd2Via2l0Mj1GYWxzZSwgcXRfdmVyc2lv bj0nNC44Jyk6CisgICAgICAgIGhvc3QgPSBNb2NrU3lzdGVtSG9zdChvc19uYW1lPW9zX25hbWUp CisgICAgICAgIGhvc3QuZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIoc2VsZi5fcXRfdmVyc2lv bihxdF92ZXJzaW9uKSkKKyAgICAgICAgcG9ydF9uYW1lID0gJ3F0LScgKyBvc19uYW1lCisgICAg ICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChob3N0PWhvc3QsIHF0X3ZlcnNpb249cXRfdmVyc2lv biwgcG9ydF9uYW1lPXBvcnRfbmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9w dGlvbnM9TW9ja09wdGlvbnMod2Via2l0X3Rlc3RfcnVubmVyPXVzZV93ZWJraXQyLCBwbGF0Zm9y bT0ncXQnKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5fc2tpcHBlZF9maWxlX3Nl YXJjaF9wYXRocygpLCBzZWFyY2hfcGF0aHMpCisKICAgICBkZWYgX3F0X3ZlcnNpb24oc2VsZiwg cXRfdmVyc2lvbik6CiAgICAgICAgIGlmIHF0X3ZlcnNpb24gaW4gJzQuOCc6CiAgICAgICAgICAg ICByZXR1cm4gJ1FNYWtlIHZlcnNpb24gMi4wMWFcblVzaW5nIFF0IHZlcnNpb24gNC44LjAgaW4g L3Vzci9sb2NhbC9Ucm9sbHRlY2gvUXQtNC44LjIvbGliJwpAQCAtNjAsMjEgKzg1LDE1IEBAIGNs YXNzIFF0UG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICAgICAg cmV0dXJuICdRTWFrZSB2ZXJzaW9uIDIuMDFhXG5Vc2luZyBRdCB2ZXJzaW9uIDUuMC4wIGluIC91 c3IvbG9jYWwvVHJvbGx0ZWNoL1F0LTUuMC4wL2xpYicKIAogICAgIGRlZiB0ZXN0X2Jhc2VsaW5l X3NlYXJjaF9wYXRoKHNlbGYpOgotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydx dC1tYWMnLCAncXQtNC44JywgJ3F0J10sICdtYWMnLCBxdF92ZXJzaW9uPSc0LjgnKQotICAgICAg ICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13aW4nLCAncXQtNC44JywgJ3F0J10sICd3 aW4nLCBxdF92ZXJzaW9uPSc0LjgnKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgo WydxdC1saW51eCcsICdxdC00LjgnLCAncXQnXSwgJ2xpbnV4JywgcXRfdmVyc2lvbj0nNC44JykK LQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC1tYWMnLCAncXQtNC44Jywg J3F0J10sICdtYWMnKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13aW4n LCAncXQtNC44JywgJ3F0J10sICd3aW4nKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3Bh dGgoWydxdC1saW51eCcsICdxdC00LjgnLCAncXQnXSwgJ2xpbnV4JykKLQotICAgICAgICBzZWxm Ll9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2syJywgJ3F0LW1hYycsICdxdC01LjAnLCAn cXQnXSwgJ21hYycsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCi0gICAgICAg IHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LTUuMC13azInLCAncXQtd2luJywgJ3F0LTUu MCcsICdxdCddLCAnd2luJywgdXNlX3dlYmtpdDI9VHJ1ZSwgcXRfdmVyc2lvbj0nNS4wJykKLSAg ICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMicsICdxdC1saW51eCcs ICdxdC01LjAnLCAncXQnXSwgJ2xpbnV4JywgdXNlX3dlYmtpdDI9VHJ1ZSwgcXRfdmVyc2lvbj0n NS4wJykKLQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2sxJywg J3F0LW1hYycsICdxdC01LjAnLCAncXQnXSwgJ21hYycsIHVzZV93ZWJraXQyPUZhbHNlLCBxdF92 ZXJzaW9uPSc1LjAnKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAt d2sxJywgJ3F0LXdpbicsICdxdC01LjAnLCAncXQnXSwgJ3dpbicsIHVzZV93ZWJraXQyPUZhbHNl LCBxdF92ZXJzaW9uPSc1LjAnKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydx dC01LjAtd2sxJywgJ3F0LWxpbnV4JywgJ3F0LTUuMCcsICdxdCddLCAnbGludXgnLCB1c2Vfd2Vi a2l0Mj1GYWxzZSwgcXRfdmVyc2lvbj0nNS4wJykKKyAgICAgICAgZm9yIGNhc2UgaW4gc2VsZi5z ZWFyY2hfcGF0aHNfY2FzZXM6CisgICAgICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgo KipjYXNlKQorCisgICAgZGVmIHRlc3Rfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRoKHNlbGYpOgor ICAgICAgICBjYXNlbGlzdCA9IHNlbGYuc2VhcmNoX3BhdGhzX2Nhc2VzWzpdCisgICAgICAgIGZv ciBjYXNlIGluIGNhc2VsaXN0OgorICAgICAgICAgICAgaWYgY2FzZVsndXNlX3dlYmtpdDInXSBh bmQgY2FzZVsncXRfdmVyc2lvbiddID09ICc1LjAnOgorICAgICAgICAgICAgICAgIGNhc2VbJ3Nl YXJjaF9wYXRocyddLmFwcGVuZCgid2syIikKKyAgICAgICAgICAgIHNlbGYuX2Fzc2VydF9za2lw cGVkX3BhdGgoKipjYXNlKQogCiAgICAgZGVmIHRlc3Rfc2hvd19yZXN1bHRzX2h0bWxfZmlsZShz ZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkK