Title: [89290] trunk/Tools
- Revision
- 89290
- Author
- [email protected]
- Date
- 2011-06-20 14:30:28 -0700 (Mon, 20 Jun 2011)
Log Message
2011-06-20 Dirk Pranke <[email protected]>
Reviewed by Ojan Vafai.
we should only log the test names to the tests_run.txt files during layout_tests
https://bugs.webkit.org/show_bug.cgi?id=62751
* Scripts/old-run-webkit-tests:
* Scripts/webkitpy/layout_tests/layout_package/worker.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (89289 => 89290)
--- trunk/Tools/ChangeLog 2011-06-20 21:23:25 UTC (rev 89289)
+++ trunk/Tools/ChangeLog 2011-06-20 21:30:28 UTC (rev 89290)
@@ -1,3 +1,13 @@
+2011-06-20 Dirk Pranke <[email protected]>
+
+ Reviewed by Ojan Vafai.
+
+ we should only log the test names to the tests_run.txt files during layout_tests
+ https://bugs.webkit.org/show_bug.cgi?id=62751
+
+ * Scripts/old-run-webkit-tests:
+ * Scripts/webkitpy/layout_tests/layout_package/worker.py:
+
2011-06-20 Eric Seidel <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Tools/Scripts/old-run-webkit-tests (89289 => 89290)
--- trunk/Tools/Scripts/old-run-webkit-tests 2011-06-20 21:23:25 UTC (rev 89289)
+++ trunk/Tools/Scripts/old-run-webkit-tests 2011-06-20 21:30:28 UTC (rev 89290)
@@ -752,7 +752,7 @@
my $startTime = time if $report10Slowest;
- print $tests_run_fh "$testDirectory/$test\n";
+ print $tests_run_fh "$test\n";
# Try to read expected hash file for pixel tests
my $suffixExpectedHash = "";
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py (89289 => 89290)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py 2011-06-20 21:23:25 UTC (rev 89289)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py 2011-06-20 21:30:28 UTC (rev 89290)
@@ -205,8 +205,8 @@
def clean_up_after_test(self, test_input, result):
self._batch_count += 1
- self._tests_run_file.write(test_input.filename + "\n")
test_name = self._port.relative_test_filename(test_input.filename)
+ self._tests_run_file.write(test_name + "\n")
if result.failures:
# Check and kill DumpRenderTree if we need to.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (89289 => 89290)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2011-06-20 21:23:25 UTC (rev 89289)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2011-06-20 21:30:28 UTC (rev 89290)
@@ -351,8 +351,12 @@
self.assertEquals(res, 5)
def test_single_file(self):
- tests_run = get_tests_run(['passes/text.html'], tests_included=True, flatten_batches=True)
- self.assertEquals(['passes/text.html'], tests_run)
+ # FIXME: We should consider replacing more of the get_tests_run()-style tests
+ # with tests that read the tests_run* files, like this one.
+ fs = port.unit_test_filesystem()
+ tests_run = passing_run(['passes/text.html'], tests_included=True, filesystem=fs)
+ self.assertEquals(fs.read_text_file('/tmp/layout-test-results/tests_run0.txt'),
+ 'passes/text.html\n')
def test_single_file_with_prefix(self):
tests_run = get_tests_run(['LayoutTests/passes/text.html'], tests_included=True, flatten_batches=True)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
