Changeset 21181b2 in mod_gnutls for test

Timestamp:

Mar 14, 2016, 4:05:13 PM (5 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, master, proxy-ticket, upstream

Children:

a0161fe

Parents:

c0c4106

Message:

Test suite: Enable OCSP if OpenSSL is available, provide port for responder

Tests must Define OCSP_PORT in their apache.conf to enable the OCSP
responder port.

Location:

test

Files:

• Makefile.am (modified) (2 diffs)
• ocsp_server.conf (modified) (1 diff)

test/Makefile.am

@@ -188 +188 @@
 # port for MSVA in test cases that use it
 MSVA_PORT ?= 9933
+# port for OCSP server (Apache vhost if enabled)
+if ENABLE_OCSP_TEST
+OCSP_PORT ?= 9936
+endif
 # maximum time to wait for MSVA startup (milliseconds)
 TEST_MSVA_MAX_WAIT ?= 10000
@@ -213 +217 @@
 endif
 
+if ENABLE_OCSP_TEST
+AM_TESTS_ENVIRONMENT += export OPENSSL="@OPENSSL@"; \
+        export OCSP_PORT="$(OCSP_PORT)";
+endif
+
 if ENABLE_NETNS
 AM_TESTS_ENVIRONMENT += export UNSHARE="@UNSHARE@"; \

test/ocsp_server.conf

@@ -20 +20 @@
                 SetEnv  OCSP_CERT       ${PWD}/ocsp-responder/x509.pem
                 SetEnv  OCSP_KEY        ${PWD}/ocsp-responder/secret.key
+                <If "-n osenv('OPENSSL')">
+                        # Pass OPENSSL variable to CGI script if set
+                        SetEnv  OPENSSL         ${OPENSSL}
+                </If>
         </Location>
         <Directory ${srcdir}/data>