2 files changed, 46 insertions, 1 deletions

diff --git a/runtests.sh b/runtests.sh
new file mode 100755
index 0000000..1e0a5cd
--- /dev/null
+++ b/runtests.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+MAKE=make
+#MAKE=gmake
+
+EGREP="grep -E"
+#EGREP="egrep"
+
+set -e
+
+do_tests() {
+    echo
+    cd tests
+    ./test.lua | $EGREP 'version|PASS|FAIL'
+    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`"
+
+echo "===== Building UTF-8 test data ====="
+( cd tests && ./genutf8.pl; )
+
+echo "===== Cleaning old build data ====="
+$MAKE clean
+rm -f tests/cjson.so
+
+echo "===== Testing LuaRocks build ====="
+luarocks make --local
+do_tests
+luarocks remove --local lua-cjson
+$MAKE clean
+
+echo "===== Testing Makefile build ====="
+$MAKE
+cp cjson.so tests
+do_tests
+$MAKE clean
+rm -f tests/cjson.so
diff --git a/tests/test.lua b/tests/test.lua
index 02d3760..b7b50d2 100755
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -221,7 +221,7 @@ local locale_tests = {
     end
 }
 
-print(string.format("Testing CJSON v%s\n", cjson.version))
+print(string.format("Testing Lua CJSON version %s\n", cjson.version))
 
 run_test_group("decode simple value", decode_simple_tests)
 run_test_group("encode simple value", encode_simple_tests)