Merge branch '3045-multiarch-tests' into 'main'

tests: Fix pkg-config test for multiarch binaries on multiarch systems

Closes #3045

See merge request GNOME/glib!3506

gio/tests/meson.build

@@ -1127,14 +1127,16 @@ if have_bash and have_pkg_config
 
   gio_binaries = [
     'gio',
-    'gio-querymodules',
-    'glib-compile-schemas',
     'glib-compile-resources',
     'gdbus',
     'gdbus-codegen',
     'gresource',
     'gsettings',
   ]
+  gio_multiarch_binaries = [
+    'gio-querymodules',
+    'glib-compile-schemas',
+  ]
 
   foreach binary: gio_binaries
     pkg_config_tests += [
@@ -1144,6 +1146,14 @@ if have_bash and have_pkg_config
     ]
   endforeach
 
+  foreach binary: gio_multiarch_binaries
+    pkg_config_tests += [
+      'test "$(pkg-config --variable=@0@ gio-2.0)" = "@1@"'.format(
+        binary.underscorify(),
+        prefix / multiarch_bindir / binary)
+    ]
+  endforeach
+
   test('gio-2.0-pkg-config',
     bash,
     args: [ '-xe', '-c', '\n'.join(pkg_config_tests) ],