Title: [281966] trunk/Tools
- Revision
- 281966
- Author
- [email protected]
- Date
- 2021-09-02 16:39:39 -0700 (Thu, 02 Sep 2021)
Log Message
[GLIB] run-gtk-tests does not require GI outside the sandbox
https://bugs.webkit.org/show_bug.cgi?id=229836
Reviewed by Jonathan Bedard.
Some worker bots were failing without python3-gi installed, but it's
not required as the flatpak env provides it.
* Scripts/run-gtk-tests:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (281965 => 281966)
--- trunk/Tools/ChangeLog 2021-09-02 23:25:16 UTC (rev 281965)
+++ trunk/Tools/ChangeLog 2021-09-02 23:39:39 UTC (rev 281966)
@@ -1,3 +1,15 @@
+2021-09-02 Lauro Moura <[email protected]>
+
+ [GLIB] run-gtk-tests does not require GI outside the sandbox
+ https://bugs.webkit.org/show_bug.cgi?id=229836
+
+ Reviewed by Jonathan Bedard.
+
+ Some worker bots were failing without python3-gi installed, but it's
+ not required as the flatpak env provides it.
+
+ * Scripts/run-gtk-tests:
+
2021-09-02 Alex Christensen <[email protected]>
Gracefully recover from WebAuthnProcess crashes
Modified: trunk/Tools/Scripts/run-gtk-tests (281965 => 281966)
--- trunk/Tools/Scripts/run-gtk-tests 2021-09-02 23:25:16 UTC (rev 281965)
+++ trunk/Tools/Scripts/run-gtk-tests 2021-09-02 23:39:39 UTC (rev 281966)
@@ -21,7 +21,6 @@
import os
import sys
import optparse
-from gi.repository import Gio, GLib
top_level_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", ".."))
sys.path.insert(0, os.path.join(top_level_directory, "Tools", "flatpak"))
@@ -32,6 +31,14 @@
import flatpakutils
from api_test_runner import TestRunner, add_options
+
+try:
+ from gi.repository import Gio, GLib
+except ImportError:
+ # We don't require gi to be installed outside the sandbox
+ if flatpakutils.is_sandboxed() or jhbuildutils.enter_jhbuild_environment_if_available("gtk"):
+ raise
+
class GtkTestRunner(TestRunner):
TestRunner.TEST_TARGETS = [ "WebKit2Gtk", "TestWebKit", "TestJSC", "TestWTF", "TestWebCore", "TestJavaScriptCore" ]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
