mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-08-06 23:27:04 +02:00
TESTS: unit-tests: store sh -x in a result file
Store `sh -e -x` of the test in a result file. This file is deleted upon success, but can be consulted if the test fails
This commit is contained in:
parent
7fdc4160b2
commit
0b22c8e0e0
@ -4,6 +4,7 @@ export HAPROXY_PROGRAM="${HAPROXY_PROGRAM:-${PWD}/haproxy}"
|
|||||||
export HAPROXY_ARGS="${HAPROXY_ARGS--dM -dI -dW}"
|
export HAPROXY_ARGS="${HAPROXY_ARGS--dM -dI -dW}"
|
||||||
export ROOTDIR="${ROOTDIR:-${PWD}}"
|
export ROOTDIR="${ROOTDIR:-${PWD}}"
|
||||||
export TESTDIR="${TESTDIR:-./tests/unit/}"
|
export TESTDIR="${TESTDIR:-./tests/unit/}"
|
||||||
|
export TMPDIR="${TMPDIR:-/tmp}"
|
||||||
|
|
||||||
result=0
|
result=0
|
||||||
|
|
||||||
@ -49,9 +50,14 @@ failed=0
|
|||||||
skipped=0
|
skipped=0
|
||||||
testlist=
|
testlist=
|
||||||
|
|
||||||
|
TESTRUNDATETIME="$(date '+%Y-%m-%d_%H-%M-%S')"
|
||||||
|
DSTDIR=$(mktemp -d "${TMPDIR}/ha-unittests-$TESTRUNDATETIME.XXXXXX") || exit 1
|
||||||
|
mkdir -p "${DSTDIR}" || exit 1
|
||||||
|
mkdir -p "${DSTDIR}/results/" || exit 1
|
||||||
|
|
||||||
echo "########################## Gathering tests to run ##########################"
|
echo "########################## Gathering tests to run ##########################"
|
||||||
|
|
||||||
for test in $(find "$TESTDIR" -name "*.sh"); do
|
for test in $(find "${TESTDIR}" -name "*.sh"); do
|
||||||
sh -e ${test} check 2>&1 1>/dev/null
|
sh -e ${test} check 2>&1 1>/dev/null
|
||||||
r="$?"
|
r="$?"
|
||||||
if [ "$r" = "0" ]; then
|
if [ "$r" = "0" ]; then
|
||||||
@ -66,11 +72,12 @@ done
|
|||||||
echo "########################## Starting unit tests ##########################"
|
echo "########################## Starting unit tests ##########################"
|
||||||
|
|
||||||
for TEST in $testlist; do
|
for TEST in $testlist; do
|
||||||
# echo "*** run ${TEST}"
|
export TESTDIR=$( dirname ${TEST} )
|
||||||
export TEST
|
RESULTFILE=$( mktemp "${DSTDIR}/results/res.XXXXXX" )
|
||||||
export TESTDIR=`dirname ${TEST}`
|
touch "${RESULTFILE}" || exit 1
|
||||||
|
|
||||||
sh -e ${TEST} run 2>&1 1>/dev/null
|
echo "${TEST}" > "${RESULTFILE}"
|
||||||
|
sh -x -e "${TEST}" run 1>>"${RESULTFILE}" 2>&1
|
||||||
r="$?"
|
r="$?"
|
||||||
if [ "$r" != "0" ]; then
|
if [ "$r" != "0" ]; then
|
||||||
echo " Test ${TEST} failed: $r"
|
echo " Test ${TEST} failed: $r"
|
||||||
@ -78,6 +85,7 @@ for TEST in $testlist; do
|
|||||||
failed=$((failed+1))
|
failed=$((failed+1))
|
||||||
else
|
else
|
||||||
succeed=$((succeed+1))
|
succeed=$((succeed+1))
|
||||||
|
rm "${RESULTFILE}"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user