diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-12-04 10:32:12 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-12-04 10:32:12 -0500 |
| commit | 45ae6eadfd3184b860ac19bd2661e1338c4efc89 (patch) | |
| tree | c14363b2eca0298220e25493d63fd5d06ba17f40 | |
| parent | 81530e581615528bc4f57348ed92c46ca49a4657 (diff) | |
| parent | 82748c36ef128bfa1952570586e58180e10934de (diff) | |
| download | rneovim-45ae6eadfd3184b860ac19bd2661e1338c4efc89.tar.gz rneovim-45ae6eadfd3184b860ac19bd2661e1338c4efc89.tar.bz2 rneovim-45ae6eadfd3184b860ac19bd2661e1338c4efc89.zip | |
Merge pull request #1609 from jszakmeister/use-plain-terminal-for-tests
build: use plainTerminal for tests on Travis CI
| -rw-r--r-- | .ci/clang-asan.sh | 4 | ||||
| -rw-r--r-- | .ci/gcc-32.sh | 3 | ||||
| -rw-r--r-- | .ci/gcc.sh | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/.ci/clang-asan.sh b/.ci/clang-asan.sh index b1909ea689..3f2fd4df90 100644 --- a/.ci/clang-asan.sh +++ b/.ci/clang-asan.sh @@ -33,7 +33,9 @@ export TSAN_OPTIONS="external_symbolizer_path=$symbolizer:log_path=$tmpdir/tsan" export SKIP_UNITTEST=1 export UBSAN_OPTIONS="log_path=$tmpdir/ubsan" # not sure if this works -CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DUSE_GCOV=ON" +CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON \ + -DUSE_GCOV=ON \ + -DBUSTED_OUTPUT_TYPE=plainTerminal" # Build and output version info. $MAKE_CMD CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS" nvim diff --git a/.ci/gcc-32.sh b/.ci/gcc-32.sh index 13b2d46d8f..e0448894ab 100644 --- a/.ci/gcc-32.sh +++ b/.ci/gcc-32.sh @@ -19,7 +19,8 @@ CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON \ -DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32 \ -DFIND_LIBRARY_USE_LIB64_PATHS=OFF \ -DCMAKE_IGNORE_PATH=/lib:/usr/lib:/usr/local/lib \ - -DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake" + -DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake \ + -DBUSTED_OUTPUT_TYPE=plainTerminal" # Build and output version info. $MAKE_CMD CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS" nvim diff --git a/.ci/gcc.sh b/.ci/gcc.sh index 8d09c756a7..ad9cbd33b0 100644 --- a/.ci/gcc.sh +++ b/.ci/gcc.sh @@ -15,7 +15,9 @@ setup_prebuilt_deps x64 export VALGRIND=1 export VALGRIND_LOG="$tmpdir/valgrind-%p.log" -CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DUSE_GCOV=ON" +CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON \ + -DUSE_GCOV=ON \ + -DBUSTED_OUTPUT_TYPE=plainTerminal" # Build and output version info. $MAKE_CMD CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS" nvim |