diff options
| author | Simon McVittie <smcv@debian.org> | 2022-08-17 16:47:49 +0100 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2022-08-18 09:58:58 +0000 |
| commit | 5955b7df4151b104657ae0963ffbd6ab66c34b0b (patch) | |
| tree | 9cec119369bcf4269627e8c38f267fa759d0f343 | |
| parent | 29e7d2378bedcdd36efea619520ff4afbad65f66 (diff) | |
| download | mutter-wip/smcv/42-rpath.tar.gz | |
tests: Give mutter-test-runner the RUNPATH to find Clutterwip/smcv/42-rpath
Until recently, mutter-test-runner called into libraries that
indirectly depend on (mutter's fork of) Clutter, but did not actually
call into Clutter itself. Commit 1bf70334 "tests/runner: Make test
runner use the headless backend" gave it a direct call into Clutter,
which means the runtime linker will fail unless the executable's
RUNPATH is sufficient to find Clutter.
For future-proofing, do the same for the other test executables.
Resolves: https://gitlab.gnome.org/GNOME/mutter/-/issues/2389
Signed-off-by: Simon McVittie <smcv@debian.org>
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2580>
| -rw-r--r-- | src/tests/meson.build | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tests/meson.build b/src/tests/meson.build index ae8c0ca60..c68c43a12 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -119,6 +119,7 @@ test_client = executable('mutter-test-client', ], install: have_installed_tests, install_dir: mutter_installed_tests_libexecdir, + install_rpath: pkglibdir, ) test_runner = executable('mutter-test-runner', @@ -133,6 +134,7 @@ test_runner = executable('mutter-test-runner', dependencies: libmutter_test_dep, install: have_installed_tests, install_dir: mutter_installed_tests_libexecdir, + install_rpath: pkglibdir, ) meta_dbus_runner = find_program('meta-dbus-runner.py') @@ -221,6 +223,7 @@ if have_native_tests ], install: have_installed_tests, install_dir: mutter_installed_tests_libexecdir, + install_rpath: pkglibdir, ) # Native backend tests @@ -315,6 +318,7 @@ if have_native_tests dependencies: libmutter_test_dep, install: have_installed_tests, install_dir: mutter_installed_tests_libexecdir, + install_rpath: pkglibdir, ) test(test_case['name'], test_executable, @@ -382,6 +386,7 @@ if have_kvm_tests or have_tty_tests dependencies: libmutter_test_dep, install: have_installed_tests, install_dir: mutter_installed_tests_libexecdir, + install_rpath: pkglibdir, ) privileged_tests += [ { |