Title: [280965] trunk/Tools
Revision
280965
Author
[email protected]
Date
2021-08-12 06:52:29 -0700 (Thu, 12 Aug 2021)

Log Message

[GTK] run-gtk-tests always fails to start accessibility daemons
https://bugs.webkit.org/show_bug.cgi?id=229031

Reviewed by Michael Catanzaro.

This is because it uses exec_prefix variable from atspi2 pkg-config file to try to find the executables, but
atspi2 pkg-config file doesn't have a exec_prefix variable anymore. It was always set to $prefix, so we can just
use prefix variable instead.

* Scripts/run-gtk-tests:
(GtkTestRunner._lookup_atspi2_binary):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (280964 => 280965)


--- trunk/Tools/ChangeLog	2021-08-12 13:51:16 UTC (rev 280964)
+++ trunk/Tools/ChangeLog	2021-08-12 13:52:29 UTC (rev 280965)
@@ -1,3 +1,17 @@
+2021-08-12  Carlos Garcia Campos  <[email protected]>
+
+        [GTK] run-gtk-tests always fails to start accessibility daemons
+        https://bugs.webkit.org/show_bug.cgi?id=229031
+
+        Reviewed by Michael Catanzaro.
+
+        This is because it uses exec_prefix variable from atspi2 pkg-config file to try to find the executables, but
+        atspi2 pkg-config file doesn't have a exec_prefix variable anymore. It was always set to $prefix, so we can just
+        use prefix variable instead.
+
+        * Scripts/run-gtk-tests:
+        (GtkTestRunner._lookup_atspi2_binary):
+
 2021-08-12  Youenn Fablet  <[email protected]>
 
         Implement SFrameTransform error handling

Modified: trunk/Tools/Scripts/run-gtk-tests (280964 => 280965)


--- trunk/Tools/Scripts/run-gtk-tests	2021-08-12 13:51:16 UTC (rev 280964)
+++ trunk/Tools/Scripts/run-gtk-tests	2021-08-12 13:52:29 UTC (rev 280965)
@@ -44,11 +44,11 @@
         self._spi_bus_launcher = None
 
     def _lookup_atspi2_binary(self, filename):
-        exec_prefix = common.pkg_config_file_variable('atspi-2', 'exec_prefix')
-        if not exec_prefix:
+        prefix = common.pkg_config_file_variable('atspi-2', 'prefix')
+        if not prefix:
             return None
         for path in ['libexec', 'lib/at-spi2-core', 'lib32/at-spi2-core', 'lib64/at-spi2-core']:
-            filepath = os.path.join(exec_prefix, path, filename)
+            filepath = os.path.join(prefix, path, filename)
             if os.path.isfile(filepath):
                 return filepath
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to