diff options
| author | Simon McVittie <smcv@debian.org> | 2023-02-12 17:40:35 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2023-02-12 17:47:15 +0000 |
| commit | a9a4e6e640f1726cd882656b929ac3429f8dde5c (patch) | |
| tree | 3064f32e145d9c7e0c6b0ea2602325c912ae2895 | |
| parent | 77bf46eaa803050748227166a2c697861e2d1739 (diff) | |
| download | glib-networking-a9a4e6e640f1726cd882656b929ac3429f8dde5c.tar.gz | |
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 <smcv@debian.org>
Part-of: <https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/235>
| -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, |