diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-01-08 10:01:27 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-01-08 10:01:27 -0800 |
| commit | 869decd4fe936b68dc5da5d58c97e9273f511d21 (patch) | |
| tree | 3ceeb34a3e3bd07c404ce1b789a1a0fe619ec9b5 | |
| parent | d27ce5292c63d864dfa727e061f63b06ca770e19 (diff) | |
| download | openvswitch-869decd4fe936b68dc5da5d58c97e9273f511d21.tar.gz | |
tests: Make test-vconn build and pass tests without OpenSSL.
| -rw-r--r-- | m4/openvswitch.m4 | 2 | ||||
| -rw-r--r-- | tests/test-vconn.c | 2 |
2 files changed, 4 insertions, 0 deletions
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")) { |