From 1fa3a7d70a99127e5dde3fdb9aa19684febb2ac7 Mon Sep 17 00:00:00 2001 From: ZyX Date: Fri, 25 Jul 2014 21:27:54 +0400 Subject: Use color_terminal output in place of TAP #995 --- scripts/travis.sh | 4 ++-- 1 file 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 \ -- cgit