diff options
| author | glx22 <glx22@users.noreply.github.com> | 2019-01-13 08:40:54 +0100 |
|---|---|---|
| committer | Charles Pigott <charlespigott@googlemail.com> | 2019-01-13 07:40:54 +0000 |
| commit | efc44466d663466d13c93a020f5f16a3aca864ba (patch) | |
| tree | 7496b89f1ff36d76547cccd36a7f6921ab48d2d2 /bin/ai/regression/run.vbs | |
| parent | 4fc1b2baaefad669b51d88f980aaf33670795f26 (diff) | |
| download | openttd-efc44466d663466d13c93a020f5f16a3aca864ba.tar.xz | |
Fix: make -k switch useful when testing regression (#7053)
Diffstat (limited to 'bin/ai/regression/run.vbs')
| -rw-r--r-- | bin/ai/regression/run.vbs | 22 |
1 files changed, 11 insertions, 11 deletions
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 |