diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-12-20 19:08:59 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-12-20 19:08:59 +0000 |
| commit | 855357f871fa89d710f6d3fcb5a028bf76a5be31 (patch) | |
| tree | 45be017d462afa3db8e677ed5fd87961a7f8c56b | |
| parent | c83cba2322815bfc3ea3768ce68a084539b02c97 (diff) | |
| parent | 29e6cc58088ef37bfde364965cdebd2f7402f315 (diff) | |
| download | gtk+-855357f871fa89d710f6d3fcb5a028bf76a5be31.tar.gz | |
Merge branch 'testsuite-introspection-extend-envvars' into 'main'
testsuite: introspection: Do not override environment variables.
See merge request GNOME/gtk!4268
| -rw-r--r-- | testsuite/introspection/meson.build | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/testsuite/introspection/meson.build b/testsuite/introspection/meson.build index 647150055c..048e47e6eb 100644 --- a/testsuite/introspection/meson.build +++ b/testsuite/introspection/meson.build @@ -1,10 +1,12 @@ py = import('python').find_installation('python3', modules: ['gi']) +env = environment() +env.prepend('GI_TYPELIB_PATH', + join_paths(project_build_root, 'gtk'), + gi_dep.get_pkgconfig_variable('typelibdir')) +env.prepend('LD_PRELOAD', join_paths(project_build_root, 'gtk', 'libgtk-4.so')) + test('api', find_program('api.py', dirs: meson.current_source_dir()), suite: ['introspection'], - env: [ - 'GI_TYPELIB_PATH=@0@/gtk:@1@'.format(project_build_root, - gi_dep.get_pkgconfig_variable('typelibdir')), - 'LD_PRELOAD=@0@/gtk/libgtk-4.so'.format(project_build_root), - ]) + env: env) |