From d0cbfe54aff745bad33a2415f771dd548f6c8187 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Mon, 8 Jul 2019 18:44:41 -0400 Subject: Added gitignore files for new build system --- spec/headless/.gitignore | 0 spec/server/.gitignore | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 spec/headless/.gitignore create mode 100644 spec/server/.gitignore (limited to 'spec') diff --git a/spec/headless/.gitignore b/spec/headless/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/spec/server/.gitignore b/spec/server/.gitignore new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3-70-g09d2 From ff704e4ca477892d97a6f23953e99ec13623e114 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Mon, 8 Jul 2019 18:45:30 -0400 Subject: Unit tests are now platform independent Unit tests will use the .exe when on windows, and the binary without extension on linux. --- spec/test1_spec.lua | 11 +++++++++-- spec/test3_spec.lua | 15 ++++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) (limited to 'spec') diff --git a/spec/test1_spec.lua b/spec/test1_spec.lua index 9844204..9248b11 100644 --- a/spec/test1_spec.lua +++ b/spec/test1_spec.lua @@ -1,14 +1,21 @@ print("Hello, world!") +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 e30a0ca..0df875d 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 @@ -8,8 +17,8 @@ end function runboth() --print("Running both") - 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") -- cgit v1.2.3-70-g09d2