projects
/
openvswitch
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d27ce52
)
tests: Make test-vconn build and pass tests without OpenSSL.
author
Ben Pfaff
<blp@nicira.com>
Fri, 8 Jan 2010 18:01:27 +0000
(10:01 -0800)
committer
Ben Pfaff
<blp@nicira.com>
Fri, 8 Jan 2010 18:01:27 +0000
(10:01 -0800)
m4/openvswitch.m4
patch
|
blob
|
history
tests/test-vconn.c
patch
|
blob
|
history
diff --git
a/m4/openvswitch.m4
b/m4/openvswitch.m4
index 6f30792772f6b7f9a32bba1643ca59b63caa726f..b3dfe32a43fd2376e1e25f85484df5a84b1d2cad 100644
(file)
--- 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 c118af92b4deacf9fa9d3b9aafcac82c4f6f1521..4ce2f71373fad2006287a1173415819b5a01124c 100644
(file)
--- 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")) {