aboutsummaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
Diffstat (limited to 'spec')
-rw-r--r--spec/test1_spec.lua11
-rw-r--r--spec/test3_spec.lua15
2 files changed, 21 insertions, 5 deletions
diff --git a/spec/test1_spec.lua b/spec/test1_spec.lua
index 81df8f0..147abbd 100644
--- a/spec/test1_spec.lua
+++ b/spec/test1_spec.lua
@@ -21,15 +21,22 @@ return {
]=])
f:close()
+local game_bin = nil
+if package.config:sub(1,1) == "/" then -- linux or osx
+ game_bin = "bin/client/bin/brokengine_client"
+else
+ game_bin = "bin\\client\\bin\\brokengine_client.exe"
+end
+
function rungame()
- f = io.popen("bin\\client\\bin\\brokengine_client.exe spec/headless","r")
+ f = io.popen(game_bin .. " spec/headless","r")
d = f:read("*all")
f:close()
return d
end
function writegame(...)
- f = io.open("spec/headless/init.lua","w")
+ f = assert(io.open("spec/headless/init.lua","w"))
data = {"GAME.crashy()"}
for _,v in pairs({...}) do
data[#data + 1] = v
diff --git a/spec/test3_spec.lua b/spec/test3_spec.lua
index e19741d..8861b0c 100644
--- a/spec/test3_spec.lua
+++ b/spec/test3_spec.lua
@@ -1,6 +1,15 @@
+local game_bin = nil
+if package.config:sub(1,1) == "/" then -- linux or osx
+ game_bin = "bin/client/bin/brokengine_client"
+ server_bin = "bin/server/bin/brokengine_server"
+else
+ game_bin = "bin\\client\\bin\\brokengine_client.exe"
+ server_bin = "bin\\server\\bin\\brokengine_server.exe"
+end
+
function rungame()
- f = io.popen("bin\\client\\bin\\brokengine_client.exe spec/headless","r")
+ f = io.popen(game_bin .. " spec/headless","r")
d = f:read("*all")
f:close()
return d
@@ -10,8 +19,8 @@ function runboth()
--print("Running both")
--Do we have a race condition here? (Can client start and send it's message
--before the server is ready to accept?
- f1 = io.popen("bin\\server\\bin\\brokengine_server.exe spec/server","r")
- f2 = io.popen("bin\\client\\bin\\brokengine_client.exe spec/headless","r")
+ f1 = io.popen(server_bin .. " spec/server","r")
+ f2 = io.popen(game_bin .. " spec/headless","r")
--print("Both ran...")
d1 = f1:read("*all")
d2 = f2:read("*all")