From: Ben Pfaff <blp@nicira.com>
Date: Fri, 8 Jan 2010 18:01:27 +0000 (-0800)
Subject: tests: Make test-vconn build and pass tests without OpenSSL.
X-Git-Tag: v1.0.0~259^2~324
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=869decd4fe936b68dc5da5d58c97e9273f511d21;p=sliver-openvswitch.git

tests: Make test-vconn build and pass tests without OpenSSL.
---

diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
index 6f3079277..b3dfe32a4 100644
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
@@ -92,6 +92,8 @@ AC_DEFUN([OVS_CHECK_OPENSSL],
 
    OpenFlow connections over SSL will not be supported.])])
 
+   else
+       HAVE_OPENSSL=no
    fi
    AC_SUBST([HAVE_OPENSSL])
    AM_CONDITIONAL([HAVE_OPENSSL], [test "$HAVE_OPENSSL" = yes])
diff --git a/tests/test-vconn.c b/tests/test-vconn.c
index c118af92b..4ce2f7137 100644
--- a/tests/test-vconn.c
+++ b/tests/test-vconn.c
@@ -65,11 +65,13 @@ check_errno(int a, int b, const char *as, const char *file, int line)
 static void
 fpv_create(const char *type, struct fake_pvconn *fpv)
 {
+#ifdef HAVE_OPENSSL
     if (!strcmp(type, "ssl")) {
         stream_ssl_set_private_key_file("testpki-privkey.pem");
         stream_ssl_set_certificate_file("testpki-cert.pem");
         stream_ssl_set_ca_cert_file("testpki-cacert.pem", false);
     }
+#endif
 
     fpv->type = type;
     if (!strcmp(type, "unix")) {