diff options
-rwxr-xr-x | runtests.sh | 10 |
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() { | |||
14 | do_tests() { | 14 | do_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 | ||
51 | echo "===== Testing Makefile build =====" | 51 | echo "===== Testing Makefile build =====" |
52 | make | 52 | make |
53 | cp cjson.so tests | 53 | cp -r lua/cjson cjson.so tests |
54 | do_tests | 54 | do_tests |
55 | make clean | 55 | make clean |
56 | rm -f tests/cjson.so | 56 | rm -rf tests/cjson{,.so} |
57 | 57 | ||
58 | echo "===== Testing Cmake build =====" | 58 | echo "===== Testing Cmake build =====" |
59 | mkdir build | 59 | mkdir build |
@@ -61,9 +61,9 @@ cd build | |||
61 | cmake .. | 61 | cmake .. |
62 | make | 62 | make |
63 | cd .. | 63 | cd .. |
64 | cp build/cjson.so tests | 64 | cp -r lua/cjson build/cjson.so tests |
65 | do_tests | 65 | do_tests |
66 | rm -rf build tests/cjson.so | 66 | rm -rf build tests/cjson{,.so} |
67 | 67 | ||
68 | if [ "$PLATFORM" = "Linux" ] | 68 | if [ "$PLATFORM" = "Linux" ] |
69 | then | 69 | then |