Attachment 371486 Details for Bug 198607 – Patch

[patch] Patch

wk-api-tests.diff (text/plain), 5.80 KB, created by Carlos Garcia Campos on 2019-06-06 05:10:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-06-06 05:10:17 PDT

Size: 5.80 KB

patch

obsolete

>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index c630fa030f3..ea56aaa0333 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,27 @@
>+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 NOBODY (OOPS!).
>+
>+        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  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK][WPE] Enable PSON
>diff --git a/Tools/Scripts/run-gtk-tests b/Tools/Scripts/run-gtk-tests
>index 0b6741ca634..41b05e2df4b 100755
>--- a/Tools/Scripts/run-gtk-tests
>+++ b/Tools/Scripts/run-gtk-tests
>@@ -34,7 +34,7 @@ import flatpakutils
> from api_test_runner import TestRunner, add_options
> 
> class GtkTestRunner(TestRunner):
>-    TestRunner.TEST_DIRS = [ "WebKit2Gtk", "WebKit", "JavaScriptCore", "WTF", "WebCore" ]
>+    TestRunner.TEST_TARGETS = [ "WebKit2Gtk", "TestWebKit", "TestJSC", "TestWTF", "TestWebCore" ]
> 
>     def __init__(self, options, tests=[]):
>         super(GtkTestRunner, self).__init__("gtk", options, tests)
>@@ -110,7 +110,7 @@ class GtkTestRunner(TestRunner):
>         # If we cannot start the accessibility daemons, we can just skip the accessibility tests.
>         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):
>         if self._spi_registryd:
>@@ -120,10 +120,10 @@ class GtkTestRunner(TestRunner):
>         super(GtkTestRunner, self)._tear_down_testing_environment()
> 
>     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):
>         return False
>diff --git a/Tools/Scripts/run-wpe-tests b/Tools/Scripts/run-wpe-tests
>index cb7d7044ad0..8f7749eb6ad 100755
>--- a/Tools/Scripts/run-wpe-tests
>+++ b/Tools/Scripts/run-wpe-tests
>@@ -32,16 +32,16 @@ import flatpakutils
> from api_test_runner import TestRunner, add_options
> 
> 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=[]):
>         super(WPETestRunner, self).__init__("wpe", options, tests)
> 
>     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):
>         return os.path.basename(os.path.dirname(test_program)) == "WPEQt"
>diff --git a/Tools/glib/api_test_runner.py b/Tools/glib/api_test_runner.py
>index 08887bc66a6..5f809d45181 100755
>--- a/Tools/glib/api_test_runner.py
>+++ b/Tools/glib/api_test_runner.py
>@@ -40,7 +40,7 @@ else:
>     import subprocess
> 
> class TestRunner(object):
>-    TEST_DIRS = []
>+    TEST_TARGETS = []
> 
>     def __init__(self, port, options, tests=[]):
>         self._options = options
>@@ -89,9 +89,12 @@ class TestRunner(object):
>             return tests
> 
>         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
> 
>     def _create_driver(self, port_options=[]):

Flags:

mcatanzaro: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 198607: 371486 | 371491