Changeset 89290 in webkit

Timestamp:

Jun 20, 2011 2:30:28 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-06-20 Dirk Pranke <​dpranke@chromium.org>

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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/old-run-webkit-tests (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/worker.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-20  Dirk Pranke  <dpranke@chromium.org>
+
+        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  <eric@webkit.org>
 

trunk/Tools/Scripts/old-run-webkit-tests

@@ -753 +753 @@
     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

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py

@@ -206 +206 @@
     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:

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py

@@ -352 +352 @@
 
     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):