Changeset 21181b2 in mod_gnutls
- Timestamp:
- Mar 14, 2016, 4:05:13 PM (6 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, master, proxy-ticket, upstream
- Children:
- a0161fe
- Parents:
- c0c4106
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
configure.ac
rc0c4106 r21181b2 81 81 [test "$enable_flock" = "no" || test "$flock_works" = "no"]) 82 82 83 # TODO: check for openssl ocsp 84 AM_CONDITIONAL([ENABLE_OCSP_TEST], [true]) 83 # openssl is needed as the responder for OCSP tests 84 AC_PATH_PROG([OPENSSL], [openssl], [no]) 85 AM_CONDITIONAL([ENABLE_OCSP_TEST], [test "${OPENSSL}" != "no"]) 85 86 86 87 dnl Enable test namespaces? Default is "yes". … … 208 209 209 210 dnl Build list of "Listen" statements for Apache 210 LISTEN_LIST=" #Listen addresses for the test servers"211 LISTEN_LIST="@%:@ Listen addresses for the test servers" 211 212 for i in ${TEST_IP}; do 212 213 LISTEN_LIST="${LISTEN_LIST} 213 214 Listen ${i}:\${TEST_PORT}" 214 215 done 215 dnl HTTP ports, only active if TEST_HTTP_PORT is defined 216 # Available extra ports, tests can "Define" variables of the listed 217 # names in their apache.conf to enable them. 218 for j in TEST_HTTP_PORT OCSP_PORT; do 216 219 LISTEN_LIST="${LISTEN_LIST} 217 <IfDefine TEST_HTTP_PORT>"220 <IfDefine ${j}>" 218 221 for i in ${TEST_IP}; do 219 222 LISTEN_LIST="${LISTEN_LIST} 220 Listen ${i}:\${ TEST_HTTP_PORT}"223 Listen ${i}:\${${j}}" 221 224 done 222 225 LISTEN_LIST="${LISTEN_LIST} 223 226 </IfDefine>" 227 done 224 228 AC_SUBST(LISTEN_LIST) 225 229 AM_SUBST_NOTMAKE(LISTEN_LIST) -
test/Makefile.am
rc0c4106 r21181b2 188 188 # port for MSVA in test cases that use it 189 189 MSVA_PORT ?= 9933 190 # port for OCSP server (Apache vhost if enabled) 191 if ENABLE_OCSP_TEST 192 OCSP_PORT ?= 9936 193 endif 190 194 # maximum time to wait for MSVA startup (milliseconds) 191 195 TEST_MSVA_MAX_WAIT ?= 10000 … … 213 217 endif 214 218 219 if ENABLE_OCSP_TEST 220 AM_TESTS_ENVIRONMENT += export OPENSSL="@OPENSSL@"; \ 221 export OCSP_PORT="$(OCSP_PORT)"; 222 endif 223 215 224 if ENABLE_NETNS 216 225 AM_TESTS_ENVIRONMENT += export UNSHARE="@UNSHARE@"; \ -
test/ocsp_server.conf
rc0c4106 r21181b2 20 20 SetEnv OCSP_CERT ${PWD}/ocsp-responder/x509.pem 21 21 SetEnv OCSP_KEY ${PWD}/ocsp-responder/secret.key 22 <If "-n osenv('OPENSSL')"> 23 # Pass OPENSSL variable to CGI script if set 24 SetEnv OPENSSL ${OPENSSL} 25 </If> 22 26 </Location> 23 27 <Directory ${srcdir}/data>
Note: See TracChangeset
for help on using the changeset viewer.