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

tests: Normalize setup.journal.log and setup.server.log

Browse source 
These logs are saved in the sandbox to help debugging setup.
Normalize them to make them easier to read.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-07 09:40:42 +01:00
parent 0a012a3ed5
commit 617b194cef
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
tests/test-common.sh
View file

@ -204,7 +204,9 @@ begin_test()
mv $data/lostitems $data/setup.lostitems mv $data/lostitems $data/setup.lostitems
>$data/lostitems >$data/lostitems
mv $data/journal.log $data/setup.journal.log mv $data/journal.log $data/setup.journal.log
normalize sandbox/var/empire/setup.journal.log
mv $data/server.log $data/setup.server.log mv $data/server.log $data/setup.server.log
normalize sandbox/var/empire/setup.server.log
fi fi
start_server start_server
} }
@ -241,6 +243,25 @@ cmp_out()
done done
} }
normalize()
{
local act="$1"
local nrm="${2-sandbox/normalized-${1##*/}}"
case "$act" 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"
}
cmp_out1() cmp_out1()
{ {
local i=$1 exp="${2-$testdir/${1##*/}}" local i=$1 exp="${2-$testdir/${1##*/}}"
@ -263,18 +284,7 @@ cmp_out1()
esac esac
fi fi
case "$i" in normalize "$act" "$nrm"
*/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" if diff -u "$exp" "$nrm" >"$nrm.diff"
then then
echo "$i OK" echo "$i OK"