aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYichun Zhang <agentzh@gmail.com>2016-10-11 12:08:42 -0700
committerGitHub <noreply@github.com>2016-10-11 12:08:42 -0700
commitf8c3c82059b67fb9726893207c67893ed4f1d4a6 (patch)
tree27fca0ff6f530ba58daf618360f4a3bfb8820054
parent1e5d5b22018391cd36b7ea268a4155e9feee0acc (diff)
parentf2a28467e30a7b0c1149c07051b1334a86d2e117 (diff)
downloadlua-cjson-f8c3c82059b67fb9726893207c67893ed4f1d4a6.tar.gz
lua-cjson-f8c3c82059b67fb9726893207c67893ed4f1d4a6.tar.bz2
lua-cjson-f8c3c82059b67fb9726893207c67893ed4f1d4a6.zip
Merge pull request #13 from chipitsine/master
travis-ci: bugfix, now we fail on either test
-rw-r--r--.travis.yml10
1 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 61ed62c..6e51514 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,14 +17,16 @@ addons:
17 - valgrind 17 - valgrind
18 - cpanminus 18 - cpanminus
19 - libipc-run3-perl 19 - libipc-run3-perl
20 - lua5.1-dev
21 - libluajit-5.1-dev
20 22
21cache: 23cache:
22 apt: true 24 apt: true
23 25
24env: 26env:
25 matrix: 27 matrix:
26 - LUA=lua5.1-dev LUA_DEV=liblua5.1-dev LUA_INCLUDE_DIR=/usr/include/lua5.1 LUA_CMODULE_DIR=/lib LUALIB=-llua5.1 28 - LUA_DEV=liblua5.1-dev LUA_INCLUDE_DIR=/usr/include/lua5.1 LUA_CMODULE_DIR=/lib LUALIB=-llua5.1
27 - LUA=libluajit-5.1-dev LUA_DEV=libluajit-5.1-dev LUA_INCLUDE_DIR=/usr/include/luajit-2.0 LUA_CMODULE_DIR=/lib LUALIB=-lluajit-5.1 29 - LUA_DEV=libluajit-5.1-dev LUA_INCLUDE_DIR=/usr/include/luajit-2.0 LUA_CMODULE_DIR=/lib LUALIB=-lluajit-5.1
28 30
29install: 31install:
30 - sudo cpanm --notest Test::Base Test::LongString > build.log 2>&1 || (cat build.log && exit 1) 32 - sudo cpanm --notest Test::Base Test::LongString > build.log 2>&1 || (cat build.log && exit 1)
@@ -34,6 +36,6 @@ script:
34 - sh runtests.sh 36 - sh runtests.sh
35 - make 37 - make
36 - prove -Itests tests 38 - prove -Itests tests
37 - TEST_LUA_USE_VALGRIND=1 prove -Itests tests > build.log 2>&1 39 - TEST_LUA_USE_VALGRIND=1 prove -Itests tests > build.log 2>&1; export e=$?
38 - cat build.log 40 - cat build.log
39 - grep -E '^==[0-9]+==' build.log; if [ "$?" == 0 ]; then exit 1; else exit 0; fi 41 - grep -E '^==[0-9]+==' build.log; if [ "$?" == 0 ]; then exit 1; else exit $e; fi