Changeset 33af2b7 in mod_gnutls for test/Makefile.am


Ignore:
Timestamp:
May 11, 2015, 6:28:20 PM (5 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
31caead
Parents:
e24eed6
git-author:
Thomas Klute <thomas2.klute@…> (05/11/15 18:12:28)
git-committer:
Thomas Klute <thomas2.klute@…> (05/11/15 18:28:20)
Message:

Test suite: Add tests to "dist" target and support VPATH builds

Supporting VPATH builds requires using $srcdir to find non-generated
data rather than fixed relative paths. If test are not called through
the make system, local defaults must be used. Not changing directories
during tests any more makes this easier.

A few files (e.g. templates, generated CRL) have been moved around to
better match the new structure.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    re24eed6 r33af2b7  
    1 check_SCRIPTS = test-00_basic.bash \
     1SUBDIRS = tests
     2
     3dist_check_SCRIPTS = test-00_basic.bash \
    24        test-01_serverwide_priorities.bash \
    35        test-02_cache_in_vhost.bash \
     
    1517        test-14_basic_openpgp.bash
    1618if USE_MSVA
    17 check_SCRIPTS += test-15_basic_msva.bash
     19dist_check_SCRIPTS += test-15_basic_msva.bash
    1820endif
    19 check_SCRIPTS += test-16_view-status.bash \
     21dist_check_SCRIPTS += test-16_view-status.bash \
    2022        test-17_cgi_vars_large_cert.bash \
    2123        test-18_client_verification_wrong_cert.bash \
     
    2729        test-24_pkcs11_cert.bash
    2830
    29 TESTS = $(check_SCRIPTS)
     31TESTS = $(dist_check_SCRIPTS)
    3032
    3133# Test cases trying to create keys and certificates in parallel causes
     
    3941# running at any time, so test cases actually have to wait for each
    4042# other - just not in any particular order.
    41 check_DATA = setup.done
     43check_DATA = setup.done server/crl.pem
    4244
    43 MOSTLYCLEANFILES = cache/* logs/* outputs/*
     45MOSTLYCLEANFILES = cache/* logs/* outputs/* server/crl.pem
    4446
    4547clean-local:
    46         $(MAKE) -f TestMakefile $(AM_MAKEFLAGS) clean
     48        $(MAKE) -f $(srcdir)/TestMakefile $(AM_MAKEFLAGS) clean
    4749
    4850# SoftHSM files
     
    5456# conditions between multiple calls to TestMakefile for key and
    5557# certificate generation. It is ignored for setup.done itself.
    56 server/softhsm.db setup.done: setup.done
    57         $(MAKE) -f TestMakefile $(AM_MAKEFLAGS) $@
     58server/crl.pem server/softhsm.db setup.done: setup.done
     59        srcdir=$(srcdir) $(MAKE) -f $(srcdir)/TestMakefile $(AM_MAKEFLAGS) $@
     60
     61cert_templates = authority.template.in client.template.in \
     62        imposter.template.in rogueca.template server.template.in
     63apache_data = base_apache.conf data/* mime.types
     64
     65EXTRA_DIST = $(apache_data) $(cert_templates) *.uid.in proxy_backend.bash \
     66        runtests server-crl.template server-softhsm.conf softhsm.bash \
     67        TestMakefile
Note: See TracChangeset for help on using the changeset viewer.