From efc44466d663466d13c93a020f5f16a3aca864ba Mon Sep 17 00:00:00 2001
From: glx22 <glx22@users.noreply.github.com>
Date: Sun, 13 Jan 2019 08:40:54 +0100
Subject: Fix: make -k switch useful when testing regression (#7053)

---
 bin/ai/regression/run.sh  | 12 ++++++------
 bin/ai/regression/run.vbs | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'bin')

diff --git a/bin/ai/regression/run.sh b/bin/ai/regression/run.sh
index d47a664ea..c9197c4d5 100755
--- a/bin/ai/regression/run.sh
+++ b/bin/ai/regression/run.sh
@@ -43,11 +43,11 @@ for tst in $tests; do
 	if [ -n "$gdb" ]; then
 		$gdb ./openttd -x -c ai/regression/regression.cfg $params -g $sav
 	else
-		./openttd -x -c ai/regression/regression.cfg $params -g $sav -d script=2 -d misc=9 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[script\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' | grep -v '^dbg: \[.*\]' > tmp.regression
+		./openttd -x -c ai/regression/regression.cfg $params -g $sav -d script=2 -d misc=9 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[script\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' | grep -v '^dbg: \[.*\]' > $tst/tmp.regression
 	fi
 
 	if [ -z "$gdb" ]; then
-		res="`diff -ub $tst/result.txt tmp.regression`"
+		res="`diff -ub $tst/result.txt $tst/tmp.regression`"
 		if [ -z "$res" ]; then
 			echo "passed!"
 		else
@@ -58,14 +58,14 @@ for tst in $tests; do
 	fi
 
 	rm $tst/info.nut
+
+	if [ "$1" != "-k" ]; then
+		rm -f $tst/tmp.regression
+	fi
 done
 
 if [ -f scripts/game_start.scr.regression ]; then
 	mv scripts/game_start.scr.regression scripts/game_start.scr
 fi
 
-if [ "$1" != "-k" ]; then
-	rm -f tmp.regression
-fi
-
 exit $ret
diff --git a/bin/ai/regression/run.vbs b/bin/ai/regression/run.vbs
index 88cea5c4e..930562ec6 100644
--- a/bin/ai/regression/run.vbs
+++ b/bin/ai/regression/run.vbs
@@ -99,11 +99,11 @@ Function RunTest(test, params, ret)
 
 	command = ".\openttd -x -c ai/regression/regression.cfg " & params & " -g " & sav & " -d script=2 -d misc=9"
 	' 2>&1 must be after >tmp.regression, else stderr is not redirected to the file
-	WshShell.Run "cmd /c " & command & " >tmp.regression 2>&1", 0, True
+	WshShell.Run "cmd /c " & command & " >"& test & "/tmp.regression 2>&1", 0, True
 
-	FilterFile "tmp.regression"
+	FilterFile test & "/tmp.regression"
 
-	If CompareFiles(test & "/result.txt", "tmp.regression") Then
+	If CompareFiles(test & "/result.txt", test & "/tmp.regression") Then
 		RunTest = "passed!"
 	Else
 		RunTest = "failed!"
@@ -111,6 +111,14 @@ Function RunTest(test, params, ret)
 	End If
 
 	FSO.DeleteFile test & "/info.nut"
+
+	If WScript.Arguments.Count > 0 Then
+		If WScript.Arguments.Item(0) = "-k" Then
+			Exit Function
+		End If
+	End If
+
+	FSO.DeleteFile test & "/tmp.regression"
 End Function
 
 On Error Resume Next
@@ -143,12 +151,4 @@ If FSO.FileExists("scripts/game_start.scr.regression") Then
 	FSO.MoveFile "scripts/game_start.scr.regression", "scripts/game_start.scr"
 End If
 
-If WScript.Arguments.Count > 0 Then
-	If WScripts.Arguments.Items(0) = "-k" Then
-		WScript.Quit ret
-	End If
-End If
-
-FSO.DeleteFile "tmp.regression"
-
 WScript.Quit ret
-- 
cgit v1.2.3-70-g09d2