[glib-networking/mcatanzaro/#195: 9/9] Propagate GIO_PROXY_TEST_NAME to installed tests




commit 98464595adc94b4db3665cc32e3a0a96e59b9a7b
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Mon Aug 29 12:50:15 2022 -0500

    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>

 proxy/tests/meson.build | 1 +
 template.test.in        | 2 +-
 tls/tests/meson.build   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/proxy/tests/meson.build b/proxy/tests/meson.build
index 6af5ee63..ce0d8d0f 100644
--- a/proxy/tests/meson.build
+++ b/proxy/tests/meson.build
@@ -2,6 +2,7 @@ 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]
diff --git a/template.test.in b/template.test.in
index f701627f..d364ef4b 100644
--- a/template.test.in
+++ b/template.test.in
@@ -1,3 +1,3 @@
 [Test]
 Type=session
-Exec=@installed_tests_dir@/@program@
+Exec=env @environment@ @installed_tests_dir@/@program@
diff --git a/tls/tests/meson.build b/tls/tests/meson.build
index 0dc2571c..4afcc815 100644
--- a/tls/tests/meson.build
+++ b/tls/tests/meson.build
@@ -52,6 +52,7 @@ foreach backend: backends
     test_conf = configuration_data()
     test_conf.set('installed_tests_dir', installed_tests_execdir)
     test_conf.set('program', program_name)
+    test_conf.set('environment', '')
 
     if enable_installed_tests
       configure_file(


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]