aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2014-07-25 21:27:54 +0400
committerJustin M. Keyes <justinkz@gmail.com>2014-08-07 02:07:08 -0400
commit1fa3a7d70a99127e5dde3fdb9aa19684febb2ac7 (patch)
tree5018c8c3bf7505429ac11e324f719def6216eef3
parent1de8fe30c8a2ab09ae9dc6b18925f9351d4f72bc (diff)
downloadrneovim-1fa3a7d70a99127e5dde3fdb9aa19684febb2ac7.tar.gz
rneovim-1fa3a7d70a99127e5dde3fdb9aa19684febb2ac7.tar.bz2
rneovim-1fa3a7d70a99127e5dde3fdb9aa19684febb2ac7.zip
Use color_terminal output in place of TAP #995
-rwxr-xr-xscripts/travis.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/travis.sh b/scripts/travis.sh
index dc603e1bad..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 \