Changeset 5725dca in mod_gnutls for test

Timestamp:

Mar 10, 2016, 3:15:20 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

28fc74b

Parents:

aeaf28b

Message:

Test suite: Consistent use of @VAR@ vs. $(VAR)

Makefile.am will always be processed by autotools, so @VAR@ where
possible is the way to go. On the other hand, test_ca.mk should be
usable as a general collection of make rules and use $(VAR).

Location:

test

Files:

• Makefile.am (modified) (5 diffs)
• test_ca.mk (modified) (1 diff)

test/Makefile.am

@@ -51 +51 @@
 if !DISABLE_FLOCK
 # flock command for write access to the authority keyring
-GPG_FLOCK = $(FLOCK) authority/lock
+GPG_FLOCK = @FLOCK@ authority/lock
 endif
 
@@ -175 +175 @@
 TEST_QUERY_DELAY ?= 30
 
-AM_TESTS_ENVIRONMENT = export APACHE2=$(APACHE2); \
-        export AP_LIBEXECDIR=$(AP_LIBEXECDIR); \
+AM_TESTS_ENVIRONMENT = export APACHE2=@APACHE2@; \
+        export AP_LIBEXECDIR=@AP_LIBEXECDIR@; \
         export TEST_LOCK_WAIT="$(lock_wait)"; \
-        export TEST_HOST="$(TEST_HOST)"; \
+        export TEST_HOST="@TEST_HOST@"; \
         export TEST_PORT="$(TEST_PORT)"; \
         export MSVA_PORT="$(MSVA_PORT)"; \
@@ -184 +184 @@
         export TEST_MSVA_WAIT="$(TEST_MSVA_WAIT)"; \
         export TEST_QUERY_DELAY="$(TEST_QUERY_DELAY)"; \
-        export BACKEND_HOST="$(TEST_HOST)"; \
+        export BACKEND_HOST="@TEST_HOST@"; \
         export HTTP_CLI="@HTTP_CLI@";
 
@@ -194 +194 @@
 
 if ENABLE_NETNS
-AM_TESTS_ENVIRONMENT += export UNSHARE="$(UNSHARE)"; \
+AM_TESTS_ENVIRONMENT += export UNSHARE="@UNSHARE@"; \
         export USE_TEST_NAMESPACE=1;
 endif
@@ -201 +201 @@
 .NOTPARALLEL:
 else
-AM_TESTS_ENVIRONMENT += export FLOCK="$(FLOCK)"; \
+AM_TESTS_ENVIRONMENT += export FLOCK="@FLOCK@"; \
         export TEST_LOCK="$(test_lockfile)"; \
         export BACKEND_LOCK="$(backend_lockfile)";

test/test_ca.mk

@@ -70 +70 @@
 %/softhsm2.db: %/x509.pem %/secret.key %/softhsm2.conf
         mkdir -p $@
-        SOFTHSM="@SOFTHSM@" \
+        SOFTHSM="$(SOFTHSM)" \
         SOFTHSM2_CONF="$(dir $@)softhsm2.conf" \
         $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem