empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: New helper cmp_out1

Browse source 
Factor out of cmp_out, then make it optionally take an explicit
expected result.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-29 21:09:04 +01:00
parent fed6620a0b
commit c594b6120e
1 changed files with 49 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

86
tests/test-common.sh
View file

@ -210,44 +210,56 @@ cmp_logs_xdump()
cmp_out()
{
local i exp act nrm
local i
for i
do
exp="$testdir/${i##*/}"
act="sandbox/$i"
nrm="sandbox/normalized-${i##*/}"
if [ ! -e "$exp" ]
then
case "$i" in
*.status) exp=sandbox/ok.status; echo 0 >sandbox/ok.status ;;
*) exp=/dev/null ;;
esac
fi
case "$i" in
*/journal.log)
perl "$srcdir"/tests/normalize.pl -j "$act" ;;
*/server.log)
perl "$srcdir"/tests/normalize.pl -s "$act" ;;
*.xdump)
perl "$srcdir"/tests/normalize.pl "$act" ;;
*.err)
perl -pe 's/\s+$/\n/;' -e "s,\Q$srcdir/tests\E,tests," "$act" ;;
*)
perl -pe 's/\s+$/\n/;' "$act" ;;
esac >"$nrm"
if diff -u "$exp" "$nrm" >"$nrm.diff"
then
echo "$i OK"
elif [ "$EMPIRE_CHECK_ACCEPT" ]
then
echo "$i CHANGED"
cp "$nrm" "$exp"
else
failed=y
echo "$i FAIL"
fi
do cmp_out1 "$i"
done
}
cmp_out1()
{
local i=$1 exp="${2-$testdir/${1##*/}}"
local act="sandbox/$i"
local nrm="sandbox/normalized-${i##*/}"
if [ ! -e "$exp" ]
then
case "$i" in
*.status)
exp=sandbox/ok.status
echo 0 >sandbox/ok.status
;;
*)
[ ! -e "$act" ] && return
exp=/dev/null
;;
*.status) exp=sandbox/ok.status; echo 0 >sandbox/ok.status ;;
*) exp=/dev/null ;;
esac
fi
case "$i" in
*/journal.log)
perl "$srcdir"/tests/normalize.pl -j "$act" ;;
*/server.log)
perl "$srcdir"/tests/normalize.pl -s "$act" ;;
*.xdump)
perl "$srcdir"/tests/normalize.pl "$act" ;;
*.err)
perl -pe 's/\s+$/\n/;' -e "s,\Q$srcdir/tests\E,tests," "$act" ;;
*)
perl -pe 's/\s+$/\n/;' "$act" ;;
esac >"$nrm"
if diff -u "$exp" "$nrm" >"$nrm.diff"
then
echo "$i OK"
elif [ "$EMPIRE_CHECK_ACCEPT" ]
then
echo "$i CHANGED"
cp "$nrm" "$exp"
else
failed=y
echo "$i FAIL"
fi
}