From 8415a159991acd2263607b7d1ed4bfeed802a316 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sun, 21 Sep 2014 17:22:50 +0000
Subject: (svn r26898) -Fix: hopefully make regression under MinGW work again

---
 bin/ai/regression/run.sh | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'bin/ai/regression/run.sh')

diff --git a/bin/ai/regression/run.sh b/bin/ai/regression/run.sh
index adf4dba0c..d47a664ea 100755
--- a/bin/ai/regression/run.sh
+++ b/bin/ai/regression/run.sh
@@ -30,7 +30,7 @@ fi
 
 ret=0
 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.
 	cp ai/regression/regression_info.nut $tst/info.nut
@@ -47,26 +47,19 @@ for tst in $tests; do
 	fi
 
 	if [ -z "$gdb" ]; then
-		# Ugly newline insertion, but it says /bin/sh above ...
-		res="$res
-`diff -ub $tst/result.txt tmp.regression`"
+		res="`diff -ub $tst/result.txt tmp.regression`"
+		if [ -z "$res" ]; then
+			echo "passed!"
+		else
+			echo "failed! Difference:"
+			echo "$res"
+			ret=1
+		fi
 	fi
 
 	rm $tst/info.nut
 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
 	mv scripts/game_start.scr.regression scripts/game_start.scr
 fi
-- 
cgit v1.2.3-70-g09d2