(svn r26898) -Fix: hopefully make regression under MinGW work again
This commit is contained in:
@@ -30,7 +30,7 @@ fi
|
|||||||
|
|
||||||
ret=0
|
ret=0
|
||||||
for tst in $tests; do
|
for tst in $tests; do
|
||||||
echo "running $tst"
|
echo -n "Running $tst... "
|
||||||
|
|
||||||
# Make sure that only one info.nut is present for each test run. Otherwise openttd gets confused.
|
# Make sure that only one info.nut is present for each test run. Otherwise openttd gets confused.
|
||||||
cp ai/regression/regression_info.nut $tst/info.nut
|
cp ai/regression/regression_info.nut $tst/info.nut
|
||||||
@@ -47,26 +47,19 @@ for tst in $tests; do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$gdb" ]; then
|
if [ -z "$gdb" ]; then
|
||||||
# Ugly newline insertion, but it says /bin/sh above ...
|
res="`diff -ub $tst/result.txt tmp.regression`"
|
||||||
res="$res
|
if [ -z "$res" ]; then
|
||||||
`diff -ub $tst/result.txt tmp.regression`"
|
echo "passed!"
|
||||||
|
else
|
||||||
|
echo "failed! Difference:"
|
||||||
|
echo "$res"
|
||||||
|
ret=1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm $tst/info.nut
|
rm $tst/info.nut
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -z "$gdb" ]; then
|
|
||||||
if [ -z "$res" ]; then
|
|
||||||
echo "Regression test passed!"
|
|
||||||
else
|
|
||||||
echo "Regression test failed! Difference:"
|
|
||||||
echo "$res"
|
|
||||||
ret=1
|
|
||||||
fi
|
|
||||||
echo ""
|
|
||||||
echo "Regression test done"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f scripts/game_start.scr.regression ]; then
|
if [ -f scripts/game_start.scr.regression ]; then
|
||||||
mv scripts/game_start.scr.regression scripts/game_start.scr
|
mv scripts/game_start.scr.regression scripts/game_start.scr
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user