Changeset b0e5dae in mod_gnutls for test/Makefile.am


Ignore:
Timestamp:
Feb 12, 2016, 9:20:46 PM (4 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream
Children:
aeaf28b
Parents:
6f644fa
Message:

Test suite: Add support for SoftHSM 2

./configure now detects SoftHSM version 1 or 2, and test case
"24_pkcs11_cert" can use either to provide its PKCS #11 token.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    r6f644fa rb0e5dae  
    113113endif
    114114
    115 # SoftHSM files
    116 check_DATA += server/softhsm.db
    117 MOSTLYCLEANFILES += tests/24_pkcs11_cert/softhsm.conf server/softhsm.db
    118 
     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
    119135
    120136check_DATA += make-test-dirs
     
    122138make-test-dirs:
    123139        mkdir -p $(extra_dirs)
    124 .PHONY: make-test-dirs
     140
     141.PHONY: make-test-dirs clean-softhsm2-db
     142
     143mostlyclean-local: clean-softhsm2-db
    125144
    126145clean-local:
Note: See TracChangeset for help on using the changeset viewer.