From 9748b8b9865515a5d0c9087a7fa4587f1abe4e5b Mon Sep 17 00:00:00 2001
From: Mark Pulford <mark@kyne.com.au>
Date: Tue, 13 Dec 2011 22:26:03 +1030
Subject: Ensure build tests only use the current cjson.so

Update runtests.sh to exit if an old copy of cjson.so is found.
---
 runtests.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'runtests.sh')

diff --git a/runtests.sh b/runtests.sh
index 3876b45..45b1b8c 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -15,12 +15,6 @@ do_tests() {
     cd ..
 }
 
-cat <<EOT
-Please ensure you do not have the Lua CJSON module installed before
-running these tests.
-
-EOT
-
 echo "===== Setting LuaRocks PATH ====="
 eval "`luarocks path`"
 
@@ -31,6 +25,19 @@ echo "===== Cleaning old build data ====="
 make clean
 rm -f tests/cjson.so
 
+echo "===== Verifying cjson.so is not installed ====="
+
+cd tests
+if lua -e 'require "cjson"' 2>/dev/null
+then
+	cat <<EOT
+Please ensure you do not have the Lua CJSON module installed before
+running these tests.
+EOT
+	exit
+fi
+cd ..
+
 echo "===== Testing LuaRocks build ====="
 luarocks make --local
 do_tests
-- 
cgit v1.2.3-55-g6feb