[glib-networking/wip/openssl: 34/41] openssl: enable tests for the interaction

[Ignacio Casal Quinteiro <icq src gnome org>]

commit d7279c3090adb983c08d586f7be4ee2c5d34b205
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Fri Nov 6 15:41:20 2015 +0100

    openssl: enable tests for the interaction

 tls/tests/Makefile.am  |    2 +-
 tls/tests/connection.c |    6 ------
 2 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/tls/tests/Makefile.am b/tls/tests/Makefile.am
index 891af7f..8245c49 100644
--- a/tls/tests/Makefile.am
+++ b/tls/tests/Makefile.am
@@ -43,7 +43,7 @@ certificate_openssl_SOURCES = certificate.c
 certificate_openssl_CPPFLAGS = $(AM_CPPFLAGS) $(OPENSSL_CFLAGS) -DBACKEND=\""openssl"\" 
-DWITH_BACKEND_OPENSSL
 certificate_openssl_LDADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
 
-connection_openssl_SOURCES = connection.c
+connection_openssl_SOURCES = connection.c mock-interaction.c mock-interaction.h
 connection_openssl_CPPFLAGS = $(AM_CPPFLAGS) $(OPENSSL_CFLAGS) -DBACKEND=\""openssl"\" -DWITH_BACKEND_OPENSSL
 connection_openssl_LDADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
 
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index 3e15fbe..9432429 100644
--- a/tls/tests/connection.c
+++ b/tls/tests/connection.c
@@ -24,9 +24,7 @@
 
 #include "config.h"
 
-#ifdef WITH_BACKEND_GNUTLS
 #include "mock-interaction.h"
-#endif
 
 #include <gio/gio.h>
 
@@ -1010,7 +1008,6 @@ test_client_auth_failure (TestConnection *test,
   g_assert (accepted_changed == TRUE);
 }
 
-#ifdef WITH_BACKEND_GNUTLS
 static void
 test_client_auth_request_cert (TestConnection *test,
                                gconstpointer   data)
@@ -1100,7 +1097,6 @@ test_client_auth_request_fail (TestConnection *test,
   g_io_stream_close (test->server_connection, NULL, NULL);
   g_io_stream_close (test->client_connection, NULL, NULL);
 }
-#endif
 
 static void
 test_connection_no_database (TestConnection *test,
@@ -2042,12 +2038,10 @@ main (int   argc,
               setup_connection, test_client_auth_rehandshake, teardown_connection);
   g_test_add ("/tls/connection/client-auth-failure", TestConnection, NULL,
               setup_connection, test_client_auth_failure, teardown_connection);
-#ifdef WITH_BACKEND_GNUTLS
   g_test_add ("/tls/connection/client-auth-request-cert", TestConnection, NULL,
               setup_connection, test_client_auth_request_cert, teardown_connection);
   g_test_add ("/tls/connection/client-auth-request-fail", TestConnection, NULL,
               setup_connection, test_client_auth_request_fail, teardown_connection);
-#endif
   g_test_add ("/tls/connection/no-database", TestConnection, NULL,
               setup_connection, test_connection_no_database, teardown_connection);
   g_test_add ("/tls/connection/failed", TestConnection, NULL,