Skip to content

Commit 9846459

Browse files
mcatanzaroMarge Bot
authored and
Marge Bot
committed
Propagate GIO_PROXY_TEST_NAME to installed tests
Otherwise, the test has no way to test the proxy resolver that it claims to test. Part-of: <https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/222>
1 parent 419f4b8 commit 9846459

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

proxy/tests/meson.build

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ foreach program: proxy_test_programs
22
test_conf = configuration_data()
33
test_conf.set('installed_tests_dir', installed_tests_execdir)
44
test_conf.set('program', program[0])
5+
test_conf.set('environment', 'GIO_PROXY_TEST_NAME=' + program[1])
56

67
test_name = program[0]
78
if program[0] != program[1]

template.test.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[Test]
22
Type=session
3-
Exec=@installed_tests_dir@/@program@
3+
Exec=env @environment@ @installed_tests_dir@/@program@

tls/tests/meson.build

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ foreach backend: backends
5252
test_conf = configuration_data()
5353
test_conf.set('installed_tests_dir', installed_tests_execdir)
5454
test_conf.set('program', program_name)
55+
test_conf.set('environment', '')
5556

5657
if enable_installed_tests
5758
configure_file(

0 commit comments

Comments
 (0)