Changeset 63468af in mod_gnutls for test/Makefile.am


Ignore:
Timestamp:
Apr 16, 2016, 11:14:26 AM (4 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
b586b27, ce12806
Parents:
02c8e54 (diff), c6cfe6e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Imported Upstream version 0.7.4

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    r02c8e54 r63468af  
    2727        test-22_TLS_reverse_proxy_crl_revoke.bash \
    2828        test-23_TLS_reverse_proxy_mismatched_priorities.bash \
    29         test-24_pkcs11_cert.bash
     29        test-24_pkcs11_cert.bash \
     30        test-25_Disable_TLS_1.0.bash \
     31        test-26_redirect_HTTP_to_HTTPS.bash
    3032
    3133TESTS = $(dist_check_SCRIPTS)
     
    3335# Identities in the miniature CA, server, and client environment for
    3436# the test suite
    35 identities = server authority client imposter rogueca
     37shared_identities = server authority client imposter rogueca
     38pgp_identities = $(shared_identities)
     39x509_only_identities = rogueclient
     40x509_identities = $(shared_identities) $(x509_only_identities)
     41identities = $(shared_identities) $(x509_only_identities)
    3642# Append strings after ":=" to each identity to generate a list of
    3743# necessary files
    38 pgp_tokens = $(identities:=/secring.gpg) $(identities:=/cert.pgp) \
    39         $(identities:=/secret.pgp)
    40 x509_keys = $(identities:=/secret.key)
    41 x509_certs = $(identities:=/x509.pem)
     44pgp_tokens = $(pgp_identities:=/secring.gpg) $(pgp_identities:=/cert.pgp) \
     45        $(pgp_identities:=/secret.pgp)
     46x509_keys = $(x509_identities:=/secret.key)
     47x509_certs = $(x509_identities:=/x509.pem)
    4248x509_tokens = $(x509_certs) $(x509_keys)
    4349tokens = $(x509_tokens) $(pgp_tokens)
     50
     51if !DISABLE_FLOCK
     52# flock command for write access to the authority keyring
     53GPG_FLOCK = @FLOCK@ authority/lock
     54endif
    4455
    4556include $(srcdir)/test_ca.mk
     
    6071
    6172cert_templates = authority.template.in client.template.in \
    62         imposter.template.in rogueca.template server.template.in
     73        imposter.template.in rogueca.template rogueclient.template.in \
     74        server.template.in
    6375generated_templates = authority.template client.template \
    64         imposter.template server.template
     76        imposter.template rogueclient.template server.template
    6577
    6678# Delete X.509 private keys on full clean. Note that unless you need
     
    7284# target. Certificates can be rebuilt without generating new key
    7385# pairs, and regenerating them makes it possible to change identities
    74 # (e.g. host names) without wasting entropy on new keys (which would
     86# (e.g. host names) without wasting time on new keys (which would
    7587# happen after "clean").
    7688MOSTLYCLEANFILES += */x509.pem $(generated_templates) *.uid
     
    101113endif
    102114
    103 # SoftHSM files
    104 check_DATA += server/softhsm.db
    105 MOSTLYCLEANFILES += tests/24_pkcs11_cert/softhsm.conf server/softhsm.db
    106 
     115
     116# SoftHSM tokens. Note that the SoftHSM 2 token is a directory and
     117# hence has to be treated slightly differently.
     118SOFTHSM_TOKEN = server/softhsm.db
     119SOFTHSM2_TOKEN = server/softhsm2.db
     120
     121# Tokens should be cleaned whether or not the matching SoftHSM version
     122# was detected on the last ./configure run.
     123MOSTLYCLEANFILES += $(SOFTHSM_TOKEN)
     124# included in mostlyclean-local below
     125clean-softhsm2-db:
     126        -rm -rf $(SOFTHSM2_TOKEN)
     127
     128if HAVE_SOFTHSM1
     129check_DATA += $(SOFTHSM_TOKEN)
     130endif HAVE_SOFTHSM1
     131
     132if HAVE_SOFTHSM2
     133check_DATA += $(SOFTHSM2_TOKEN)
     134endif HAVE_SOFTHSM2
    107135
    108136check_DATA += make-test-dirs
     
    110138make-test-dirs:
    111139        mkdir -p $(extra_dirs)
    112 .PHONY: make-test-dirs
     140
     141.PHONY: make-test-dirs clean-softhsm2-db
     142
     143mostlyclean-local: clean-softhsm2-db
    113144
    114145clean-local:
     
    122153apache_data = base_apache.conf cgi_module.conf data/* mime.types proxy_mods.conf
    123154
    124 EXTRA_DIST = $(apache_data) $(cert_templates) *.uid.in proxy_backend.bash \
    125         runtests server-crl.template server-softhsm.conf softhsm.bash
     155EXTRA_DIST = $(apache_data) $(cert_templates) *.uid.in common.bash \
     156        proxy_backend.bash runtests server-crl.template softhsm.bash
    126157
    127158# Lockfile for the main Apache process
    128159test_lockfile = ./test.lock
    129 # Maximum wait time in seconds for flock to aquire instance lock files
     160# Lockfile for the proxy backend Apache process (if any)
     161backend_lockfile = ./backend.lock
     162# Maximum wait time in seconds for flock to aquire instance lock
     163# files, or Apache to remove its PID file
    130164lock_wait = 30
    131165
     
    141175TEST_QUERY_DELAY ?= 30
    142176
    143 AM_TESTS_ENVIRONMENT = export APACHE2=$(APACHE2); \
    144         export AP_LIBEXECDIR=$(AP_LIBEXECDIR); \
    145         export TEST_LOCK="$(test_lockfile)"; \
     177AM_TESTS_ENVIRONMENT = export APACHE2=@APACHE2@; \
     178        export AP_LIBEXECDIR=@AP_LIBEXECDIR@; \
    146179        export TEST_LOCK_WAIT="$(lock_wait)"; \
    147         export TEST_HOST="$(TEST_HOST)"; \
    148         export TEST_IP="$(TEST_IP)"; \
     180        export TEST_HOST="@TEST_HOST@"; \
    149181        export TEST_PORT="$(TEST_PORT)"; \
    150182        export MSVA_PORT="$(MSVA_PORT)"; \
     
    152184        export TEST_MSVA_WAIT="$(TEST_MSVA_WAIT)"; \
    153185        export TEST_QUERY_DELAY="$(TEST_QUERY_DELAY)"; \
    154         export BACKEND_HOST="$(TEST_HOST)"; \
    155         export BACKEND_IP="$(TEST_IP)";
     186        export BACKEND_HOST="@TEST_HOST@"; \
     187        export HTTP_CLI="@HTTP_CLI@";
     188
     189if HAVE_SOFTHSM
     190AM_TESTS_ENVIRONMENT += export SOFTHSM="@SOFTHSM@"; \
     191        export SOFTHSM_MAJOR_VERSION="@SOFTHSM_MAJOR_VERSION@"; \
     192        export SOFTHSM_LIB="@SOFTHSM_LIB@"
     193endif
     194
     195if ENABLE_NETNS
     196AM_TESTS_ENVIRONMENT += export UNSHARE="@UNSHARE@"; \
     197        export USE_TEST_NAMESPACE=1;
     198endif
     199# Without flock tests must not run in parallel. Otherwise set lock files.
     200if DISABLE_FLOCK
     201.NOTPARALLEL:
     202else
     203AM_TESTS_ENVIRONMENT += export FLOCK="@FLOCK@"; \
     204        export TEST_LOCK="$(test_lockfile)"; \
     205        export BACKEND_LOCK="$(backend_lockfile)";
     206endif
    156207
    157208# Echo AM_TESTS_ENVIRONMENT. This can be useful for debugging, e.g. if
Note: See TracChangeset for help on using the changeset viewer.