Changeset 50eab8e in mod_gnutls for test


Ignore:
Timestamp:
Jul 12, 2015, 2:16:10 PM (4 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
dfd5837
Parents:
ee687ab
git-author:
Thomas Klute <thomas2.klute@…> (07/12/15 14:15:28)
git-committer:
Thomas Klute <thomas2.klute@…> (07/12/15 14:16:10)
Message:

Test suite: Configure max wait time for instance locks from Makefile.am

The increased maximum (30 seconds) should help to avoid false failures
with parallel builds on slow systems.

Location:
test
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    ree687ab r50eab8e  
    8484        TestMakefile
    8585
     86# Maximum wait time in seconds for flock to aquire instance lock files
     87lock_wait = 30
     88
    8689AM_TESTS_ENVIRONMENT = export APACHE2=$(APACHE2); \
    8790        export AP_LIBEXECDIR=$(AP_LIBEXECDIR); \
     91        export TEST_LOCK_WAIT=$(lock_wait); \
    8892        export TEST_HOST="$(TEST_HOST)"; \
    8993        export TEST_IP="$(TEST_IP)"; \
  • test/TestMakefile

    ree687ab r50eab8e  
    2020export TEST_MSVA_MAX_WAIT ?= 10
    2121export TEST_QUERY_DELAY ?= 30
     22export TEST_LOCK_WAIT ?= 30
    2223
    2324TEST_LOCK := ./test.lock
  • test/proxy_backend.bash

    ree687ab r50eab8e  
    1515: ${srcdir:="."}
    1616: ${APACHE2:="apache2"}
     17: ${TEST_LOCK_WAIT:="30"}
    1718
    1819function backend_apache
     
    2425
    2526    if [ -n "${lockfile}" ]; then
    26         flock_cmd="flock -w 10 ${lockfile}"
     27        flock_cmd="flock -w ${TEST_LOCK_WAIT} ${lockfile}"
    2728    fi
    2829
  • test/runtests

    ree687ab r50eab8e  
    1111if [ -n "${TEST_LOCK}" ]; then
    1212    TEST_LOCK="$(realpath ${TEST_LOCK})"
    13     flock_cmd="flock -w 10 ${TEST_LOCK}"
     13    flock_cmd="flock -w ${TEST_LOCK_WAIT} ${TEST_LOCK}"
    1414fi
    1515
Note: See TracChangeset for help on using the changeset viewer.