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 cd55170c252e18103709556b0c864b8abcd24773 (commit) from ad346b3f90f74121529c065c84c75fc1f58f8b69 (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 cd55170c252e18103709556b0c864b8abcd24773 Author: Dries Kimpe <[email protected]> Date: Thu Jul 18 18:12:45 2013 -0500 Updates to test runner - Include test output in TAP output - Reduce default timeout to 300s (THis will fail some of the slower tests, but those tests will simply have to be fixed) ----------------------------------------------------------------------- Summary of changes: Makefile.in | 2 +- tests/testrunner.sh.in | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) Diff of changes: diff --git a/Makefile.in b/Makefile.in index c207eb4..5e3badf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -542,7 +542,7 @@ all:: $(PROGRAMS) $(LIBRARIES) .PHONY: check check: $(TESTS) - @$(TEST_RUNNER) -o ${builddir}/tests/test_results.tap $(TESTS) + @$(TEST_RUNNER) -v -o ${builddir}/tests/test_results.tap $(TESTS) .PHONY: tests tests: test diff --git a/tests/testrunner.sh.in b/tests/testrunner.sh.in index f7d0061..bf2dd99 100644 --- a/tests/testrunner.sh.in +++ b/tests/testrunner.sh.in @@ -8,7 +8,7 @@ TEST_RUNNER="@TIMEOUT_PROG@" opt_verbose= -opt_timeout=600 +opt_timeout=300 opt_outputfile= opt_kill="$((opt_timeout+60))" while getopts vk:t:o: name @@ -39,7 +39,7 @@ if test -z "$opt_verbose" ; then exec 4>/dev/null; # exec 5>/dev/null; else - exec 4>&0; + exec 4>&3; # exec 2>&5; fi @@ -49,7 +49,7 @@ testnumber=0 for test in $*; do testnumber=$((testnumber+1)) - ${TEST_RUNNER} -k ${opt_kill} $opt_timeout "$test" >&4 + output="$(${TEST_RUNNER} -k ${opt_kill} $opt_timeout $test)" ret=$? tap="not ok" directive="" @@ -60,6 +60,7 @@ for test in $*; do 137) status="TIMEOUT(KILL)"; directive="#timeout-killed" ;; esac echo "${tap} ${testnumber} - ${test} ${directive}" >&3 + test -n "${output}" && echo "${output}" | sed -e 's/^/ | /g' >&4 echo -e " # ${status}\t [${testnumber}/${TESTCOUNT}] - $test" >&2 if test "${ret}" -eq 130; then hooks/post-receive --