Changeset 278381d in mod_gnutls for test/Makefile.am


Ignore:
Timestamp:
Jan 9, 2020, 1:54:05 AM (3 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
master
Children:
573b810
Parents:
482bafc
git-author:
Fiona Klute <fiona.klute@…> (01/08/20 17:48:04)
git-committer:
Fiona Klute <fiona.klute@…> (01/09/20 01:54:05)
Message:

Remove code for SoftHSM 1 support

SoftHSM 1 has been unsupported for years, so there's no point in
supporting tests with it.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    r482bafc r278381d  
    197197endif
    198198
    199 # SoftHSM tokens. Note that the SoftHSM 2 token is a directory and
    200 # hence has to be treated slightly differently.
    201 SOFTHSM_TOKEN = authority/server/softhsm.db
     199# SoftHSM token, note that the SoftHSM 2 token is a directory
    202200SOFTHSM2_TOKEN = authority/server/softhsm2.db
    203 
    204 # Tokens should be cleaned whether or not the matching SoftHSM version
    205 # was detected on the last ./configure run.
    206 MOSTLYCLEANFILES += $(SOFTHSM_TOKEN)
    207201# included in mostlyclean-local below
    208202clean-softhsm2-db:
    209203        -rm -rf $(SOFTHSM2_TOKEN)
    210204
    211 if HAVE_SOFTHSM1
    212 check_DATA += $(SOFTHSM_TOKEN)
    213 endif HAVE_SOFTHSM1
    214 
    215 if HAVE_SOFTHSM2
     205if HAVE_SOFTHSM
    216206check_DATA += $(SOFTHSM2_TOKEN)
    217 endif HAVE_SOFTHSM2
     207endif HAVE_SOFTHSM
    218208
    219209check_DATA += make-test-dirs
     
    304294if HAVE_SOFTHSM
    305295AM_TESTS_ENVIRONMENT += export SOFTHSM="@SOFTHSM@"; \
    306         export SOFTHSM_MAJOR_VERSION="@SOFTHSM_MAJOR_VERSION@"; \
    307296        export SOFTHSM_LIB="@SOFTHSM_LIB@";
    308297endif
Note: See TracChangeset for help on using the changeset viewer.