- Revision
- 246189
- Author
- [email protected]
- Date
- 2019-06-06 22:47:49 -0700 (Thu, 06 Jun 2019)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (246188 => 246189)
--- trunk/Tools/ChangeLog 2019-06-07 05:46:03 UTC (rev 246188)
+++ trunk/Tools/ChangeLog 2019-06-07 05:47:49 UTC (rev 246189)
@@ -1,3 +1,27 @@
+2019-06-06 Carlos Garcia Campos <[email protected]>
+
+ 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 <[email protected]>
Remove SSL-based tests from TestWebKitAPI on some configurations
Modified: trunk/Tools/Scripts/run-gtk-tests (246188 => 246189)
--- trunk/Tools/Scripts/run-gtk-tests 2019-06-07 05:46:03 UTC (rev 246188)
+++ trunk/Tools/Scripts/run-gtk-tests 2019-06-07 05:47:49 UTC (rev 246189)
@@ -34,7 +34,7 @@
from api_test_runner import TestRunner, add_options
class GtkTestRunner(TestRunner):
- TestRunner.TEST_DIRS = [ "WebKit2Gtk", "WebKit", "_javascript_Core", "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 @@
# 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 @@
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", "_javascript_Core"]
+ 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
Modified: trunk/Tools/Scripts/run-wpe-tests (246188 => 246189)
--- trunk/Tools/Scripts/run-wpe-tests 2019-06-07 05:46:03 UTC (rev 246188)
+++ trunk/Tools/Scripts/run-wpe-tests 2019-06-07 05:47:49 UTC (rev 246189)
@@ -32,16 +32,16 @@
from api_test_runner import TestRunner, add_options
class WPETestRunner(TestRunner):
- TestRunner.TEST_DIRS = [ "WPE", "WPEQt", "WebKit", "_javascript_Core", "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", "_javascript_Core"]
+ 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"
Modified: trunk/Tools/glib/api_test_runner.py (246188 => 246189)
--- trunk/Tools/glib/api_test_runner.py 2019-06-07 05:46:03 UTC (rev 246188)
+++ trunk/Tools/glib/api_test_runner.py 2019-06-07 05:47:49 UTC (rev 246189)
@@ -40,7 +40,7 @@
import subprocess
class TestRunner(object):
- TEST_DIRS = []
+ TEST_TARGETS = []
def __init__(self, port, options, tests=[]):
self._options = options
@@ -89,9 +89,12 @@
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=[]):
