From 2af5f7ab870901edc5237e62f01e1be15a1d074f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 4 Feb 2018 16:00:53 -0500
Subject: [PATCH] Add test runner

---
 .travis.yml               |  5 +++--
 test/main.lua             | 10 ++++++++++
 travis/dfhack_travis.init |  4 ++--
 travis/run-tests.py       | 30 ++++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 test/main.lua
 create mode 100644 travis/run-tests.py

diff --git a/.travis.yml b/.travis.yml
index 04bfcae9b..147cd13fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,8 +48,9 @@ script:
 - cmake .. -DCMAKE_C_COMPILER=gcc-$GCC_VERSION -DCMAKE_CXX_COMPILER=g++-$GCC_VERSION -DDFHACK_BUILD_ARCH=64 -DBUILD_DOCS:BOOL=ON -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
 - make -j3 install
 - mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
-- cp ../travis/dfhack_travis.init "$DF_FOLDER"/
-- "$DF_FOLDER/dfhack"
+- cd ..
+- cp travis/dfhack_travis.init "$DF_FOLDER"/
+- python travis/run-tests.py "$DF_FOLDER"
 notifications:
   email: false
   # irc:
diff --git a/test/main.lua b/test/main.lua
new file mode 100644
index 000000000..0085a9711
--- /dev/null
+++ b/test/main.lua
@@ -0,0 +1,10 @@
+function set_test_stage(stage)
+    local f = io.open('test_stage.txt', 'w')
+    f:write(stage)
+    f:close()
+end
+
+print('running tests')
+
+set_test_stage('done')
+dfhack.run_command('die')
diff --git a/travis/dfhack_travis.init b/travis/dfhack_travis.init
index 5b28cefef..d9bc3e5ba 100644
--- a/travis/dfhack_travis.init
+++ b/travis/dfhack_travis.init
@@ -1,2 +1,2 @@
-devel/check-release
-:lua scr.breakdown_level=df.interface_breakdown_types.QUIT
+:lua dfhack.internal.addScriptPath(os.getenv('TRAVIS_BUILD_DIR'))
+test/main
diff --git a/travis/run-tests.py b/travis/run-tests.py
new file mode 100644
index 000000000..a8265088c
--- /dev/null
+++ b/travis/run-tests.py
@@ -0,0 +1,30 @@
+import os, subprocess, sys
+
+MAX_TRIES = 5
+
+dfhack = 'Dwarf Fortress.exe' if sys.platform == 'win32' else './dfhack'
+test_stage = 'test_stage.txt'
+
+def get_test_stage():
+    if os.path.isfile(test_stage):
+        return open(test_stage).read().strip()
+    return '0'
+
+os.chdir(sys.argv[1])
+if os.path.exists(test_stage):
+    os.remove(test_stage)
+
+tries = 0
+while True:
+    tries += 1
+    stage = get_test_stage()
+    print('Run #%i: stage=%s' % (tries, get_test_stage()))
+    if stage == 'done':
+        print('Done!')
+        os.remove(test_stage)
+        sys.exit(0)
+    if tries > MAX_TRIES:
+        print('Too many tries - aborting')
+        sys.exit(1)
+
+    os.system(dfhack)