49835 2010-11-19 14:32:59 -0800 Ignore reference files which will be used by reftests when collecting test cases. 2010-11-22 14:52:51 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 36065 1 hayato webkit-unassigned dpranke hamaji tony webkit.review.bot oldest_to_newest 311695 0 hayato 2010-11-19 14:32:59 -0800 This is a necessary step to support reftests. We need to ignore reference files when collecting test files in NRWT. 311697 1 74425 hayato 2010-11-19 14:37:19 -0800 Created attachment 74425 ignore-ref-files 311699 2 webkit.review.bot 2010-11-19 14:40:36 -0800 Attachment 74425 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--diff-files', u'WebKitTools/ChangeLog', u'WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py', u'WebKitTools/Scripts/webkitpy/layout_tests/port/test_files_unittest.py']" exit_code: 1 WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py:124: indentation is not a multiple of four [pep8/E111] [5] WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py:125: indentation is not a multiple of four [pep8/E111] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 311701 3 74426 hayato 2010-11-19 14:44:04 -0800 Created attachment 74426 ignore-ref-files-fix-style 311718 4 74426 hamaji 2010-11-19 15:17:44 -0800 Comment on attachment 74426 ignore-ref-files-fix-style View in context: https://bugs.webkit.org/attachment.cgi?id=74426&action=review Style nitpicks. > WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py:122 > + if any(filename.endswith(ignored_suffix) for ignored_suffix I think a simple loop would be easier to read and not longer than this code: for ignored_suffix in _ignored_suffixes: if filename.endwith(ignored_suffix): _log.warn(... return True return False > WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py:124 > + _log.warn('Reftests is not suuperted yet. %s is ignored.', filename) "Reftest is not" ? > WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py:130 > + """Return true if filename represents test cases we want to run a test It would be better to have one-line summary on the top of docstring. 311769 5 74426 dpranke 2010-11-19 17:25:03 -0800 Comment on attachment 74426 ignore-ref-files-fix-style View in context: https://bugs.webkit.org/attachment.cgi?id=74426&action=review > WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py:123 > + in _ignored_suffixes): I actually think the any() is fine, but the variable names make it a bit hard to read. I'd use: if any(filename.endswith(suffix) for suffix in _ignored_suffixes): _log.warn(...) return True return False I would also consider renaming is_ignored_file to is_reftest and moving the _ignored_suffixes constant inside the function. You could get away with: def _is_reftest(filename): return (filename.endswith('-expected.html') or filename.endswith('-expected-mismatch.html')) Slightly less generic, but a lot easier to read and understand. >> WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py:124 >> + _log.warn('Reftests is not suuperted yet. %s is ignored.', filename) > > "Reftest is not" ? _log.warn("Ignoring %s - reftests are not supported." % filename) or _log.warn("Reftests are not supported - ignoring %s" % filename) depending on which aspect you want to emphasize. > WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py:131 > + on.""" I'm not sure that a docstring really adds anything here, but if you really wanted one, you could have "Return True if the filename points to a test file." 312498 6 74594 hayato 2010-11-22 13:51:39 -0800 Created attachment 74594 ignore-reffiles-3 312502 7 hayato 2010-11-22 13:57:19 -0800 Thank you for the reviews, hamaji-san and Dirk. (In reply to comment #5) > (From update of attachment 74426 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=74426&action=review > > > WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py:123 > > + in _ignored_suffixes): > > I actually think the any() is fine, but the variable names make it a bit hard to read. I'd use: > > if any(filename.endswith(suffix) for suffix in _ignored_suffixes): > _log.warn(...) > return True > return False > > I would also consider renaming is_ignored_file to is_reftest and moving the _ignored_suffixes constant inside the function. > > You could get away with: > > def _is_reftest(filename): > return (filename.endswith('-expected.html') or > filename.endswith('-expected-mismatch.html')) > > Slightly less generic, but a lot easier to read and understand. I agree. I just renamed that function to 'is_reference_html_file'. I think that might be better. It seems I did a too early generalization in the previous patch. > > >> WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py:124 > >> + _log.warn('Reftests is not suuperted yet. %s is ignored.', filename) > > > > "Reftest is not" ? > > _log.warn("Ignoring %s - reftests are not supported." % filename) > > or > > _log.warn("Reftests are not supported - ignoring %s" % filename) > > depending on which aspect you want to emphasize. Thank you. Done. > > > WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py:131 > > + on.""" > > I'm not sure that a docstring really adds anything here, but if you really wanted one, you could have "Return True if the filename points to a test file." Done. 312509 8 74594 dpranke 2010-11-22 14:09:26 -0800 Comment on attachment 74594 ignore-reffiles-3 View in context: https://bugs.webkit.org/attachment.cgi?id=74594&action=review LGTM apart from the typo :) > WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py:117 > + """Return true if the filename poinsts to a reference HTML file.""" Nit: typo - "poinsts" 312518 9 74597 hayato 2010-11-22 14:19:33 -0800 Created attachment 74597 ignore-reffiles-4 312519 10 hayato 2010-11-22 14:20:19 -0800 (In reply to comment #8) > > Nit: typo - "poinsts" I am sorry, fixed. 312538 11 74597 hayato 2010-11-22 14:52:43 -0800 Comment on attachment 74597 ignore-reffiles-4 Clearing flags on attachment: 74597 Committed r72564: <http://trac.webkit.org/changeset/72564> 312539 12 hayato 2010-11-22 14:52:51 -0800 All reviewed patches have been landed. Closing bug. 74425 2010-11-19 14:37:19 -0800 2010-11-19 14:43:59 -0800 ignore-ref-files bug-49835-20101120073717.patch text/plain 4073 hayato ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzNTMyYzkyYWIzN2E3NmEyYjVmNzlhMGNhYTBkM2ViMDExOWQxMWRiLi45ZjZmODAy MWI1ZDQ5NmIyMjg0ODQxYzJkZTY4MWYyNmM1MGFlYTkyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMTEtMTkgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElnbm9yZSByZWZlcmVuY2Ug ZmlsZXMgd2hpY2ggd2lsbCBiZSB1c2VkIGJ5IHJlZnRlc3RzIHdoZW4gY29sbGVjdGluZworICAg ICAgICB0ZXN0IGNhc2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDk4MzUKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvdGVzdF9maWxlcy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3Rlc3RfZmlsZXNfdW5pdHRlc3QucHk6CisKIDIwMTAtMTEtMTggIEdhdmluIEJh cnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeCAt IGFzIHBlciBEUlQtbWFjLCBhbHdheXMgZW5hYmxlZCBkZXZlbG9wZXIgZXh0cmFzLApkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0 X2ZpbGVzLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC90ZXN0X2ZpbGVzLnB5CmluZGV4IDNmYTBmYjM2NGJiMzE5NjAyZTYxOWFkZjVkZDUxZDMyYjBm NTdhNTIuLmIyM2QwMDJhYzZlYTEwMmIxN2NkZTQ4NTI3Mjg4MjA0NDQzMmMxMjUgMTAwNjQ0Ci0t LSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdF9m aWxlcy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3Rlc3RfZmlsZXMucHkKQEAgLTUwLDYgKzUwLDEwIEBAIF9zdXBwb3J0ZWRfZmlsZV9leHRl bnNpb25zID0gc2V0KFsnLmh0bWwnLCAnLnNodG1sJywgJy54bWwnLCAnLnhodG1sJywgJy54aHRt bG1wCiAjIFdoZW4gY29sbGVjdGluZyB0ZXN0IGNhc2VzLCBza2lwIHRoZXNlIGRpcmVjdG9yaWVz CiBfc2tpcHBlZF9kaXJlY3RvcmllcyA9IHNldChbJy5zdm4nLCAnX3N2bicsICdyZXNvdXJjZXMn LCAnc2NyaXB0LXRlc3RzJ10pCiAKKyMgV2hlbiBjb2xsZWN0aW5nIHRlc3QgY2FzZXMsIGlnbm9y ZSBmaWxlcyB3aXRoIHRoZXNlIHN1ZmZpeGVzLgorIyBDdXJyZW50bHkgcmVmZXJlbmNlIGZpbGVz IHVzZWQgYnkgcmVmdGVzdHMgYXJlIGxpc3RlZC4KK19pZ25vcmVkX3N1ZmZpeGVzID0gc2V0KFsn LWV4cGVjdGVkLmh0bWwnLCAnZXhwZWN0ZWQtbWlzbWF0Y2guaHRtbCddKQorCiAKIGRlZiBmaW5k KHBvcnQsIHBhdGhzKToKICAgICAiIiJGaW5kcyB0aGUgc2V0IG9mIHRlc3RzIHVuZGVyIHBvcnQu bGF5b3V0X3Rlc3RzX2RpcigpLgpAQCAtNzgsNyArODIsNyBAQCBkZWYgZmluZChwb3J0LCBwYXRo cyk6CiAgICAgIyBOb3cgd2FsayBhbGwgdGhlIHBhdGhzIHBhc3NlZCBpbiBvbiB0aGUgY29tbWFu ZCBsaW5lIGFuZCBnZXQgZmlsZW5hbWVzCiAgICAgdGVzdF9maWxlcyA9IHNldCgpCiAgICAgZm9y IHBhdGggaW4gcGF0aHNfdG9fd2FsazoKLSAgICAgICAgaWYgb3MucGF0aC5pc2ZpbGUocGF0aCkg YW5kIF9oYXNfc3VwcG9ydGVkX2V4dGVuc2lvbihwYXRoKToKKyAgICAgICAgaWYgb3MucGF0aC5p c2ZpbGUocGF0aCkgYW5kIF9pc190ZXN0X2ZpbGUocGF0aCk6CiAgICAgICAgICAgICB0ZXN0X2Zp bGVzLmFkZChvcy5wYXRoLm5vcm1wYXRoKHBhdGgpKQogICAgICAgICAgICAgY29udGludWUKIApA QCAtOTUsNyArOTksNyBAQCBkZWYgZmluZChwb3J0LCBwYXRocyk6CiAgICAgICAgICAgICAgICAg ICAgIGRpcnMucmVtb3ZlKGRpcmVjdG9yeSkKIAogICAgICAgICAgICAgZm9yIGZpbGVuYW1lIGlu IGZpbGVzOgotICAgICAgICAgICAgICAgIGlmIF9oYXNfc3VwcG9ydGVkX2V4dGVuc2lvbihmaWxl bmFtZSk6CisgICAgICAgICAgICAgICAgaWYgX2lzX3Rlc3RfZmlsZShmaWxlbmFtZSk6CiAgICAg ICAgICAgICAgICAgICAgIGZpbGVuYW1lID0gb3MucGF0aC5qb2luKHJvb3QsIGZpbGVuYW1lKQog ICAgICAgICAgICAgICAgICAgICBmaWxlbmFtZSA9IG9zLnBhdGgubm9ybXBhdGgoZmlsZW5hbWUp CiAgICAgICAgICAgICAgICAgICAgIHRlc3RfZmlsZXMuYWRkKGZpbGVuYW1lKQpAQCAtMTExLDMg KzExNSwxOCBAQCBkZWYgX2hhc19zdXBwb3J0ZWRfZXh0ZW5zaW9uKGZpbGVuYW1lKToKICAgICB0 ZXN0IG9uLiIiIgogICAgIGV4dGVuc2lvbiA9IG9zLnBhdGguc3BsaXRleHQoZmlsZW5hbWUpWzFd CiAgICAgcmV0dXJuIGV4dGVuc2lvbiBpbiBfc3VwcG9ydGVkX2ZpbGVfZXh0ZW5zaW9ucworCisK K2RlZiBfaXNfaWdub3JlZF9maWxlKGZpbGVuYW1lKToKKyAgICAiIiJSZXR1cm4gdHJ1ZSBpZiBm aWxlbmFtZSBzaG91bGQgYmUgaWdub3JlZC4iIiIKKyAgICBpZiBhbnkoZmlsZW5hbWUuZW5kc3dp dGgoaWdub3JlZF9zdWZmaXgpIGZvciBpZ25vcmVkX3N1ZmZpeAorICAgICAgICAgICBpbiBfaWdu b3JlZF9zdWZmaXhlcyk6CisgICAgICBfbG9nLndhcm4oJ1JlZnRlc3RzIGlzIG5vdCBzdXVwZXJ0 ZWQgeWV0LiAlcyBpcyBpZ25vcmVkLicsIGZpbGVuYW1lKQorICAgICAgcmV0dXJuIFRydWUKKyAg ICByZXR1cm4gRmFsc2UKKworCitkZWYgX2lzX3Rlc3RfZmlsZShmaWxlbmFtZSk6CisgICAgIiIi UmV0dXJuIHRydWUgaWYgZmlsZW5hbWUgcmVwcmVzZW50cyB0ZXN0IGNhc2VzIHdlIHdhbnQgdG8g cnVuIGEgdGVzdAorICAgIG9uLiIiIgorICAgIHJldHVybiBfaGFzX3N1cHBvcnRlZF9leHRlbnNp b24oZmlsZW5hbWUpIGFuZCBub3QgX2lzX2lnbm9yZWRfZmlsZShmaWxlbmFtZSkKZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdF9m aWxlc191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvdGVzdF9maWxlc191bml0dGVzdC5weQppbmRleCBjMzdlYjkyOTI2ZThkZjU0MjJi NzA5YjhjMTI1MjNmYjUxMjliM2Y1Li44MzUyNWM4MjNmMzk0MmYzNzQzN2Y4MzQzNzVkMTYwNzA0 M2MzYTQxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3Rlc3RfZmlsZXNfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0X2ZpbGVzX3VuaXR0ZXN0LnB5CkBAIC02 Myw2ICs2MywxMyBAQCBjbGFzcyBUZXN0RmlsZXNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgdGVzdHMgPSB0ZXN0X2ZpbGVzLmZpbmQocG9ydCwgWyd1c2Vyc2NyaXB0cy9yZXNvdXJj ZXMnXSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh0ZXN0cywgc2V0KFtdKSkKIAorICAgIGRl ZiB0ZXN0X2lzX3Rlc3RfZmlsZShzZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHRlc3Rf ZmlsZXMuX2lzX3Rlc3RfZmlsZSgnZm9vLmh0bWwnKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVl KHRlc3RfZmlsZXMuX2lzX3Rlc3RfZmlsZSgnZm9vLnNodG1sJykpCisgICAgICAgIHNlbGYuYXNz ZXJ0RmFsc2UodGVzdF9maWxlcy5faXNfdGVzdF9maWxlKCdmb28ucG5nJykpCisgICAgICAgIHNl bGYuYXNzZXJ0RmFsc2UodGVzdF9maWxlcy5faXNfdGVzdF9maWxlKCdmb28tZXhwZWN0ZWQuaHRt bCcpKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHRlc3RfZmlsZXMuX2lzX3Rlc3RfZmlsZSgn Zm9vLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwnKSkKKwogCiBpZiBfX25hbWVfXyA9PSAnX19tYWlu X18nOgogICAgIHVuaXR0ZXN0Lm1haW4oKQo= 74426 2010-11-19 14:44:04 -0800 2010-11-22 13:51:33 -0800 ignore-ref-files-fix-style bug-49835-20101120074402.patch text/plain 4077 hayato ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzNTMyYzkyYWIzN2E3NmEyYjVmNzlhMGNhYTBkM2ViMDExOWQxMWRiLi45ZjZmODAy MWI1ZDQ5NmIyMjg0ODQxYzJkZTY4MWYyNmM1MGFlYTkyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMTEtMTkgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElnbm9yZSByZWZlcmVuY2Ug ZmlsZXMgd2hpY2ggd2lsbCBiZSB1c2VkIGJ5IHJlZnRlc3RzIHdoZW4gY29sbGVjdGluZworICAg ICAgICB0ZXN0IGNhc2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDk4MzUKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvdGVzdF9maWxlcy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3Rlc3RfZmlsZXNfdW5pdHRlc3QucHk6CisKIDIwMTAtMTEtMTggIEdhdmluIEJh cnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeCAt IGFzIHBlciBEUlQtbWFjLCBhbHdheXMgZW5hYmxlZCBkZXZlbG9wZXIgZXh0cmFzLApkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0 X2ZpbGVzLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC90ZXN0X2ZpbGVzLnB5CmluZGV4IDNmYTBmYjM2NGJiMzE5NjAyZTYxOWFkZjVkZDUxZDMyYjBm NTdhNTIuLjQ0NDg5YWM1Nzg2MTQzZDNlMWU5M2E0OTlmZjI1NGU3OTIxODFkOTcgMTAwNjQ0Ci0t LSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdF9m aWxlcy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3Rlc3RfZmlsZXMucHkKQEAgLTUwLDYgKzUwLDEwIEBAIF9zdXBwb3J0ZWRfZmlsZV9leHRl bnNpb25zID0gc2V0KFsnLmh0bWwnLCAnLnNodG1sJywgJy54bWwnLCAnLnhodG1sJywgJy54aHRt bG1wCiAjIFdoZW4gY29sbGVjdGluZyB0ZXN0IGNhc2VzLCBza2lwIHRoZXNlIGRpcmVjdG9yaWVz CiBfc2tpcHBlZF9kaXJlY3RvcmllcyA9IHNldChbJy5zdm4nLCAnX3N2bicsICdyZXNvdXJjZXMn LCAnc2NyaXB0LXRlc3RzJ10pCiAKKyMgV2hlbiBjb2xsZWN0aW5nIHRlc3QgY2FzZXMsIGlnbm9y ZSBmaWxlcyB3aXRoIHRoZXNlIHN1ZmZpeGVzLgorIyBDdXJyZW50bHkgcmVmZXJlbmNlIGZpbGVz IHVzZWQgYnkgcmVmdGVzdHMgYXJlIGxpc3RlZC4KK19pZ25vcmVkX3N1ZmZpeGVzID0gc2V0KFsn LWV4cGVjdGVkLmh0bWwnLCAnZXhwZWN0ZWQtbWlzbWF0Y2guaHRtbCddKQorCiAKIGRlZiBmaW5k KHBvcnQsIHBhdGhzKToKICAgICAiIiJGaW5kcyB0aGUgc2V0IG9mIHRlc3RzIHVuZGVyIHBvcnQu bGF5b3V0X3Rlc3RzX2RpcigpLgpAQCAtNzgsNyArODIsNyBAQCBkZWYgZmluZChwb3J0LCBwYXRo cyk6CiAgICAgIyBOb3cgd2FsayBhbGwgdGhlIHBhdGhzIHBhc3NlZCBpbiBvbiB0aGUgY29tbWFu ZCBsaW5lIGFuZCBnZXQgZmlsZW5hbWVzCiAgICAgdGVzdF9maWxlcyA9IHNldCgpCiAgICAgZm9y IHBhdGggaW4gcGF0aHNfdG9fd2FsazoKLSAgICAgICAgaWYgb3MucGF0aC5pc2ZpbGUocGF0aCkg YW5kIF9oYXNfc3VwcG9ydGVkX2V4dGVuc2lvbihwYXRoKToKKyAgICAgICAgaWYgb3MucGF0aC5p c2ZpbGUocGF0aCkgYW5kIF9pc190ZXN0X2ZpbGUocGF0aCk6CiAgICAgICAgICAgICB0ZXN0X2Zp bGVzLmFkZChvcy5wYXRoLm5vcm1wYXRoKHBhdGgpKQogICAgICAgICAgICAgY29udGludWUKIApA QCAtOTUsNyArOTksNyBAQCBkZWYgZmluZChwb3J0LCBwYXRocyk6CiAgICAgICAgICAgICAgICAg ICAgIGRpcnMucmVtb3ZlKGRpcmVjdG9yeSkKIAogICAgICAgICAgICAgZm9yIGZpbGVuYW1lIGlu IGZpbGVzOgotICAgICAgICAgICAgICAgIGlmIF9oYXNfc3VwcG9ydGVkX2V4dGVuc2lvbihmaWxl bmFtZSk6CisgICAgICAgICAgICAgICAgaWYgX2lzX3Rlc3RfZmlsZShmaWxlbmFtZSk6CiAgICAg ICAgICAgICAgICAgICAgIGZpbGVuYW1lID0gb3MucGF0aC5qb2luKHJvb3QsIGZpbGVuYW1lKQog ICAgICAgICAgICAgICAgICAgICBmaWxlbmFtZSA9IG9zLnBhdGgubm9ybXBhdGgoZmlsZW5hbWUp CiAgICAgICAgICAgICAgICAgICAgIHRlc3RfZmlsZXMuYWRkKGZpbGVuYW1lKQpAQCAtMTExLDMg KzExNSwxOCBAQCBkZWYgX2hhc19zdXBwb3J0ZWRfZXh0ZW5zaW9uKGZpbGVuYW1lKToKICAgICB0 ZXN0IG9uLiIiIgogICAgIGV4dGVuc2lvbiA9IG9zLnBhdGguc3BsaXRleHQoZmlsZW5hbWUpWzFd CiAgICAgcmV0dXJuIGV4dGVuc2lvbiBpbiBfc3VwcG9ydGVkX2ZpbGVfZXh0ZW5zaW9ucworCisK K2RlZiBfaXNfaWdub3JlZF9maWxlKGZpbGVuYW1lKToKKyAgICAiIiJSZXR1cm4gdHJ1ZSBpZiBm aWxlbmFtZSBzaG91bGQgYmUgaWdub3JlZC4iIiIKKyAgICBpZiBhbnkoZmlsZW5hbWUuZW5kc3dp dGgoaWdub3JlZF9zdWZmaXgpIGZvciBpZ25vcmVkX3N1ZmZpeAorICAgICAgICAgICBpbiBfaWdu b3JlZF9zdWZmaXhlcyk6CisgICAgICAgIF9sb2cud2FybignUmVmdGVzdHMgaXMgbm90IHN1dXBl cnRlZCB5ZXQuICVzIGlzIGlnbm9yZWQuJywgZmlsZW5hbWUpCisgICAgICAgIHJldHVybiBUcnVl CisgICAgcmV0dXJuIEZhbHNlCisKKworZGVmIF9pc190ZXN0X2ZpbGUoZmlsZW5hbWUpOgorICAg ICIiIlJldHVybiB0cnVlIGlmIGZpbGVuYW1lIHJlcHJlc2VudHMgdGVzdCBjYXNlcyB3ZSB3YW50 IHRvIHJ1biBhIHRlc3QKKyAgICBvbi4iIiIKKyAgICByZXR1cm4gX2hhc19zdXBwb3J0ZWRfZXh0 ZW5zaW9uKGZpbGVuYW1lKSBhbmQgbm90IF9pc19pZ25vcmVkX2ZpbGUoZmlsZW5hbWUpCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rl c3RfZmlsZXNfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3Rlc3RfZmlsZXNfdW5pdHRlc3QucHkKaW5kZXggYzM3ZWI5MjkyNmU4ZGY1 NDIyYjcwOWI4YzEyNTIzZmI1MTI5YjNmNS4uODM1MjVjODIzZjM5NDJmMzc0MzdmODM0Mzc1ZDE2 MDcwNDNjM2E0MSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC90ZXN0X2ZpbGVzX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdF9maWxlc191bml0dGVzdC5weQpA QCAtNjMsNiArNjMsMTMgQEAgY2xhc3MgVGVzdEZpbGVzVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgICAgIHRlc3RzID0gdGVzdF9maWxlcy5maW5kKHBvcnQsIFsndXNlcnNjcmlwdHMvcmVz b3VyY2VzJ10pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodGVzdHMsIHNldChbXSkpCiAKKyAg ICBkZWYgdGVzdF9pc190ZXN0X2ZpbGUoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSh0 ZXN0X2ZpbGVzLl9pc190ZXN0X2ZpbGUoJ2Zvby5odG1sJykpCisgICAgICAgIHNlbGYuYXNzZXJ0 VHJ1ZSh0ZXN0X2ZpbGVzLl9pc190ZXN0X2ZpbGUoJ2Zvby5zaHRtbCcpKQorICAgICAgICBzZWxm LmFzc2VydEZhbHNlKHRlc3RfZmlsZXMuX2lzX3Rlc3RfZmlsZSgnZm9vLnBuZycpKQorICAgICAg ICBzZWxmLmFzc2VydEZhbHNlKHRlc3RfZmlsZXMuX2lzX3Rlc3RfZmlsZSgnZm9vLWV4cGVjdGVk Lmh0bWwnKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZSh0ZXN0X2ZpbGVzLl9pc190ZXN0X2Zp bGUoJ2Zvby1leHBlY3RlZC1taXNtYXRjaC5odG1sJykpCisKIAogaWYgX19uYW1lX18gPT0gJ19f bWFpbl9fJzoKICAgICB1bml0dGVzdC5tYWluKCkK 74594 2010-11-22 13:51:39 -0800 2010-11-22 14:19:27 -0800 ignore-reffiles-3 bug-49835-20101123065138.patch text/plain 3632 hayato ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiZjJlNGQwNjg5NWIxNjIzZjA4MGJkMWYzODM3MTZjZjY3YTVjZDM1Li5kMGJiMzAz Y2ZiOTdkOTY2YTJiMDMyN2Y4ODczNjhmZjMzNjNlNmU1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAK IDIwMTAtMTEtMTkgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElnbm9yZSByZWZlcmVuY2Ug ZmlsZXMgd2hpY2ggd2lsbCBiZSB1c2VkIGJ5IHJlZnRlc3RzIHdoZW4gY29sbGVjdGluZworICAg ICAgICB0ZXN0IGNhc2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDk4MzUKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvdGVzdF9maWxlcy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3Rlc3RfZmlsZXNfdW5pdHRlc3QucHk6CisKKzIwMTAtMTEtMTkgIEhheWF0byBJ dG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFNoaW5pY2hp cm8gSGFtYWppLgogCiAgICAgICAgIFNpbXBsaWZ5IERyaXZlci5ydW5fdGVzdCgpIHNvIHRoYXQg aXQgdGFrZXMgb25seSBvbmUgcGFyYW1ldGVyLCBUZXN0SW5wdXQuCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3RfZmlsZXMucHkg Yi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3RfZmls ZXMucHkKaW5kZXggM2ZhMGZiMzY0YmIzMTk2MDJlNjE5YWRmNWRkNTFkMzJiMGY1N2E1Mi4uNzIy MmE2YTI1OWEzNjAxNzVmMzE5MGE1ZTM0ZTRlYWRjM2YxNjY0ZSAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0X2ZpbGVzLnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdF9m aWxlcy5weQpAQCAtNzgsNyArNzgsNyBAQCBkZWYgZmluZChwb3J0LCBwYXRocyk6CiAgICAgIyBO b3cgd2FsayBhbGwgdGhlIHBhdGhzIHBhc3NlZCBpbiBvbiB0aGUgY29tbWFuZCBsaW5lIGFuZCBn ZXQgZmlsZW5hbWVzCiAgICAgdGVzdF9maWxlcyA9IHNldCgpCiAgICAgZm9yIHBhdGggaW4gcGF0 aHNfdG9fd2FsazoKLSAgICAgICAgaWYgb3MucGF0aC5pc2ZpbGUocGF0aCkgYW5kIF9oYXNfc3Vw cG9ydGVkX2V4dGVuc2lvbihwYXRoKToKKyAgICAgICAgaWYgb3MucGF0aC5pc2ZpbGUocGF0aCkg YW5kIF9pc190ZXN0X2ZpbGUocGF0aCk6CiAgICAgICAgICAgICB0ZXN0X2ZpbGVzLmFkZChvcy5w YXRoLm5vcm1wYXRoKHBhdGgpKQogICAgICAgICAgICAgY29udGludWUKIApAQCAtOTUsNyArOTUs NyBAQCBkZWYgZmluZChwb3J0LCBwYXRocyk6CiAgICAgICAgICAgICAgICAgICAgIGRpcnMucmVt b3ZlKGRpcmVjdG9yeSkKIAogICAgICAgICAgICAgZm9yIGZpbGVuYW1lIGluIGZpbGVzOgotICAg ICAgICAgICAgICAgIGlmIF9oYXNfc3VwcG9ydGVkX2V4dGVuc2lvbihmaWxlbmFtZSk6CisgICAg ICAgICAgICAgICAgaWYgX2lzX3Rlc3RfZmlsZShmaWxlbmFtZSk6CiAgICAgICAgICAgICAgICAg ICAgIGZpbGVuYW1lID0gb3MucGF0aC5qb2luKHJvb3QsIGZpbGVuYW1lKQogICAgICAgICAgICAg ICAgICAgICBmaWxlbmFtZSA9IG9zLnBhdGgubm9ybXBhdGgoZmlsZW5hbWUpCiAgICAgICAgICAg ICAgICAgICAgIHRlc3RfZmlsZXMuYWRkKGZpbGVuYW1lKQpAQCAtMTExLDMgKzExMSwxOCBAQCBk ZWYgX2hhc19zdXBwb3J0ZWRfZXh0ZW5zaW9uKGZpbGVuYW1lKToKICAgICB0ZXN0IG9uLiIiIgog ICAgIGV4dGVuc2lvbiA9IG9zLnBhdGguc3BsaXRleHQoZmlsZW5hbWUpWzFdCiAgICAgcmV0dXJu IGV4dGVuc2lvbiBpbiBfc3VwcG9ydGVkX2ZpbGVfZXh0ZW5zaW9ucworCisKK2RlZiBfaXNfcmVm ZXJlbmNlX2h0bWxfZmlsZShmaWxlbmFtZSk6CisgICAgIiIiUmV0dXJuIHRydWUgaWYgdGhlIGZp bGVuYW1lIHBvaW5zdHMgdG8gYSByZWZlcmVuY2UgSFRNTCBmaWxlLiIiIgorICAgIGlmIChmaWxl bmFtZS5lbmRzd2l0aCgnLWV4cGVjdGVkLmh0bWwnKSBvcgorICAgICAgICBmaWxlbmFtZS5lbmRz d2l0aCgnLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwnKSk6CisgICAgICAgIF9sb2cud2FybigiUmVm dGVzdHMgYXJlIG5vdCBzdXBwb3J0ZWQgLSBpZ25vcmluZyAlcyIgJSBmaWxlbmFtZSkKKyAgICAg ICAgcmV0dXJuIFRydWUKKyAgICByZXR1cm4gRmFsc2UKKworCitkZWYgX2lzX3Rlc3RfZmlsZShm aWxlbmFtZSk6CisgICAgIiIiUmV0dXJuIHRydWUgaWYgdGhlIGZpbGVuYW1lIHBvaW5zdHMgdG8g YSB0ZXN0IGZpbGUuIiIiCisgICAgcmV0dXJuIChfaGFzX3N1cHBvcnRlZF9leHRlbnNpb24oZmls ZW5hbWUpIGFuZAorICAgICAgICAgICAgbm90IF9pc19yZWZlcmVuY2VfaHRtbF9maWxlKGZpbGVu YW1lKSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvdGVzdF9maWxlc191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdF9maWxlc191bml0dGVzdC5weQppbmRleCBjMzdl YjkyOTI2ZThkZjU0MjJiNzA5YjhjMTI1MjNmYjUxMjliM2Y1Li44MzUyNWM4MjNmMzk0MmYzNzQz N2Y4MzQzNzVkMTYwNzA0M2MzYTQxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3RfZmlsZXNfdW5pdHRlc3QucHkKKysrIGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0X2ZpbGVzX3Vu aXR0ZXN0LnB5CkBAIC02Myw2ICs2MywxMyBAQCBjbGFzcyBUZXN0RmlsZXNUZXN0KHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICAgICAgdGVzdHMgPSB0ZXN0X2ZpbGVzLmZpbmQocG9ydCwgWyd1c2Vy c2NyaXB0cy9yZXNvdXJjZXMnXSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh0ZXN0cywgc2V0 KFtdKSkKIAorICAgIGRlZiB0ZXN0X2lzX3Rlc3RfZmlsZShzZWxmKToKKyAgICAgICAgc2VsZi5h c3NlcnRUcnVlKHRlc3RfZmlsZXMuX2lzX3Rlc3RfZmlsZSgnZm9vLmh0bWwnKSkKKyAgICAgICAg c2VsZi5hc3NlcnRUcnVlKHRlc3RfZmlsZXMuX2lzX3Rlc3RfZmlsZSgnZm9vLnNodG1sJykpCisg ICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UodGVzdF9maWxlcy5faXNfdGVzdF9maWxlKCdmb28ucG5n JykpCisgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UodGVzdF9maWxlcy5faXNfdGVzdF9maWxlKCdm b28tZXhwZWN0ZWQuaHRtbCcpKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHRlc3RfZmlsZXMu X2lzX3Rlc3RfZmlsZSgnZm9vLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwnKSkKKwogCiBpZiBfX25h bWVfXyA9PSAnX19tYWluX18nOgogICAgIHVuaXR0ZXN0Lm1haW4oKQo= 74597 2010-11-22 14:19:33 -0800 2010-11-22 14:52:43 -0800 ignore-reffiles-4 bug-49835-20101123071931.patch text/plain 3630 hayato ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiZjJlNGQwNjg5NWIxNjIzZjA4MGJkMWYzODM3MTZjZjY3YTVjZDM1Li5kMGJiMzAz Y2ZiOTdkOTY2YTJiMDMyN2Y4ODczNjhmZjMzNjNlNmU1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAK IDIwMTAtMTEtMTkgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElnbm9yZSByZWZlcmVuY2Ug ZmlsZXMgd2hpY2ggd2lsbCBiZSB1c2VkIGJ5IHJlZnRlc3RzIHdoZW4gY29sbGVjdGluZworICAg ICAgICB0ZXN0IGNhc2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDk4MzUKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvdGVzdF9maWxlcy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3Rlc3RfZmlsZXNfdW5pdHRlc3QucHk6CisKKzIwMTAtMTEtMTkgIEhheWF0byBJ dG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFNoaW5pY2hp cm8gSGFtYWppLgogCiAgICAgICAgIFNpbXBsaWZ5IERyaXZlci5ydW5fdGVzdCgpIHNvIHRoYXQg aXQgdGFrZXMgb25seSBvbmUgcGFyYW1ldGVyLCBUZXN0SW5wdXQuCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3RfZmlsZXMucHkg Yi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3RfZmls ZXMucHkKaW5kZXggM2ZhMGZiMzY0YmIzMTk2MDJlNjE5YWRmNWRkNTFkMzJiMGY1N2E1Mi4uMmMw YTdiNjNiZjY3MWFiYzFiZDgyNGE4MWRlZWQxMjZmNWZkOTgzMyAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0X2ZpbGVzLnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdF9m aWxlcy5weQpAQCAtNzgsNyArNzgsNyBAQCBkZWYgZmluZChwb3J0LCBwYXRocyk6CiAgICAgIyBO b3cgd2FsayBhbGwgdGhlIHBhdGhzIHBhc3NlZCBpbiBvbiB0aGUgY29tbWFuZCBsaW5lIGFuZCBn ZXQgZmlsZW5hbWVzCiAgICAgdGVzdF9maWxlcyA9IHNldCgpCiAgICAgZm9yIHBhdGggaW4gcGF0 aHNfdG9fd2FsazoKLSAgICAgICAgaWYgb3MucGF0aC5pc2ZpbGUocGF0aCkgYW5kIF9oYXNfc3Vw cG9ydGVkX2V4dGVuc2lvbihwYXRoKToKKyAgICAgICAgaWYgb3MucGF0aC5pc2ZpbGUocGF0aCkg YW5kIF9pc190ZXN0X2ZpbGUocGF0aCk6CiAgICAgICAgICAgICB0ZXN0X2ZpbGVzLmFkZChvcy5w YXRoLm5vcm1wYXRoKHBhdGgpKQogICAgICAgICAgICAgY29udGludWUKIApAQCAtOTUsNyArOTUs NyBAQCBkZWYgZmluZChwb3J0LCBwYXRocyk6CiAgICAgICAgICAgICAgICAgICAgIGRpcnMucmVt b3ZlKGRpcmVjdG9yeSkKIAogICAgICAgICAgICAgZm9yIGZpbGVuYW1lIGluIGZpbGVzOgotICAg ICAgICAgICAgICAgIGlmIF9oYXNfc3VwcG9ydGVkX2V4dGVuc2lvbihmaWxlbmFtZSk6CisgICAg ICAgICAgICAgICAgaWYgX2lzX3Rlc3RfZmlsZShmaWxlbmFtZSk6CiAgICAgICAgICAgICAgICAg ICAgIGZpbGVuYW1lID0gb3MucGF0aC5qb2luKHJvb3QsIGZpbGVuYW1lKQogICAgICAgICAgICAg ICAgICAgICBmaWxlbmFtZSA9IG9zLnBhdGgubm9ybXBhdGgoZmlsZW5hbWUpCiAgICAgICAgICAg ICAgICAgICAgIHRlc3RfZmlsZXMuYWRkKGZpbGVuYW1lKQpAQCAtMTExLDMgKzExMSwxOCBAQCBk ZWYgX2hhc19zdXBwb3J0ZWRfZXh0ZW5zaW9uKGZpbGVuYW1lKToKICAgICB0ZXN0IG9uLiIiIgog ICAgIGV4dGVuc2lvbiA9IG9zLnBhdGguc3BsaXRleHQoZmlsZW5hbWUpWzFdCiAgICAgcmV0dXJu IGV4dGVuc2lvbiBpbiBfc3VwcG9ydGVkX2ZpbGVfZXh0ZW5zaW9ucworCisKK2RlZiBfaXNfcmVm ZXJlbmNlX2h0bWxfZmlsZShmaWxlbmFtZSk6CisgICAgIiIiUmV0dXJuIHRydWUgaWYgdGhlIGZp bGVuYW1lIHBvaW50cyB0byBhIHJlZmVyZW5jZSBIVE1MIGZpbGUuIiIiCisgICAgaWYgKGZpbGVu YW1lLmVuZHN3aXRoKCctZXhwZWN0ZWQuaHRtbCcpIG9yCisgICAgICAgIGZpbGVuYW1lLmVuZHN3 aXRoKCctZXhwZWN0ZWQtbWlzbWF0Y2guaHRtbCcpKToKKyAgICAgICAgX2xvZy53YXJuKCJSZWZ0 ZXN0cyBhcmUgbm90IHN1cHBvcnRlZCAtIGlnbm9yaW5nICVzIiAlIGZpbGVuYW1lKQorICAgICAg ICByZXR1cm4gVHJ1ZQorICAgIHJldHVybiBGYWxzZQorCisKK2RlZiBfaXNfdGVzdF9maWxlKGZp bGVuYW1lKToKKyAgICAiIiJSZXR1cm4gdHJ1ZSBpZiB0aGUgZmlsZW5hbWUgcG9pbnRzIHRvIGEg dGVzdCBmaWxlLiIiIgorICAgIHJldHVybiAoX2hhc19zdXBwb3J0ZWRfZXh0ZW5zaW9uKGZpbGVu YW1lKSBhbmQKKyAgICAgICAgICAgIG5vdCBfaXNfcmVmZXJlbmNlX2h0bWxfZmlsZShmaWxlbmFt ZSkpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3Rlc3RfZmlsZXNfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3RfZmlsZXNfdW5pdHRlc3QucHkKaW5kZXggYzM3ZWI5 MjkyNmU4ZGY1NDIyYjcwOWI4YzEyNTIzZmI1MTI5YjNmNS4uODM1MjVjODIzZjM5NDJmMzc0Mzdm ODM0Mzc1ZDE2MDcwNDNjM2E0MSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0X2ZpbGVzX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdF9maWxlc191bml0 dGVzdC5weQpAQCAtNjMsNiArNjMsMTMgQEAgY2xhc3MgVGVzdEZpbGVzVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgIHRlc3RzID0gdGVzdF9maWxlcy5maW5kKHBvcnQsIFsndXNlcnNj cmlwdHMvcmVzb3VyY2VzJ10pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodGVzdHMsIHNldChb XSkpCiAKKyAgICBkZWYgdGVzdF9pc190ZXN0X2ZpbGUoc2VsZik6CisgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZSh0ZXN0X2ZpbGVzLl9pc190ZXN0X2ZpbGUoJ2Zvby5odG1sJykpCisgICAgICAgIHNl bGYuYXNzZXJ0VHJ1ZSh0ZXN0X2ZpbGVzLl9pc190ZXN0X2ZpbGUoJ2Zvby5zaHRtbCcpKQorICAg ICAgICBzZWxmLmFzc2VydEZhbHNlKHRlc3RfZmlsZXMuX2lzX3Rlc3RfZmlsZSgnZm9vLnBuZycp KQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHRlc3RfZmlsZXMuX2lzX3Rlc3RfZmlsZSgnZm9v LWV4cGVjdGVkLmh0bWwnKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZSh0ZXN0X2ZpbGVzLl9p c190ZXN0X2ZpbGUoJ2Zvby1leHBlY3RlZC1taXNtYXRjaC5odG1sJykpCisKIAogaWYgX19uYW1l X18gPT0gJ19fbWFpbl9fJzoKICAgICB1bml0dGVzdC5tYWluKCkK