49691 2010-11-17 15:22:03 -0800 [NRWT] Remove a 'uri' member from TestInput class 2010-11-18 15:40:58 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hayato webkit-unassigned dpranke hamaji tony oldest_to_newest 310560 0 hayato 2010-11-17 15:22:03 -0800 Remove uri member from TestInput class because uri member is not used anywhere. 310561 1 74162 hayato 2010-11-17 15:25:17 -0800 Created attachment 74162 remove-uri 310623 2 hayato 2010-11-17 17:08:19 -0800 After this patch, I'll make another patch which makes Driver.run_test() take only one parameter, TestInput, to simplify the interface of Driver.run_test(). 310630 3 74162 dpranke 2010-11-17 17:13:46 -0800 Comment on attachment 74162 remove-uri View in context: https://bugs.webkit.org/attachment.cgi?id=74162&action=review LGTM otherwise. > WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:-175 > - test_input.uri = port.filename_to_uri(test_input.filename).strip() When you do make run_test() take a single input, just stuff this down into the port/* implementations so that the ports that do need to convert the test name to the uri can do so, and the ports that don't (e.g., the test port, the dryrun port), don't need to convert back. > WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:175 > + uri = port.filename_to_uri(test_input.filename).strip() Nit: You don't actually need the strip() . filename_to_uri() doesn't append any whitespace. I'm not sure why this crept in at some point, and I've removed it in the patches-that-have-not-yet-been-uploaded-for-review :) 310639 4 74183 hayato 2010-11-17 17:35:27 -0800 Created attachment 74183 remove-strip 310643 5 hayato 2010-11-17 17:42:18 -0800 Thank you for the review. I've updated patch. 'strip()' has been removed. (In reply to comment #3) > (From update of attachment 74162 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=74162&action=review > > LGTM otherwise. > > > WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:-175 > > - test_input.uri = port.filename_to_uri(test_input.filename).strip() > > When you do make run_test() take a single input, just stuff this down into the port/* implementations so that the ports that do need to convert the test name to the uri can do so, and the ports that don't (e.g., the test port, the dryrun port), don't need to convert back. Thank you. I'll do it for each ports. I don't think that is difficult work. > > > WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:175 > > + uri = port.filename_to_uri(test_input.filename).strip() > > Nit: You don't actually need the strip() . filename_to_uri() doesn't append any whitespace. I'm not sure why this crept in at some point, and I've removed it in the patches-that-have-not-yet-been-uploaded-for-review :) Done. I've removed 'strip()' in the patch-that-has-been-uploaded. :) 310649 6 74183 hayato 2010-11-17 18:02:49 -0800 Comment on attachment 74183 remove-strip Clearing flags on attachment: 74183 Committed r72267: <http://trac.webkit.org/changeset/72267> 310650 7 hayato 2010-11-17 18:02:58 -0800 All reviewed patches have been landed. Closing bug. 311121 8 tony 2010-11-18 15:20:38 -0800 There have been some failures on WebKit Win after this patch landed. Do you think they might be related? Here's a sample crash: http://build.chromium.org/p/chromium/builders/Webkit%20Win/builds/1788/steps/webkit_tests/logs/stdio 2010-11-18 13:46:53,076 20544 dump_render_tree_thread.py:441 DEBUGThread-1 http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type.html passed 2010-11-18 13:46:53,201 20544 executive.py:357 DEBUG"e:\b\build\slave\Webkit_Win\build\src\third_party\cygwin\bin\wdiff.exe --start-delete=##WDIFF_DEL## --end-delete=##WDIFF_END## --start-insert=##WDIFF_ADD## --end-insert=##WDIFF_END## e:\b\build\slave\Webkit_Win\build\src\webkit\Release\..\../../layout-test-results\platform/mac/editing/selection/25228-expected.txt e:\b\build\slave\Webkit_Win\build\src\webkit\Release\..\../../layout-test-results\platform/mac/editing/selection/25228-actual.txt" took 0.06s 2010-11-18 13:46:53,233 20544 dump_render_tree_thread.py:441 DEBUGThread-1 http/tests/xmlhttprequest/access-control-basic-whitelist-request-headers.html passed 2010-11-18 13:46:53,390 20544 dump_render_tree_thread.py:441 DEBUGThread-1 http/tests/xmlhttprequest/access-control-basic-whitelist-response-headers.html passed 2010-11-18 13:46:53,437 20544 executive.py:357 DEBUG"e:\b\build\slave\Webkit_Win\build\src\webkit\Release\image_diff.exe --diff c:\docume~1\chrome~2\locals~1\temp\tmpi4wul2\expected.png c:\docume~1\chrome~2\locals~1\temp\tmpi4wul2\actual.png e:\b\build\slave\Webkit_Win\build\src\webkit\Release\..\../../layout-test-results\platform/mac/editing/selection/25228-diff.png" took 0.22s 2010-11-18 13:46:53,437 20544 dump_render_tree_thread.py:438 DEBUGThread-4 platform/mac/editing/selection/25228.html failed: Text diff mismatch Image mismatch 2010-11-18 13:46:56,358 20544 dump_render_tree_thread.py:340 ERRORThread-2 dying, exception raised Traceback (most recent call last): File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-tests", line 38, in <module> sys.exit(run_webkit_tests.main()) File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 1684, in main return run(port_obj, options, args) File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 1373, in run num_unexpected_results = test_runner.run(result_summary) File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 759, in run self._run_tests(self._test_files_list, result_summary)) File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 639, in _run_tests result_summary) File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 330, in _covered_run self._run(test_runner=None, result_summary=None) File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 422, in _run result = self._run_test(test_input) File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 517, in _run_test self._driver) File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 176, in _run_single_test test_output = driver.run_test(uri, test_input.timeout, image_hash_to_driver) File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\chromium.py", line 509, in run_test ''.join(output), self._output_image(), actual_checksum, File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\chromium.py", line 452, in _output_image with open(png_path, 'rb') as image_file: IOError: [Errno 13] Permission denied: 'e:\\b\\build\\slave\\Webkit_Win\\build\\src\\webkit\\Release\\..\\../../layout-test-results\\png_result1.png' No handlers could be found for logger "webkitpy.common.system" 311133 9 hayato 2010-11-18 15:40:58 -0800 At first glance, I have no ideas why 'Permission Denied' occurs on only Windows. That might be related with my change. I'll investigate that. (In reply to comment #8) > There have been some failures on WebKit Win after this patch landed. Do you think they might be related? Here's a sample crash: > http://build.chromium.org/p/chromium/builders/Webkit%20Win/builds/1788/steps/webkit_tests/logs/stdio > > 2010-11-18 13:46:53,076 20544 dump_render_tree_thread.py:441 DEBUGThread-1 http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type.html passed > 2010-11-18 13:46:53,201 20544 executive.py:357 DEBUG"e:\b\build\slave\Webkit_Win\build\src\third_party\cygwin\bin\wdiff.exe --start-delete=##WDIFF_DEL## --end-delete=##WDIFF_END## --start-insert=##WDIFF_ADD## --end-insert=##WDIFF_END## e:\b\build\slave\Webkit_Win\build\src\webkit\Release\..\../../layout-test-results\platform/mac/editing/selection/25228-expected.txt e:\b\build\slave\Webkit_Win\build\src\webkit\Release\..\../../layout-test-results\platform/mac/editing/selection/25228-actual.txt" took 0.06s > 2010-11-18 13:46:53,233 20544 dump_render_tree_thread.py:441 DEBUGThread-1 http/tests/xmlhttprequest/access-control-basic-whitelist-request-headers.html passed > 2010-11-18 13:46:53,390 20544 dump_render_tree_thread.py:441 DEBUGThread-1 http/tests/xmlhttprequest/access-control-basic-whitelist-response-headers.html passed > 2010-11-18 13:46:53,437 20544 executive.py:357 DEBUG"e:\b\build\slave\Webkit_Win\build\src\webkit\Release\image_diff.exe --diff c:\docume~1\chrome~2\locals~1\temp\tmpi4wul2\expected.png c:\docume~1\chrome~2\locals~1\temp\tmpi4wul2\actual.png e:\b\build\slave\Webkit_Win\build\src\webkit\Release\..\../../layout-test-results\platform/mac/editing/selection/25228-diff.png" took 0.22s > 2010-11-18 13:46:53,437 20544 dump_render_tree_thread.py:438 DEBUGThread-4 platform/mac/editing/selection/25228.html failed: > Text diff mismatch > Image mismatch > 2010-11-18 13:46:56,358 20544 dump_render_tree_thread.py:340 ERRORThread-2 dying, exception raised > Traceback (most recent call last): > File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-tests", line 38, in <module> > sys.exit(run_webkit_tests.main()) > File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 1684, in main > return run(port_obj, options, args) > File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 1373, in run > num_unexpected_results = test_runner.run(result_summary) > File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 759, in run > self._run_tests(self._test_files_list, result_summary)) > File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 639, in _run_tests > result_summary) > File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 330, in _covered_run > self._run(test_runner=None, result_summary=None) > File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 422, in _run > result = self._run_test(test_input) > File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 517, in _run_test > self._driver) > File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\layout_package\dump_render_tree_thread.py", line 176, in _run_single_test > test_output = driver.run_test(uri, test_input.timeout, image_hash_to_driver) > File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\chromium.py", line 509, in run_test > ''.join(output), self._output_image(), actual_checksum, > File "e:\b\build\slave\Webkit_Win\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\chromium.py", line 452, in _output_image > with open(png_path, 'rb') as image_file: > IOError: [Errno 13] Permission denied: 'e:\\b\\build\\slave\\Webkit_Win\\build\\src\\webkit\\Release\\..\\../../layout-test-results\\png_result1.png' > No handlers could be found for logger "webkitpy.common.system" 74162 2010-11-17 15:25:17 -0800 2010-11-17 17:35:22 -0800 remove-uri bug-49691-20101118082515.patch text/plain 3906 hayato ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjZGFjMWRhMzFiNzVmZTQyZTgzOWM3OWNiM2ZmOWE2YjAxODI3NDViLi4xYmExMTMw YzA0MzViYWE0NWJkNTk0NGE2NWNmMGY3MjQxYzhjY2QzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAK IDIwMTAtMTEtMTcgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBhIHVyaSBtZW1i ZXIgZnJvbSBUZXN0SW5wdXQgY2xhc3MuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ5NjkxCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9kdW1wX3JlbmRlcl90cmVlX3RocmVhZC5weToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5 OgorCisyMDEwLTExLTE3ICBIYXlhdG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KKwogICAg ICAgICBSZWZhY3RvciBUZXN0VHlwZUJhc2UuY29tcGFyZV9vdXRwdXQoKS4KIAogICAgICAgICBJ bnRyb2R1Y2UgYSBUZXN0T3V0cHV0IGNsYXNzIGFuZCB1cGRhdGUgY29tcGFyZV9vdXRwdXQoKSBv ZiBlYWNoIHRlc3QKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5IGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvZHVt cF9yZW5kZXJfdHJlZV90aHJlYWQucHkKaW5kZXggODE0Mjg2NzJiNjA1MTg3ZTIyMTExNzQ0YzA0 NDkwZDU1OTVlYTNlZi4uNzVlYjc1YTBiOGEzYTg4NWZhOTg4ZGJhNmZiNGY0MWY3NmVjZmRiYyAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5 b3V0X3BhY2thZ2UvZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQucHkKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvZHVtcF9yZW5kZXJf dHJlZV90aHJlYWQucHkKQEAgLTkwLDcgKzkwLDcgQEAgZGVmIF9wcm9jZXNzX291dHB1dChwb3J0 LCBvcHRpb25zLCB0ZXN0X2lucHV0LCB0ZXN0X3R5cGVzLCB0ZXN0X2FyZ3MsCiAgICAgICBwb3J0 OiBwb3J0LXNwZWNpZmljIGhvb2tzCiAgICAgICBvcHRpb25zOiBjb21tYW5kIGxpbmUgb3B0aW9u cyBhcmd1bWVudCBmcm9tIG9wdHBhcnNlCiAgICAgICBwcm9jOiBhbiBhY3RpdmUgRHVtcFJlbmRl clRyZWUgcHJvY2VzcwotICAgICAgdGVzdF9pbnB1dDogT2JqZWN0IGNvbnRhaW5pbmcgdGhlIHRl c3QgZmlsZW5hbWUsIHVyaSBhbmQgdGltZW91dAorICAgICAgdGVzdF9pbnB1dDogT2JqZWN0IGNv bnRhaW5pbmcgdGhlIHRlc3QgZmlsZW5hbWUgYW5kIHRpbWVvdXQKICAgICAgIHRlc3RfdHlwZXM6 IGxpc3Qgb2YgdGVzdCB0eXBlcyB0byBzdWJqZWN0IHRoZSBvdXRwdXQgdG8KICAgICAgIHRlc3Rf YXJnczogYXJndW1lbnRzIHRvIGJlIHBhc3NlZCB0byBlYWNoIHRlc3QKICAgICAgIHRlc3Rfb3V0 cHV0OiBhIFRlc3RPdXRwdXQgb2JqZWN0IGNvbnRhaW5pbmcgdGhlIG91dHB1dCBvZiB0aGUgdGVz dApAQCAtMTcyLDggKzE3Miw4IEBAIGRlZiBfcnVuX3NpbmdsZV90ZXN0KHBvcnQsIG9wdGlvbnMs IHRlc3RfaW5wdXQsIHRlc3RfdHlwZXMsIHRlc3RfYXJncywgZHJpdmVyKToKICAgICAgICAgaW1h Z2VfaGFzaF90b19kcml2ZXIgPSBwb3J0LmV4cGVjdGVkX2NoZWNrc3VtKHRlc3RfaW5wdXQuZmls ZW5hbWUpCiAgICAgZWxzZToKICAgICAgICAgaW1hZ2VfaGFzaF90b19kcml2ZXIgPSBOb25lCi0g ICAgdGVzdF9pbnB1dC51cmkgPSBwb3J0LmZpbGVuYW1lX3RvX3VyaSh0ZXN0X2lucHV0LmZpbGVu YW1lKS5zdHJpcCgpCi0gICAgdGVzdF9vdXRwdXQgPSBkcml2ZXIucnVuX3Rlc3QodGVzdF9pbnB1 dC51cmksIHRlc3RfaW5wdXQudGltZW91dCwgaW1hZ2VfaGFzaF90b19kcml2ZXIpCisgICAgdXJp ID0gcG9ydC5maWxlbmFtZV90b191cmkodGVzdF9pbnB1dC5maWxlbmFtZSkuc3RyaXAoKQorICAg IHRlc3Rfb3V0cHV0ID0gZHJpdmVyLnJ1bl90ZXN0KHVyaSwgdGVzdF9pbnB1dC50aW1lb3V0LCBp bWFnZV9oYXNoX3RvX2RyaXZlcikKICAgICByZXR1cm4gX3Byb2Nlc3Nfb3V0cHV0KHBvcnQsIG9w dGlvbnMsIHRlc3RfaW5wdXQsIHRlc3RfdHlwZXMsIHRlc3RfYXJncywKICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHRlc3Rfb3V0cHV0KQogCkBAIC0xODYsNyArMTg2LDcgQEAgY2xhc3MgU2lu Z2xlVGVzdFRocmVhZCh0aHJlYWRpbmcuVGhyZWFkKToKICAgICAgICAgQXJnczoKICAgICAgICAg ICBwb3J0OiBvYmplY3QgaW1wbGVtZW50aW5nIHBvcnQtc3BlY2lmaWMgaG9va3MKICAgICAgICAg ICBvcHRpb25zOiBjb21tYW5kIGxpbmUgYXJndW1lbnQgb2JqZWN0IGZyb20gb3B0cGFyc2UKLSAg ICAgICAgICB0ZXN0X2lucHV0OiBPYmplY3QgY29udGFpbmluZyB0aGUgdGVzdCBmaWxlbmFtZSwg dXJpIGFuZCB0aW1lb3V0CisgICAgICAgICAgdGVzdF9pbnB1dDogT2JqZWN0IGNvbnRhaW5pbmcg dGhlIHRlc3QgZmlsZW5hbWUgYW5kIHRpbWVvdXQKICAgICAgICAgICB0ZXN0X3R5cGVzOiBBIGxp c3Qgb2YgVGVzdFR5cGUgb2JqZWN0cyB0byBydW4gdGhlIHRlc3Qgb3V0cHV0CiAgICAgICAgICAg ICAgIGFnYWluc3QuCiAgICAgICAgICAgdGVzdF9hcmdzOiBBIFRlc3RBcmd1bWVudHMgb2JqZWN0 IHRvIHBhc3MgdG8gZWFjaCBUZXN0VHlwZS4KQEAgLTQ1Nyw3ICs0NTcsNyBAQCBjbGFzcyBUZXN0 U2hlbGxUaHJlYWQoV2F0Y2hhYmxlVGhyZWFkKToKICAgICAgICAgZmlsZXMgc2luZ2x5LgogCiAg ICAgICAgIEFyZ3M6Ci0gICAgICAgICAgdGVzdF9pbnB1dDogT2JqZWN0IGNvbnRhaW5pbmcgdGhl IHRlc3QgZmlsZW5hbWUsIHVyaSBhbmQgdGltZW91dAorICAgICAgICAgIHRlc3RfaW5wdXQ6IE9i amVjdCBjb250YWluaW5nIHRoZSB0ZXN0IGZpbGVuYW1lIGFuZCB0aW1lb3V0CiAKICAgICAgICAg UmV0dXJuczoKICAgICAgICAgICBBIFRlc3RSZXN1bHQKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5 CmluZGV4IGIzN2ZhMWViZjJiYjMyMTFkNTIyOTRiNWQ4ODE1ZWZiOTU0ZTM2ZWYuLjExOWRlOGNm ZWZlOTk4ZTEzMDVhOGMxYzc5NjhhNzE2M2NiYjU1NDIgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0 cy5weQpAQCAtMTAzLDkgKzEwMyw2IEBAIGNsYXNzIFRlc3RJbnB1dDoKICAgICAgICAgc2VsZi5m aWxlbmFtZSA9IGZpbGVuYW1lCiAgICAgICAgIHNlbGYudGltZW91dCA9IHRpbWVvdXQKIAotICAg ICAgICAjIEZJWE1FOiBNYXliZSB0aGUgVVJJIHNob3VsZG4ndCBiZSBwYXJ0IG9mIHRoZSBUZXN0 SW5wdXQgYXQgYWxsPwotICAgICAgICBzZWxmLnVyaSA9IE5vbmUKLQogCiBjbGFzcyBSZXN1bHRT dW1tYXJ5KG9iamVjdCk6CiAgICAgIiIiQSBjbGFzcyBmb3IgcGFydGl0aW9uaW5nIHRoZSB0ZXN0 IHJlc3VsdHMgd2UgZ2V0IGludG8gYnVja2V0cy4K 74183 2010-11-17 17:35:27 -0800 2010-11-17 18:02:49 -0800 remove-strip bug-49691-20101118103525.patch text/plain 3898 hayato ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjZGFjMWRhMzFiNzVmZTQyZTgzOWM3OWNiM2ZmOWE2YjAxODI3NDViLi4xYmExMTMw YzA0MzViYWE0NWJkNTk0NGE2NWNmMGY3MjQxYzhjY2QzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAK IDIwMTAtMTEtMTcgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBhIHVyaSBtZW1i ZXIgZnJvbSBUZXN0SW5wdXQgY2xhc3MuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ5NjkxCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9kdW1wX3JlbmRlcl90cmVlX3RocmVhZC5weToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5 OgorCisyMDEwLTExLTE3ICBIYXlhdG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KKwogICAg ICAgICBSZWZhY3RvciBUZXN0VHlwZUJhc2UuY29tcGFyZV9vdXRwdXQoKS4KIAogICAgICAgICBJ bnRyb2R1Y2UgYSBUZXN0T3V0cHV0IGNsYXNzIGFuZCB1cGRhdGUgY29tcGFyZV9vdXRwdXQoKSBv ZiBlYWNoIHRlc3QKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5IGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvZHVt cF9yZW5kZXJfdHJlZV90aHJlYWQucHkKaW5kZXggODE0Mjg2NzJiNjA1MTg3ZTIyMTExNzQ0YzA0 NDkwZDU1OTVlYTNlZi4uODhmNDkzZDBmOThhZGIzNDExNTM5ZGY5MjA5MDQyZTQ0YjU1MzkzYyAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5 b3V0X3BhY2thZ2UvZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQucHkKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvZHVtcF9yZW5kZXJf dHJlZV90aHJlYWQucHkKQEAgLTkwLDcgKzkwLDcgQEAgZGVmIF9wcm9jZXNzX291dHB1dChwb3J0 LCBvcHRpb25zLCB0ZXN0X2lucHV0LCB0ZXN0X3R5cGVzLCB0ZXN0X2FyZ3MsCiAgICAgICBwb3J0 OiBwb3J0LXNwZWNpZmljIGhvb2tzCiAgICAgICBvcHRpb25zOiBjb21tYW5kIGxpbmUgb3B0aW9u cyBhcmd1bWVudCBmcm9tIG9wdHBhcnNlCiAgICAgICBwcm9jOiBhbiBhY3RpdmUgRHVtcFJlbmRl clRyZWUgcHJvY2VzcwotICAgICAgdGVzdF9pbnB1dDogT2JqZWN0IGNvbnRhaW5pbmcgdGhlIHRl c3QgZmlsZW5hbWUsIHVyaSBhbmQgdGltZW91dAorICAgICAgdGVzdF9pbnB1dDogT2JqZWN0IGNv bnRhaW5pbmcgdGhlIHRlc3QgZmlsZW5hbWUgYW5kIHRpbWVvdXQKICAgICAgIHRlc3RfdHlwZXM6 IGxpc3Qgb2YgdGVzdCB0eXBlcyB0byBzdWJqZWN0IHRoZSBvdXRwdXQgdG8KICAgICAgIHRlc3Rf YXJnczogYXJndW1lbnRzIHRvIGJlIHBhc3NlZCB0byBlYWNoIHRlc3QKICAgICAgIHRlc3Rfb3V0 cHV0OiBhIFRlc3RPdXRwdXQgb2JqZWN0IGNvbnRhaW5pbmcgdGhlIG91dHB1dCBvZiB0aGUgdGVz dApAQCAtMTcyLDggKzE3Miw4IEBAIGRlZiBfcnVuX3NpbmdsZV90ZXN0KHBvcnQsIG9wdGlvbnMs IHRlc3RfaW5wdXQsIHRlc3RfdHlwZXMsIHRlc3RfYXJncywgZHJpdmVyKToKICAgICAgICAgaW1h Z2VfaGFzaF90b19kcml2ZXIgPSBwb3J0LmV4cGVjdGVkX2NoZWNrc3VtKHRlc3RfaW5wdXQuZmls ZW5hbWUpCiAgICAgZWxzZToKICAgICAgICAgaW1hZ2VfaGFzaF90b19kcml2ZXIgPSBOb25lCi0g ICAgdGVzdF9pbnB1dC51cmkgPSBwb3J0LmZpbGVuYW1lX3RvX3VyaSh0ZXN0X2lucHV0LmZpbGVu YW1lKS5zdHJpcCgpCi0gICAgdGVzdF9vdXRwdXQgPSBkcml2ZXIucnVuX3Rlc3QodGVzdF9pbnB1 dC51cmksIHRlc3RfaW5wdXQudGltZW91dCwgaW1hZ2VfaGFzaF90b19kcml2ZXIpCisgICAgdXJp ID0gcG9ydC5maWxlbmFtZV90b191cmkodGVzdF9pbnB1dC5maWxlbmFtZSkKKyAgICB0ZXN0X291 dHB1dCA9IGRyaXZlci5ydW5fdGVzdCh1cmksIHRlc3RfaW5wdXQudGltZW91dCwgaW1hZ2VfaGFz aF90b19kcml2ZXIpCiAgICAgcmV0dXJuIF9wcm9jZXNzX291dHB1dChwb3J0LCBvcHRpb25zLCB0 ZXN0X2lucHV0LCB0ZXN0X3R5cGVzLCB0ZXN0X2FyZ3MsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICB0ZXN0X291dHB1dCkKIApAQCAtMTg2LDcgKzE4Niw3IEBAIGNsYXNzIFNpbmdsZVRlc3RU aHJlYWQodGhyZWFkaW5nLlRocmVhZCk6CiAgICAgICAgIEFyZ3M6CiAgICAgICAgICAgcG9ydDog b2JqZWN0IGltcGxlbWVudGluZyBwb3J0LXNwZWNpZmljIGhvb2tzCiAgICAgICAgICAgb3B0aW9u czogY29tbWFuZCBsaW5lIGFyZ3VtZW50IG9iamVjdCBmcm9tIG9wdHBhcnNlCi0gICAgICAgICAg dGVzdF9pbnB1dDogT2JqZWN0IGNvbnRhaW5pbmcgdGhlIHRlc3QgZmlsZW5hbWUsIHVyaSBhbmQg dGltZW91dAorICAgICAgICAgIHRlc3RfaW5wdXQ6IE9iamVjdCBjb250YWluaW5nIHRoZSB0ZXN0 IGZpbGVuYW1lIGFuZCB0aW1lb3V0CiAgICAgICAgICAgdGVzdF90eXBlczogQSBsaXN0IG9mIFRl c3RUeXBlIG9iamVjdHMgdG8gcnVuIHRoZSB0ZXN0IG91dHB1dAogICAgICAgICAgICAgICBhZ2Fp bnN0LgogICAgICAgICAgIHRlc3RfYXJnczogQSBUZXN0QXJndW1lbnRzIG9iamVjdCB0byBwYXNz IHRvIGVhY2ggVGVzdFR5cGUuCkBAIC00NTcsNyArNDU3LDcgQEAgY2xhc3MgVGVzdFNoZWxsVGhy ZWFkKFdhdGNoYWJsZVRocmVhZCk6CiAgICAgICAgIGZpbGVzIHNpbmdseS4KIAogICAgICAgICBB cmdzOgotICAgICAgICAgIHRlc3RfaW5wdXQ6IE9iamVjdCBjb250YWluaW5nIHRoZSB0ZXN0IGZp bGVuYW1lLCB1cmkgYW5kIHRpbWVvdXQKKyAgICAgICAgICB0ZXN0X2lucHV0OiBPYmplY3QgY29u dGFpbmluZyB0aGUgdGVzdCBmaWxlbmFtZSBhbmQgdGltZW91dAogCiAgICAgICAgIFJldHVybnM6 CiAgICAgICAgICAgQSBUZXN0UmVzdWx0CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCBi MzdmYTFlYmYyYmIzMjExZDUyMjk0YjVkODgxNWVmYjk1NGUzNmVmLi4xMTlkZThjZmVmZTk5OGUx MzA1YThjMWM3OTY4YTcxNjNjYmI1NTQyIDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CisrKyBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKQEAg LTEwMyw5ICsxMDMsNiBAQCBjbGFzcyBUZXN0SW5wdXQ6CiAgICAgICAgIHNlbGYuZmlsZW5hbWUg PSBmaWxlbmFtZQogICAgICAgICBzZWxmLnRpbWVvdXQgPSB0aW1lb3V0CiAKLSAgICAgICAgIyBG SVhNRTogTWF5YmUgdGhlIFVSSSBzaG91bGRuJ3QgYmUgcGFydCBvZiB0aGUgVGVzdElucHV0IGF0 IGFsbD8KLSAgICAgICAgc2VsZi51cmkgPSBOb25lCi0KIAogY2xhc3MgUmVzdWx0U3VtbWFyeShv YmplY3QpOgogICAgICIiIkEgY2xhc3MgZm9yIHBhcnRpdGlvbmluZyB0aGUgdGVzdCByZXN1bHRz IHdlIGdldCBpbnRvIGJ1Y2tldHMuCg==