[glib-networking] meson: Fix build when gnutls is disabled



commit ff61151c81d068299b586057771cf14ae3842d2e
Author: Nirbheek Chauhan <nirbheek centricular com>
Date:   Tue Mar 5 04:22:30 2019 +0530

    meson: Fix build when gnutls is disabled
    
    Also, always build tests and only disable *running* of openssl tests.
    
    Closes https://gitlab.gnome.org/GNOME/glib-networking/issues/67

 tls/tests/meson.build | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/tls/tests/meson.build b/tls/tests/meson.build
index 684c97d..fc73a4b 100644
--- a/tls/tests/meson.build
+++ b/tls/tests/meson.build
@@ -29,9 +29,7 @@ test_programs = [
 #  ['dtls-connection', ['mock-interaction.c'], deps, ['openssl']],
 ]
 
-# OpenSSL tests are disabled until we fix https://gitlab.gnome.org/GNOME/glib-networking/issues/54
-#foreach backend: backends
-foreach backend: ['gnutls']
+foreach backend: backends
   foreach program: test_programs
     if not program[3].contains(backend)
       program_name = program[0] + '-' + backend
@@ -68,11 +66,10 @@ foreach backend: ['gnutls']
         'GIO_MODULE_DIR=' + join_paths(meson.build_root(), 'tls', backend)
       ]
 
-      test(
-        program_name,
-        exe,
-        env: test_envs
-      )
+      # OpenSSL tests are disabled until we fix https://gitlab.gnome.org/GNOME/glib-networking/issues/54
+      if backend != 'openssl'
+        test(program_name, exe, env: test_envs)
+      endif
     endif
   endforeach
 endforeach


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