luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-22 17:08:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Closes #3045

See merge request GNOME/glib!3506
This commit is contained in:
Philip Withnall
2023-07-20 13:29:51 +00:00
parent 04f81e167e 2b391227e6
commit 9cb52d9f3b
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gio/tests/meson.build
View File

@@ -1127,14 +1127,16 @@ if have_bash and have_pkg_config
gio_binaries = [ gio_binaries = [
'gio', 'gio',
'gio-querymodules',
'glib-compile-schemas',
'glib-compile-resources', 'glib-compile-resources',
'gdbus', 'gdbus',
'gdbus-codegen', 'gdbus-codegen',
'gresource', 'gresource',
'gsettings', 'gsettings',
] ]
gio_multiarch_binaries = [
'gio-querymodules',
'glib-compile-schemas',
]
foreach binary: gio_binaries foreach binary: gio_binaries
pkg_config_tests += [ pkg_config_tests += [
@@ -1144,6 +1146,14 @@ if have_bash and have_pkg_config
] ]
endforeach 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', test('gio-2.0-pkg-config',
bash, bash,
args: [ '-xe', '-c', '\n'.join(pkg_config_tests) ], args: [ '-xe', '-c', '\n'.join(pkg_config_tests) ],