aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Pulford <mark@kyne.com.au>2012-01-19 23:22:02 +1030
committerMark Pulford <mark@kyne.com.au>2012-03-04 18:54:35 +1030
commita0961903e3ff846a2bde6faa6d390435cd9937ef (patch)
treeff6f61c6580ea573a6f1a3b98715913c5d08eb05
parentb67ebc41bbc60bd643784d89bd46f36180ea451b (diff)
downloadlua-cjson-a0961903e3ff846a2bde6faa6d390435cd9937ef.tar.gz
lua-cjson-a0961903e3ff846a2bde6faa6d390435cd9937ef.tar.bz2
lua-cjson-a0961903e3ff846a2bde6faa6d390435cd9937ef.zip
Fix runtests.sh after API change and file moves
Fix runtests.sh after: - "util" module moved to lua/cjson - "version" removed
-rwxr-xr-xruntests.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/runtests.sh b/runtests.sh
index 777ef01..a301488 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -14,7 +14,7 @@ contextgrep() {
14do_tests() { 14do_tests() {
15 echo 15 echo
16 cd tests 16 cd tests
17 lua -e 'require "cjson"; print("Testing Lua CJSON version " .. cjson.version)' 17 lua -e 'print("Testing Lua CJSON version " .. require("cjson")._VERSION)'
18 ./test.lua | contextgrep 'FAIL|Summary' 3 | grep -v PASS | cut -c -70 18 ./test.lua | contextgrep 'FAIL|Summary' 3 | grep -v PASS | cut -c -70
19 cd .. 19 cd ..
20} 20}
@@ -50,10 +50,10 @@ make clean
50 50
51echo "===== Testing Makefile build =====" 51echo "===== Testing Makefile build ====="
52make 52make
53cp cjson.so tests 53cp -r lua/cjson cjson.so tests
54do_tests 54do_tests
55make clean 55make clean
56rm -f tests/cjson.so 56rm -rf tests/cjson{,.so}
57 57
58echo "===== Testing Cmake build =====" 58echo "===== Testing Cmake build ====="
59mkdir build 59mkdir build
@@ -61,9 +61,9 @@ cd build
61cmake .. 61cmake ..
62make 62make
63cd .. 63cd ..
64cp build/cjson.so tests 64cp -r lua/cjson build/cjson.so tests
65do_tests 65do_tests
66rm -rf build tests/cjson.so 66rm -rf build tests/cjson{,.so}
67 67
68if [ "$PLATFORM" = "Linux" ] 68if [ "$PLATFORM" = "Linux" ]
69then 69then