diff options
author | Simon McVittie <smcv@debian.org> | 2023-02-12 17:40:35 +0000 |
---|---|---|
committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2023-02-12 19:18:08 -0500 |
commit | ce60734bc4d1ef8d94cd48eca6f83e451b3786a4 (patch) | |
tree | 5e3f3a0211a7408b664d1a073c6afd604e47be83 | |
parent | 8c536956d728b1b4304460a803168854a34a7035 (diff) | |
download | glib-networking-glib-2-74.tar.gz |
proxy: Use environment-libproxy as the as-installed test for libproxyglib-2-74
Previously the .test file was generated with a reference to
${installed_tests_dir}/environment, which is only built (from the same
source code) when the module for proxy configuration from environment
variables (without using libproxy) is enabled.
The build-time test already correctly ran environment-libproxy.
Resolves: https://gitlab.gnome.org/GNOME/glib-networking/-/issues/208
Bug-Debian: https://bugs.debian.org/1031166
Signed-off-by: Simon McVittie <smcv@debian.org>
(cherry picked from commit 968867160bc37570cc1fd975b62d7bd12bf3cb9d)
-rw-r--r-- | proxy/tests/meson.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/proxy/tests/meson.build b/proxy/tests/meson.build index ce0d8d0..1b2163a 100644 --- a/proxy/tests/meson.build +++ b/proxy/tests/meson.build @@ -1,14 +1,14 @@ foreach program: proxy_test_programs - test_conf = configuration_data() - test_conf.set('installed_tests_dir', installed_tests_execdir) - test_conf.set('program', program[0]) - test_conf.set('environment', 'GIO_PROXY_TEST_NAME=' + program[1]) - test_name = program[0] if program[0] != program[1] test_name = program[0] + '-' + program[1] endif + test_conf = configuration_data() + test_conf.set('installed_tests_dir', installed_tests_execdir) + test_conf.set('program', test_name) + test_conf.set('environment', 'GIO_PROXY_TEST_NAME=' + program[1]) + if enable_installed_tests configure_file( input: test_template, |