[glib-networking/wip/tlssplit] Split tests to take into account the backend

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 5980362d10724c644491601ac0b5985ba4745c02
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Aug 18 10:42:49 2015 +0200

    Split tests to take into account the backend

 tls/tests/Makefile.am     |   36 ++++++++++++++++++++++++++----------
 tls/tests/certificate.c   |    5 +++--
 tls/tests/connection.c    |    5 +++--
 tls/tests/file-database.c |    5 +++--
 4 files changed, 35 insertions(+), 16 deletions(-)
---
diff --git a/tls/tests/Makefile.am b/tls/tests/Makefile.am
index 8d3d903..fd47134 100644
--- a/tls/tests/Makefile.am
+++ b/tls/tests/Makefile.am
@@ -1,22 +1,41 @@
 include $(top_srcdir)/glib-networking.mk
 
 AM_CPPFLAGS +=                                 \
-       $(GNUTLS_CFLAGS)                        \
        -I$(top_srcdir)/tls                     \
        -I$(top_builddir)/tls                   \
        -DSRCDIR=\""$(abs_srcdir)"\"            \
        -DTOP_BUILDDIR=\""$(top_builddir)"\"
 
 LDADD  = \
-       $(GLIB_LIBS) \
-       $(GNUTLS_LIBS)
+       $(GLIB_LIBS)
 
-test_programs =       \
-       certificate   \
-       file-database \
-       connection    \
+test_programs =
+
+if HAVE_GNUTLS
+test_programs +=             \
+       certificate-gnutls   \
+       file-database-gnutls \
+       connection-gnutls    \
        $(NULL)
 
+certificate_gnutls_SOURCES = certificate.c
+certificate_gnutls_CPPFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS) -DBACKEND=\""gnutls"\"
+certificate_gnutls_LDADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
+
+connection_gnutls_SOURCES = connection.c
+connection_gnutls_CPPFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS) -DBACKEND=\""gnutls"\"
+connection_gnutls_LDADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
+if HAVE_PKCS11
+connection_gnutls_SOURCES += mock-interaction.c mock-interaction.h
+connection_gnutls_LDADD += $(top_builddir)/tls/pkcs11/libgiopkcs11.la $(PKCS11_LIBS)
+endif
+
+file_database_gnutls_SOURCES = file-database.c
+file_database_gnutls_CPPFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS) -DBACKEND=\""gnutls"\"
+file_database_gnutls_LDADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
+
+endif
+
 if HAVE_PKCS11
 
 test_programs +=           \
@@ -34,9 +53,6 @@ pkcs11_slot_SOURCES = pkcs11-slot.c \
        mock-pkcs11.c mock-pkcs11.h \
        mock-interaction.c mock-interaction.h
 
-connection_SOURCES = connection.c \
-       mock-interaction.c mock-interaction.h
-
 endif
 
 testfiles_data =                               \
diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c
index 7d3f031..792b93b 100644
--- a/tls/tests/certificate.c
+++ b/tls/tests/certificate.c
@@ -541,8 +541,9 @@ main (int   argc,
   g_test_init (&argc, &argv, NULL);
 
   g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
-  g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/tls/gnutls/.libs", TRUE);
-  g_setenv ("GIO_USE_TLS", "gnutls", TRUE);
+  g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/tls/" BACKEND "/.libs", TRUE);
+  g_setenv ("GIO_USE_TLS", BACKEND, TRUE);
+  g_assert (g_ascii_strcasecmp (G_OBJECT_TYPE_NAME (g_tls_backend_get_default ()), "GTlsBackend" BACKEND) == 
0);
 
   g_test_add ("/tls/certificate/create-pem", TestCertificate, NULL,
               setup_certificate, test_create_pem, teardown_certificate);
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index 2d2d1e8..621a3c7 100644
--- a/tls/tests/connection.c
+++ b/tls/tests/connection.c
@@ -1492,8 +1492,9 @@ main (int   argc,
   g_test_bug_base ("http://bugzilla.gnome.org/";);
 
   g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
-  g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/tls/gnutls/.libs", TRUE);
-  g_setenv ("GIO_USE_TLS", "gnutls", TRUE);
+  g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/tls/" BACKEND "/.libs", TRUE);
+  g_setenv ("GIO_USE_TLS", BACKEND, TRUE);
+  g_assert (g_ascii_strcasecmp (G_OBJECT_TYPE_NAME (g_tls_backend_get_default ()), "GTlsBackend" BACKEND) == 
0);
 
   g_test_add ("/tls/connection/basic", TestConnection, NULL,
               setup_connection, test_basic_connection, teardown_connection);
diff --git a/tls/tests/file-database.c b/tls/tests/file-database.c
index 1416e73..e0342ff 100644
--- a/tls/tests/file-database.c
+++ b/tls/tests/file-database.c
@@ -532,8 +532,9 @@ main (int   argc,
   g_test_init (&argc, &argv, NULL);
 
   g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
-  g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/tls/gnutls/.libs", TRUE);
-  g_setenv ("GIO_USE_TLS", "gnutls", TRUE);
+  g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/tls/" BACKEND "/.libs", TRUE);
+  g_setenv ("GIO_USE_TLS", BACKEND, TRUE);
+  g_assert (g_ascii_strcasecmp (G_OBJECT_TYPE_NAME (g_tls_backend_get_default ()), "GTlsBackend" BACKEND) == 
0);
 
   g_test_add_func ("/tls/backend/default-database-is-singleton",
                    test_default_database_is_singleton);