Merge pull request #8 from chipitsine/master

cpcheck added, rpmbuild test removed

2 files changed, 2 insertions, 24 deletions

diff --git a/.travis.yml b/.travis.yml
index 450b085..6e46368 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,9 @@ env:
 
 install:
     - sudo apt-get update
-    - sudo apt-get install -y $LUA luarocks
+    - sudo apt-get install -qq -y $LUA luarocks cppcheck
 
 script:
+  - cppcheck --force --error-exitcode=1 --enable=warning . > build.log 2>&1 || (cat build.log && exit 1)
   - make
   - sh runtests.sh
diff --git a/runtests.sh b/runtests.sh
index 87db0bc..82dc8c1 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -66,27 +66,4 @@ cp -r lua/cjson build/cjson.so tests
 do_tests
 rm -rf build tests/cjson{,.so}
 
-if [ "$PLATFORM" = "Linux" ]
-then
-    echo "===== Testing RPM build ====="
-    SRCTGZ=""
-    TGZ=lua-cjson-$VERSION.tar.gz
-    for D in .. packages .
-    do
-        [ -r "$D/$TGZ" ] && SRCTGZ="$D/$TGZ"
-    done
-    if [ "$SRCTGZ" ]
-    then
-        LOG=/tmp/build.$$
-        rpmbuild -tb "$SRCTGZ" > "$LOG"
-        RPM="`awk '/^Wrote: / && ! /debuginfo/ { print $2}' < "$LOG"`"
-        sudo -- rpm -Uvh \"$RPM\"
-        do_tests
-        sudo -- rpm -e lua-cjson
-        rm -f "$LOG"
-    else
-        echo "==> skipping, $TGZ not found"
-    fi
-fi
-
 # vi:ai et sw=4 ts=4: