Skip to content

Commit

Permalink
REGRESSION(254269@main): [GTK] Broken API tests
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=245494

Reviewed by Michael Catanzaro.

* Tools/Scripts/run-gtk-tests: Update the location of API test binaries to be run from (WebKit2GTK -> WebKitGTK).

Canonical link: https://commits.webkit.org/254737@main
  • Loading branch information
siwei-li authored and mcatanzaro committed Sep 21, 2022
1 parent 00d8c6a commit 6943b47
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Tools/Scripts/run-gtk-tests
Expand Up @@ -40,7 +40,7 @@ except ImportError:
raise

class GtkTestRunner(TestRunner):
TestRunner.TEST_TARGETS = [ "WebKit2Gtk", "TestWebKit", "TestJSC", "TestWTF", "TestWebCore", "TestJavaScriptCore" ]
TestRunner.TEST_TARGETS = [ "WebKitGTK", "TestWebKit", "TestJSC", "TestWTF", "TestWebCore", "TestJavaScriptCore" ]

def __init__(self, options, tests=[]):
super(GtkTestRunner, self).__init__("gtk", options, tests)
Expand Down Expand Up @@ -72,13 +72,13 @@ class GtkTestRunner(TestRunner):
# If we cannot start the accessibility daemons, we can just skip the accessibility tests.
if not self._ensure_accessibility_service_is_running():
print("Could not start accessibility bus, so disabling TestWebKitAccessibility")
self._disabled_tests.append("WebKit2Gtk/TestWebKitAccessibility")
self._disabled_tests.append("WebKitGTK/TestWebKitAccessibility")

def _tear_down_testing_environment(self):
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"] or os.path.basename(test_program) in ["TestJSC"]
return os.path.basename(os.path.dirname(test_program)) in ["WebKitGTK"] or os.path.basename(test_program) in ["TestJSC"]

def is_google_test(self, test_program):
return os.path.basename(test_program) in ["TestWebKit", "TestWTF", "TestWebCore", "TestJavaScriptCore"]
Expand Down

0 comments on commit 6943b47

Please sign in to comment.