1
0
Fork 0

(svn r22580) -Change: make 'make regression' return an error when it fails

release/1.2
rubidium 2011-06-13 10:09:59 +00:00
parent dcc194e8eb
commit 989bc411ef
1 changed files with 4 additions and 0 deletions

View File

@ -28,6 +28,7 @@ else
./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d ai=2 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[ai\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' > tmp.regression ./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d ai=2 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[ai\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' > tmp.regression
fi fi
ret=0
if [ -z "$gdb" ]; then if [ -z "$gdb" ]; then
res="`diff -ub ai/regression/regression.txt tmp.regression`" res="`diff -ub ai/regression/regression.txt tmp.regression`"
if [ -z "$res" ]; then if [ -z "$res" ]; then
@ -35,6 +36,7 @@ if [ -z "$gdb" ]; then
else else
echo "Regression test failed! Difference:" echo "Regression test failed! Difference:"
echo "$res" echo "$res"
ret=1
fi fi
echo "" echo ""
echo "Regression test done" echo "Regression test done"
@ -49,3 +51,5 @@ fi
if [ "$1" != "-k" ]; then if [ "$1" != "-k" ]; then
rm -f tmp.regression rm -f tmp.regression
fi fi
exit $ret