From a9a4e6e640f1726cd882656b929ac3429f8dde5c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 12 Feb 2023 17:40:35 +0000 Subject: proxy: Use environment-libproxy as the as-installed test for libproxy 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 Part-of: --- proxy/tests/meson.build | 10 +++++----- 1 file 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, -- cgit v1.2.1