Changeset 34e5dc7 in mod_gnutls for test/Makefile.am


Ignore:
Timestamp:
Sep 19, 2015, 5:29:36 PM (4 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
f9f184f
Parents:
dff03fa
Message:

Test suite: Call "runtests" directly from test scripts

The test scripts used to call runtests through TestMakefile?, which set
up the environment. Moving the environment configuration to
AM_TESTS_ENVIRONMENT in Makefile.am avoids this additional call to
make.

TEST_GAP has been renamed to TEST_MSVA_WAIT because the sleep time in
the MSVA startup loop is its only remaining use.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    rdff03fa r34e5dc7  
    8585        TestMakefile
    8686
     87# Lockfile for the main Apache process
     88test_lockfile = ./test.lock
    8789# Maximum wait time in seconds for flock to aquire instance lock files
    8890lock_wait = 30
    8991
     92# port for the main Apache server
     93TEST_PORT ?= 9932
     94# port for MSVA in test cases that use it
     95MSVA_PORT ?= 9933
     96# maximum time to wait for MSVA startup
     97TEST_MSVA_MAX_WAIT ?= 10
     98# wait loop time for MSVA startup
     99TEST_MSVA_WAIT ?= 0.4
     100# seconds for the HTTP request to be sent and responded to
     101TEST_QUERY_DELAY ?= 30
     102
    90103AM_TESTS_ENVIRONMENT = export APACHE2=$(APACHE2); \
    91104        export AP_LIBEXECDIR=$(AP_LIBEXECDIR); \
    92         export TEST_LOCK_WAIT=$(lock_wait); \
     105        export TEST_LOCK="$(test_lockfile)"; \
     106        export TEST_LOCK_WAIT="$(lock_wait)"; \
    93107        export TEST_HOST="$(TEST_HOST)"; \
    94108        export TEST_IP="$(TEST_IP)"; \
     109        export TEST_PORT="$(TEST_PORT)"; \
     110        export MSVA_PORT="$(MSVA_PORT)"; \
     111        export TEST_MSVA_MAX_WAIT="$(TEST_MSVA_MAX_WAIT)"; \
     112        export TEST_MSVA_WAIT="$(TEST_MSVA_WAIT)"; \
     113        export TEST_QUERY_DELAY="$(TEST_QUERY_DELAY)"; \
    95114        export BACKEND_HOST="$(TEST_HOST)"; \
    96115        export BACKEND_IP="$(TEST_IP)";
Note: See TracChangeset for help on using the changeset viewer.