[glib-networking] Don't generate installed test files when not enabled



commit 681c8dc515a6e8ff3b4440a982bc947686b53065
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Fri Mar 16 12:40:42 2018 -0500

    Don't generate installed test files when not enabled
    
    These files are not needed except when installed tests are enabled, so
    they should not be generated at all by default.
    
    This is good to do for its own sake, but also works around some weird
    behavior of meson that has resulted in these files being installed even
    when installed tests are disabled.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=794372

 proxy/tests/meson.build |   15 ++++++++-------
 tls/tests/meson.build   |   15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/proxy/tests/meson.build b/proxy/tests/meson.build
index 68f9ac7..4e0079f 100644
--- a/proxy/tests/meson.build
+++ b/proxy/tests/meson.build
@@ -8,13 +8,14 @@ foreach program: proxy_test_programs
   test_conf.set('installed_tests_dir', installed_tests_execdir)
   test_conf.set('program', program[0])
 
-  configure_file(
-    input: test_template,
-    output: program[0] + '.test',
-    install: enable_installed_tests,
-    install_dir: installed_tests_metadir,
-    configuration: test_conf
-  )
+  if enable_installed_tests
+    configure_file(
+      input: test_template,
+      output: program[0] + '.test',
+      install_dir: installed_tests_metadir,
+      configuration: test_conf
+    )
+  endif
 
   exe = executable(
     program[0],
diff --git a/tls/tests/meson.build b/tls/tests/meson.build
index d3611c1..261fa1e 100644
--- a/tls/tests/meson.build
+++ b/tls/tests/meson.build
@@ -46,13 +46,14 @@ foreach program: test_programs
   test_conf.set('installed_tests_dir', installed_tests_execdir)
   test_conf.set('program', program[0])
 
-  configure_file(
-    input: test_template,
-    output: program[0] + '.test',
-    install: enable_installed_tests,
-    install_dir: installed_tests_metadir,
-    configuration: test_conf
-  )
+  if enable_installed_tests
+    configure_file(
+      input: test_template,
+      output: program[0] + '.test',
+      install_dir: installed_tests_metadir,
+      configuration: test_conf
+    )
+  endif
 
   exe = executable(
     program[0],


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