diff options
Diffstat (limited to 'scripts/travis.sh')
| -rwxr-xr-x | scripts/travis.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/travis.sh b/scripts/travis.sh index 0530605bce..ceb244a9f4 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -131,7 +131,7 @@ elif [ "$TRAVIS_BUILD_TYPE" = "gcc/unittest" ]; then export CC=gcc set_environment /opt/neovim-deps export SKIP_EXEC=1 - $MAKE_CMD CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP -DUSE_GCOV=ON" unittest + $MAKE_CMD CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=color_terminal -DUSE_GCOV=ON" unittest coveralls --encoding iso-8859-1 || echo 'coveralls upload failed.' elif [ "$TRAVIS_BUILD_TYPE" = "gcc/ia32" ]; then set_environment /opt/neovim-deps/32 @@ -154,7 +154,7 @@ elif [ "$TRAVIS_BUILD_TYPE" = "gcc/ia32" ]; then # correctly. sudo apt-get install libncurses5-dev:i386 - CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP \ + CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=color_terminal \ -DCMAKE_SYSTEM_PROCESSOR=i386 \ -DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32 \ -DFIND_LIBRARY_USE_LIB64_PATHS=OFF \ @@ -166,12 +166,13 @@ elif [ "$TRAVIS_BUILD_TYPE" = "clint" ]; then ./scripts/clint.sh elif [ "$TRAVIS_BUILD_TYPE" = "api/python" ]; then set_environment /opt/neovim-deps - $MAKE_CMD + sudo apt-get update sudo apt-get install expect valgrind + $MAKE_CMD git clone --depth=1 -b master git://github.com/neovim/python-client cd python-client - sudo pip install . - sudo pip install nose + sudo pip install . + sudo pip install nose test_cmd="nosetests --verbosity=2" nvim_cmd="valgrind -q --track-origins=yes --leak-check=yes --suppressions=$suppressions --log-file=$tmpdir/valgrind-%p.log ../build/bin/nvim -u NONE" if ! ../scripts/run-api-tests.exp "$test_cmd" "$nvim_cmd"; then |