Changeset 246189 in webkit

Timestamp:

Jun 6, 2019 10:47:49 PM (5 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r244857): [GTK][WPE] Many tests are no longer run in the bots after r244857
​https://bugs.webkit.org/show_bug.cgi?id=198607

Reviewed by Michael Catanzaro.

Since r244857 several test executables are compiled in the base tests directory instead of using their own sub
directory. Our scripts to run the tests rely on the tests location to decide whether to run them or not, or
determine the type of the tests.

• Scripts/run-gtk-tests:

(GtkTestRunner): Rename TEST_DIRS as TEST_TARGETS and use the executable names for tests not in a subdirectory.
(GtkTestRunner._setup_testing_environment): Fix TestWebKitAccessibility directory name.
(GtkTestRunner.is_glib_test): Use the test name for the ones not using a subdirectory.
(GtkTestRunner.is_google_test): Ditto.

• Scripts/run-wpe-tests:

(WPETestRunner): Rename TEST_DIRS as TEST_TARGETS and use the executable names for tests not in a subdirectory.
(WPETestRunner.is_glib_test): Use the test name for the ones not using a subdirectory.
(WPETestRunner.is_google_test): Ditto.

• glib/api_test_runner.py:

(TestRunner): Rename TEST_DIRS as TEST_TARGETS.
(TestRunner._get_tests): Handle test targets which can now contain directories and executables.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-gtk-tests (modified) (3 diffs)
• Scripts/run-wpe-tests (modified) (2 diffs)
• glib/api_test_runner.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-06-06  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r244857): [GTK][WPE] Many tests are no longer run in the bots after r244857
+        https://bugs.webkit.org/show_bug.cgi?id=198607
+
+        Reviewed by Michael Catanzaro.
+
+        Since r244857 several test executables are compiled in the base tests directory instead of using their own sub
+        directory. Our scripts to run the tests rely on the tests location to decide whether to run them or not, or
+        determine the type of the tests.
+
+        * Scripts/run-gtk-tests:
+        (GtkTestRunner): Rename TEST_DIRS as TEST_TARGETS and use the executable names for tests not in a subdirectory.
+        (GtkTestRunner._setup_testing_environment): Fix TestWebKitAccessibility directory name.
+        (GtkTestRunner.is_glib_test): Use the test name for the ones not using a subdirectory.
+        (GtkTestRunner.is_google_test): Ditto.
+        * Scripts/run-wpe-tests:
+        (WPETestRunner): Rename TEST_DIRS as TEST_TARGETS and use the executable names for tests not in a subdirectory.
+        (WPETestRunner.is_glib_test): Use the test name for the ones not using a subdirectory.
+        (WPETestRunner.is_google_test): Ditto.
+        * glib/api_test_runner.py:
+        (TestRunner): Rename TEST_DIRS as TEST_TARGETS.
+        (TestRunner._get_tests): Handle test targets which can now contain directories and executables.
+
 2019-06-06  Keith Rollin  <krollin@apple.com>
 

trunk/Tools/Scripts/run-gtk-tests

@@ -35 +35 @@
 
 class GtkTestRunner(TestRunner):
-    TestRunner.TEST_DIRS = [ "WebKit2Gtk", "WebKit", "JavaScriptCore", "WTF", "WebCore" ]
+    TestRunner.TEST_TARGETS = [ "WebKit2Gtk", "TestWebKit", "TestJSC", "TestWTF", "TestWebCore" ]
 
     def __init__(self, options, tests=[]):
@@ -111 +111 @@
         if not self._start_accessibility_daemons():
             print "Could not start accessibility bus, so disabling TestWebKitAccessibility"
-            self._disabled_tests.append("WebKit2APITests/TestWebKitAccessibility")
+            self._disabled_tests.append("WebKit2Gtk/TestWebKitAccessibility")
 
     def _tear_down_testing_environment(self):
@@ -121 +121 @@
 
     def is_glib_test(self, test_program):
-        return os.path.basename(os.path.dirname(test_program)) in ["WebKit2Gtk", "JavaScriptCore"]
+        return os.path.basename(os.path.dirname(test_program)) in ["WebKit2Gtk"] or os.path.basename(test_program) in ["TestJSC"]
 
     def is_google_test(self, test_program):
-        return os.path.basename(os.path.dirname(test_program)) in ["WebKit", "WTF", "WebCore",  "WebCoreGtk"]
+        return os.path.basename(test_program) in ["TestWebKit", "TestWTF", "TestWebCore"]
 
     def is_qt_test(self, test_program):

trunk/Tools/Scripts/run-wpe-tests

@@ -33 +33 @@
 
 class WPETestRunner(TestRunner):
-    TestRunner.TEST_DIRS = [ "WPE", "WPEQt", "WebKit", "JavaScriptCore", "WTF", "WebCore" ]
+    TestRunner.TEST_TARGETS = [ "WPE", "WPEQt", "TestWebKit", "TestJSC", "TestWTF", "TestWebCore" ]
 
     def __init__(self, options, tests=[]):
@@ -39 +39 @@
 
     def is_glib_test(self, test_program):
-        return os.path.basename(os.path.dirname(test_program)) in ["WPE", "JavaScriptCore"]
+        return os.path.basename(os.path.dirname(test_program)) in ["WPE"] or os.path.basename(test_program) in ["TestJSC"]
 
     def is_google_test(self, test_program):
-        return os.path.basename(os.path.dirname(test_program)) in ["WebKit", "WTF", "WebCore"]
+        return os.path.basename(test_program) in ["TestWebKit", "TestWTF", "TestWebCore"]
 
     def is_qt_test(self, test_program):

trunk/Tools/glib/api_test_runner.py

@@ -41 +41 @@
 
 class TestRunner(object):
-    TEST_DIRS = []
+    TEST_TARGETS = []
 
     def __init__(self, port, options, tests=[]):
@@ -90 +90 @@
 
         tests = []
-        for test_dir in self.TEST_DIRS:
-            absolute_test_dir = os.path.join(self._test_programs_base_dir(), test_dir)
-            tests.extend(self._get_tests_from_dir(absolute_test_dir))
+        for test_target in self.TEST_TARGETS:
+            absolute_test_target = os.path.join(self._test_programs_base_dir(), test_target)
+            if test_target.lower().startswith("test") and os.path.isfile(absolute_test_target) and os.access(absolute_test_target, os.X_OK):
+                tests.append(absolute_test_target)
+            else:
+                tests.extend(self._get_tests_from_dir(absolute_test_target))
         return tests