Changeset 280965 in webkit

Timestamp:

Aug 12, 2021, 6:52:29 AM (5 years ago)

Author:

Carlos Garcia Campos

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-gtk-tests (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-08-12  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [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  <youenn@apple.com>
 

trunk/Tools/Scripts/run-gtk-tests

@@ -45 +45 @@
 
     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