This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, devel has been updated via 46ab6688ffb1e34dd20410f4064f51bb6b0b18da (commit) from 95bdc8c232266016ad886b64f589b85b466bdec1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 46ab6688ffb1e34dd20410f4064f51bb6b0b18da Author: Dries Kimpe <[email protected]> Date: Wed Jul 17 11:02:30 2013 -0500 Make sure tests can't hang ----------------------------------------------------------------------- Summary of changes: Makefile.in | 9 +++++---- configure.ac | 11 +++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) Diff of changes: diff --git a/Makefile.in b/Makefile.in index fb959d8..61d4e49 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38,6 +38,9 @@ sbindir = $(DESTDIR)@sbindir@ bindir = $(DESTDIR)@bindir@ libdir = $(DESTDIR)@libdir@ +# tests +TEST_RUNNER=@TEST_RUNNER@ + # tools A2X = @A2X@ ASCIIDOC = @ASCIIDOC@ @@ -550,13 +553,11 @@ $(runTESTS): run%: % @if test -n "$(call testparams,$<)"; then \ for p in $(call testparams,$<); do \ echo -n "Running $< $$p..."; \ - ./$< $$p > /dev/null; \ - echo "done."; \ + $(TEST_RUNNER) ./$< $$p > /dev/null && echo OK || echo FAILED; \ done \ else \ echo -n "Running $<..."; \ - ./$< > /dev/null; \ - echo "done."; \ + $(TEST_RUNNER) ./$< > /dev/null && echo OK || echo FAILED;\ fi check: $(runTESTS) test_results diff --git a/configure.ac b/configure.ac index 3602806..fcf8c3a 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,17 @@ fi AX_GHC("") + +dnl ==================================================== +dnl = Find timeout program to safely run tests for now = +dnl ==================================================== +AC_CHECK_PROGS(TIMEOUT_PROG,[timeout]) +TEST_RUNNER= +if test -n ${TIMEOUT_PROG}; then + TEST_RUNNER="${TIMEOUT_PROG} -k 400s 300s --foreground" +fi +AC_SUBST(TEST_RUNNER) + dnl ====================================================================== dnl Try harder to be valgrind safe dnl ====================================================================== hooks/post-receive --