- Timestamp:
- Mar 10, 2016, 3:15:20 PM (5 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream
- Children:
- 28fc74b
- Parents:
- aeaf28b
- Location:
- test
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
test/Makefile.am
raeaf28b r5725dca 51 51 if !DISABLE_FLOCK 52 52 # flock command for write access to the authority keyring 53 GPG_FLOCK = $(FLOCK)authority/lock53 GPG_FLOCK = @FLOCK@ authority/lock 54 54 endif 55 55 … … 175 175 TEST_QUERY_DELAY ?= 30 176 176 177 AM_TESTS_ENVIRONMENT = export APACHE2= $(APACHE2); \178 export AP_LIBEXECDIR= $(AP_LIBEXECDIR); \177 AM_TESTS_ENVIRONMENT = export APACHE2=@APACHE2@; \ 178 export AP_LIBEXECDIR=@AP_LIBEXECDIR@; \ 179 179 export TEST_LOCK_WAIT="$(lock_wait)"; \ 180 export TEST_HOST=" $(TEST_HOST)"; \180 export TEST_HOST="@TEST_HOST@"; \ 181 181 export TEST_PORT="$(TEST_PORT)"; \ 182 182 export MSVA_PORT="$(MSVA_PORT)"; \ … … 184 184 export TEST_MSVA_WAIT="$(TEST_MSVA_WAIT)"; \ 185 185 export TEST_QUERY_DELAY="$(TEST_QUERY_DELAY)"; \ 186 export BACKEND_HOST=" $(TEST_HOST)"; \186 export BACKEND_HOST="@TEST_HOST@"; \ 187 187 export HTTP_CLI="@HTTP_CLI@"; 188 188 … … 194 194 195 195 if ENABLE_NETNS 196 AM_TESTS_ENVIRONMENT += export UNSHARE=" $(UNSHARE)"; \196 AM_TESTS_ENVIRONMENT += export UNSHARE="@UNSHARE@"; \ 197 197 export USE_TEST_NAMESPACE=1; 198 198 endif … … 201 201 .NOTPARALLEL: 202 202 else 203 AM_TESTS_ENVIRONMENT += export FLOCK=" $(FLOCK)"; \203 AM_TESTS_ENVIRONMENT += export FLOCK="@FLOCK@"; \ 204 204 export TEST_LOCK="$(test_lockfile)"; \ 205 205 export BACKEND_LOCK="$(backend_lockfile)"; -
test/test_ca.mk
raeaf28b r5725dca 70 70 %/softhsm2.db: %/x509.pem %/secret.key %/softhsm2.conf 71 71 mkdir -p $@ 72 SOFTHSM=" @SOFTHSM@" \72 SOFTHSM="$(SOFTHSM)" \ 73 73 SOFTHSM2_CONF="$(dir $@)softhsm2.conf" \ 74 74 $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem
Note: See TracChangeset
for help on using the changeset viewer.