Changeset 83646 in webkit

Timestamp:

Apr 12, 2011 3:02:14 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-04-12 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Tony Chang.

new-run-webkit-tests: --results-directory is relative to builddir, not $PWD
​https://bugs.webkit.org/show_bug.cgi?id=58272

NRWT was interpreting the --results-directory cmd line arg as
relative to the build directory, not the current working
directory (ORWT uses the latter, which is much more intuitive).

This patch fixes the base case, but includes an override for
Chromium that is needed until the bots can be updated.

• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/layout_tests/port/base_unittest.py:
• Scripts/webkitpy/layout_tests/port/chromium.py:
• Scripts/webkitpy/layout_tests/port/port_testcase.py:
• Scripts/webkitpy/layout_tests/port/test.py:
• Scripts/webkitpy/layout_tests/port/webkit.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/base_unittest.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/port_testcase.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/test.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-12  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        new-run-webkit-tests: --results-directory is relative to builddir, not $PWD
+        https://bugs.webkit.org/show_bug.cgi?id=58272
+
+        NRWT was interpreting the --results-directory cmd line arg as
+        relative to the build directory, not the current working
+        directory (ORWT uses the latter, which is much more intuitive).
+        
+        This patch fixes the base case, but includes an override for
+        Chromium that is needed until the bots can be updated.
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+        * Scripts/webkitpy/layout_tests/port/test.py:
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2011-04-12  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -141 +141 @@
         self._test_configuration = None
         self._multiprocessing_is_available = (multiprocessing is not None)
+        self._results_directory = None
 
     def default_child_processes(self):
@@ -571 +572 @@
 
     def results_directory(self):
-        """Absolute path to the place to store the test results."""
-        raise NotImplementedError('Port.results_directory')
+        """Absolute path to the place to store the test results (uses --results-directory)."""
+        if not self._results_directory:
+            option_val = self.get_option('results_directory') or self.default_results_directory()
+            self._results_directory = self._filesystem.abspath(option_val)
+        return self._results_directory
+
+    def default_results_directory(self):
+        """Absolute path to the default place to store the test results."""
+        raise NotImplementedError()
 
     def setup_test_run(self):

trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py

@@ -275 +275 @@
         self.assertVirtual(port.diff_image, None, None)
         self.assertVirtual(port.path_to_test_expectations_file)
-        self.assertVirtual(port.results_directory)
+        self.assertVirtual(port.default_results_directory)
         self.assertVirtual(port.test_expectations)
         self.assertVirtual(port._path_to_apache)

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -201 +201 @@
             'chromium', 'test_expectations.txt')
 
-    def results_directory(self):
+    def default_results_directory(self):
         try:
             return self.path_from_chromium_base('webkit',
                 self.get_option('configuration'),
-                self.get_option('results_directory'))
+                'layout-test-results')
         except AssertionError:
             return self._build_path(self.get_option('configuration'),
-                                    self.get_option('results_directory'))
+                                    'layout-test-results')
+
+    def results_directory(self):
+        # FIXME: This is a hack needed for compatibility with the Chromium
+        # buildbots until their scripts can be updated. Once they have been,
+        # this routine can be deleted and we can use the base class.
+        # See https://bugs.webkit.org/show_bug.cgi?id=58272 for more details.
+        if not self._results_directory:
+            option_val = self.get_option('results_directory')
+            if option_val and not self._filesystem.isabs(option_val):
+                self._results_directory = self._build_path(self.get_option('configuration'),
+                                                           option_val)
+            else:
+                return super(ChromiumPort, self).results_directory(self)
+        return self._results_directory
 
     def setup_test_run(self):

trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

@@ -39 +39 @@
 
 from webkitpy.tool import mocktool
-mock_options = mocktool.MockOptions(results_directory='layout-test-results',
-                                    use_apache=True,
+mock_options = mocktool.MockOptions(use_apache=True,
                                     configuration='Release')
 
@@ -61 +60 @@
             return None
 
-        port = maker(options=options)
-        if hasattr(options, "results_directory"):
-            port._options.results_directory = port.results_directory()
-        return port
+        return maker(options=options)
 
     def test_default_worker_model(self):

trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py

@@ -330 +330 @@
         return None
 
-    def results_directory(self):
-        if not self._results_directory:
-            self._results_directory = self._filesystem.join('/tmp',
-                self.get_option('results_directory'))
-        return self._results_directory
+    def default_results_directory(self):
+        return '/tmp/layout-test-results'
 
     def setup_test_run(self):

trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py

@@ -167 +167 @@
         return result
 
-    def results_directory(self):
+    def default_results_directory(self):
         # Results are store relative to the built products to make it easy
         # to have multiple copies of webkit checked out and built.
-        return self._build_path(self.get_option('results_directory'))
+        return self._build_path('layout-test-results')
 
     def setup_test_run(self):

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

@@ -153 +153 @@
         options.use_apache = sys.platform in ('darwin', 'linux2')
 
-    if not port_obj._filesystem.isabs(options.results_directory):
-        # This normalizes the path to the build dir.
-        # FIXME: how this happens is not at all obvious; this is a dumb
-        # interface and should be cleaned up.
-        options.results_directory = port_obj.results_directory()
-
     if not options.time_out_ms:
         if options.configuration == "Debug":
@@ -289 +283 @@
             help="Ignore image differences less than this percentage (some "
                 "ports may ignore this option)", type="float"),
-        optparse.make_option("--results-directory",
-            default="layout-test-results",
-            help="Output results directory source dir, relative to Debug or "
-                 "Release"),
+        optparse.make_option("--results-directory", help="Location of test results"),
         optparse.make_option("--build-directory",
             help="Path to the directory under which build files are kept (should not include configuration)"),

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

@@ -36 +36 @@
 import itertools
 import logging
+import os
 import Queue
 import sys
@@ -466 +467 @@
         # We run a configuration that should fail, to generate output, then
         # look for what the output results url was.
-
+        fs = port.unit_test_filesystem()
+        fs.maybe_make_directory('/tmp/cwd')
+        fs.chdir('/tmp/cwd')
         res, out, err, user = logging_run(['--results-directory=foo'],
-                                          tests_included=True)
-        self.assertEqual(user.opened_urls, ['/tmp/foo/results.html'])
+                                          tests_included=True, filesystem=fs)
+        self.assertEqual(user.opened_urls, ['/tmp/cwd/foo/results.html'])
 
     # These next tests test that we run the tests in ascending alphabetical