Changeset 5725dca in mod_gnutls


Ignore:
Timestamp:
Mar 10, 2016, 3:15:20 PM (3 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:
2 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    raeaf28b r5725dca  
    5151if !DISABLE_FLOCK
    5252# flock command for write access to the authority keyring
    53 GPG_FLOCK = $(FLOCK) authority/lock
     53GPG_FLOCK = @FLOCK@ authority/lock
    5454endif
    5555
     
    175175TEST_QUERY_DELAY ?= 30
    176176
    177 AM_TESTS_ENVIRONMENT = export APACHE2=$(APACHE2); \
    178         export AP_LIBEXECDIR=$(AP_LIBEXECDIR); \
     177AM_TESTS_ENVIRONMENT = export APACHE2=@APACHE2@; \
     178        export AP_LIBEXECDIR=@AP_LIBEXECDIR@; \
    179179        export TEST_LOCK_WAIT="$(lock_wait)"; \
    180         export TEST_HOST="$(TEST_HOST)"; \
     180        export TEST_HOST="@TEST_HOST@"; \
    181181        export TEST_PORT="$(TEST_PORT)"; \
    182182        export MSVA_PORT="$(MSVA_PORT)"; \
     
    184184        export TEST_MSVA_WAIT="$(TEST_MSVA_WAIT)"; \
    185185        export TEST_QUERY_DELAY="$(TEST_QUERY_DELAY)"; \
    186         export BACKEND_HOST="$(TEST_HOST)"; \
     186        export BACKEND_HOST="@TEST_HOST@"; \
    187187        export HTTP_CLI="@HTTP_CLI@";
    188188
     
    194194
    195195if ENABLE_NETNS
    196 AM_TESTS_ENVIRONMENT += export UNSHARE="$(UNSHARE)"; \
     196AM_TESTS_ENVIRONMENT += export UNSHARE="@UNSHARE@"; \
    197197        export USE_TEST_NAMESPACE=1;
    198198endif
     
    201201.NOTPARALLEL:
    202202else
    203 AM_TESTS_ENVIRONMENT += export FLOCK="$(FLOCK)"; \
     203AM_TESTS_ENVIRONMENT += export FLOCK="@FLOCK@"; \
    204204        export TEST_LOCK="$(test_lockfile)"; \
    205205        export BACKEND_LOCK="$(backend_lockfile)";
  • test/test_ca.mk

    raeaf28b r5725dca  
    7070%/softhsm2.db: %/x509.pem %/secret.key %/softhsm2.conf
    7171        mkdir -p $@
    72         SOFTHSM="@SOFTHSM@" \
     72        SOFTHSM="$(SOFTHSM)" \
    7373        SOFTHSM2_CONF="$(dir $@)softhsm2.conf" \
    7474        $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem
Note: See TracChangeset for help on using the changeset viewer.