diff options
| author | Mark Pulford <mark@kyne.com.au> | 2012-01-19 23:22:02 +1030 |
|---|---|---|
| committer | Mark Pulford <mark@kyne.com.au> | 2012-03-04 18:54:35 +1030 |
| commit | a0961903e3ff846a2bde6faa6d390435cd9937ef (patch) | |
| tree | ff6f61c6580ea573a6f1a3b98715913c5d08eb05 | |
| parent | b67ebc41bbc60bd643784d89bd46f36180ea451b (diff) | |
| download | lua-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
Diffstat (limited to '')
| -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 |
