Changeset 154595 in webkit

Timestamp:

Aug 26, 2013 3:36:03 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add support for passing test directories to run-gtk-tests
​https://bugs.webkit.org/show_bug.cgi?id=120296

Reviewed by Philippe Normand.

• Scripts/run-gtk-tests:

(TestRunner._get_tests_from_dir): Helper function to return all
unit tests found in a given directory.
(TestRunner._get_tests): Check the given tests passed in the
command line, so that if a directory is found the tests contained
in the directory are added to the list of tests to run.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-gtk-tests (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-08-26  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add support for passing test directories to run-gtk-tests
+        https://bugs.webkit.org/show_bug.cgi?id=120296
+
+        Reviewed by Philippe Normand.
+
+        * Scripts/run-gtk-tests:
+        (TestRunner._get_tests_from_dir): Helper function to return all
+        unit tests found in a given directory.
+        (TestRunner._get_tests): Check the given tests passed in the
+        command line, so that if a directory is found the tests contained
+        in the directory are added to the list of tests to run.
+
 2013-08-26  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/run-gtk-tests

@@ -98 +98 @@
         self._spi_bus_launcher = None
 
-    def _get_tests(self, tests):
+    def _get_tests_from_dir(self, test_dir):
+        if not os.path.isdir(test_dir):
+            return []
+
+        tests = []
+        for test_file in os.listdir(test_dir):
+            if not test_file.lower().startswith("test"):
+                continue
+            test_path = os.path.join(test_dir, test_file)
+            if os.path.isfile(test_path) and os.access(test_path, os.X_OK):
+                tests.append(test_path)
+        return tests
+
+    def _get_tests(self, initial_tests):
+        tests = []
+        for test in initial_tests:
+            if os.path.isdir(test):
+                tests.extend(self._get_tests_from_dir(test))
+            else:
+                tests.append(test)
         if tests:
             return tests
@@ -105 +124 @@
         for test_dir in self.TEST_DIRS:
             absolute_test_dir = os.path.join(self._programs_path, test_dir)
-            if not os.path.isdir(absolute_test_dir):
-                continue
-            for test_file in os.listdir(absolute_test_dir):
-                if not test_file.lower().startswith("test"):
-                    continue
-                test_path = os.path.join(self._programs_path, test_dir, test_file)
-                if os.path.isfile(test_path) and os.access(test_path, os.X_OK):
-                    tests.append(test_path)
+            tests.extend(self._get_tests_from_dir(absolute_test_dir))
         return tests