Changeset 85465 in webkit

Timestamp:

May 2, 2011 1:11:02 AM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-05-02 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Add the ability to skip python and perl unit tests on EC2
​https://bugs.webkit.org/show_bug.cgi?id=59918

• Scripts/webkitpy/common/config/ports.py:
  • This is slightly ugly, but it's useful...
• Scripts/webkitpy/common/config/ports_unittest.py:
• Scripts/webkitpy/tool/mocktool.py:
• Scripts/webkitpy/tool/steps/runtests.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/config/ports.py (modified) (2 diffs)
• Scripts/webkitpy/common/config/ports_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/mocktool.py (modified) (2 diffs)
• Scripts/webkitpy/tool/steps/runtests.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-02  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Add the ability to skip python and perl unit tests on EC2
+        https://bugs.webkit.org/show_bug.cgi?id=59918
+
+        * Scripts/webkitpy/common/config/ports.py:
+            - This is slightly ugly, but it's useful...
+        * Scripts/webkitpy/common/config/ports_unittest.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+        * Scripts/webkitpy/tool/steps/runtests.py:
+
 2011-05-02  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/config/ports.py

@@ -256 +256 @@
 
 
+# FIXME: This port is a bit of a hack to get our infrastructure running on EC2.
 class ChromiumXVFBPort(ChromiumPort):
 
+    results_directory = "/tmp/layout-test-results"
+
     @classmethod
     def flag(cls):
@@ -265 +268 @@
     def run_webkit_tests_command(cls):
         # FIXME: We should find a better way to do this.
-        return ["xvfb-run"] + ChromiumPort.run_webkit_tests_command()
+        return ["xvfb-run"] + ChromiumPort.run_webkit_tests_command() + [
+            "--results-directory=%s" % cls.results_directory,
+            "--verbose",
+        ]
+
+    @classmethod
+    def run_python_unittests_command(cls):
+        return None
+
+    @classmethod
+    def run_perl_unittests_command(cls):
+        return None
+
+    @classmethod
+    def layout_tests_results_path(cls):
+        return os.path.join(cls.results_directory, "unexpected_results.json")

trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py

@@ -71 +71 @@
 
     def test_chromium_xvfb_port(self):
-        self.assertEquals(ChromiumXVFBPort.run_webkit_tests_command(), ["xvfb-run", "Tools/Scripts/new-run-webkit-tests", "--chromium", "--no-pixel-tests"])
+        self.assertEquals(ChromiumXVFBPort.run_webkit_tests_command(), ['xvfb-run', 'Tools/Scripts/new-run-webkit-tests', '--chromium', '--no-pixel-tests', '--results-directory=/tmp/layout-test-results', '--verbose'])
 
 if __name__ == '__main__':

trunk/Tools/Scripts/webkitpy/tool/mocktool.py

@@ -758 +758 @@
         self.user = MockUser()
         self._scm = MockSCM()
+        self._port = MockPort()
         self._checkout = MockCheckout()
         self.status_server = MockStatusServer()
@@ -781 +782 @@
 
     def port(self):
-        return MockPort()
+        return self._port
 
 

trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py

@@ -47 +47 @@
             return
 
-        # Run the scripting unit tests first because they're quickest.
-        log("Running Python unit tests")
-        self._tool.executive.run_and_throw_if_fail(self._tool.port().run_python_unittests_command())
-        log("Running Perl unit tests")
-        self._tool.executive.run_and_throw_if_fail(self._tool.port().run_perl_unittests_command())
+        python_unittests_command = self._tool.port().run_python_unittests_command()
+        if python_unittests_command:
+            log("Running Python unit tests")
+            self._tool.executive.run_and_throw_if_fail(python_unittests_command)
+
+        perl_unittests_command = self._tool.port().run_perl_unittests_command()
+        if perl_unittests_command:
+            log("Running Perl unit tests")
+            self._tool.executive.run_and_throw_if_fail(perl_unittests_command)
 
         javascriptcore_tests_command = self._tool.port().run_javascriptcore_tests_command()