From 57a36a84c91d3d69550c57e3de4decc2c7a6e427 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 2 Jan 2016 23:59:50 +1000
Subject: Rejig the build, test, and kill scripts a little bit.

---
 build.lua | 3 +++
 killem.sh | 1 +
 test.sh   | 7 +++++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build.lua b/build.lua
index 160dcce..5661025 100755
--- a/build.lua
+++ b/build.lua
@@ -70,6 +70,9 @@ locale_d = baseDir .. '/locale'
 -- On the other hand, there's a more direct way to get to environment variables, it would fail to.
 CFLAGOPTS = readCommand('echo "$CFLAGOPTS"')
 
+-- Make sure any old servers are killed off.
+os.execute('./killem.sh')
+
 CFLAGS = '-g -Wall -I ' .. baseDir .. '/src/libraries'
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'luajit')
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'elementary')
diff --git a/killem.sh b/killem.sh
index de67db3..262d5d2 100755
--- a/killem.sh
+++ b/killem.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# TODO - Deal with the valgrind left overs, by scanning the output of the following lines, pciking out the PIDs, then "kill -KILL pid"
 ps aux | grep love
 ps aux | grep LuaSL
 
diff --git a/test.sh b/test.sh
index 2c4204c..ed86835 100755
--- a/test.sh
+++ b/test.sh
@@ -4,11 +4,14 @@ reset
 
 wd=$(pwd)
 
+./killem.sh
+sleep 1
+
 ./build.lua || exit
 
 echo "_______________ TESTING extantz, love and LuaSL _______________"
-./extantz &
-sleep 1
+./LuaSL & sleep 2 && ./love & sleep 1 && ./extantz &
+sleep 30
 
 echo "_______________ TESTING GuiLua _______________"
 cd $wd/src/GuiLua
-- 
cgit v1.1