diff options
| -rw-r--r-- | .ci/gcc-ia32.sh | 2 | ||||
| -rw-r--r-- | .ci/gcc-unittest.sh | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/RunUnittests.cmake | 2 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.ci/gcc-ia32.sh b/.ci/gcc-ia32.sh index 05b539021e..97e4190ccc 100644 --- a/.ci/gcc-ia32.sh +++ b/.ci/gcc-ia32.sh @@ -16,7 +16,7 @@ sudo apt-get install gcc-multilib g++-multilib # correctly. sudo apt-get install libncurses5-dev:i386 -CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=color_terminal \ +CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON \ -DCMAKE_SYSTEM_PROCESSOR=i386 \ -DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32 \ -DFIND_LIBRARY_USE_LIB64_PATHS=OFF \ diff --git a/.ci/gcc-unittest.sh b/.ci/gcc-unittest.sh index a4e4a6f35f..bd54d52253 100644 --- a/.ci/gcc-unittest.sh +++ b/.ci/gcc-unittest.sh @@ -6,6 +6,6 @@ sudo pip install cpp-coveralls export CC=gcc export SKIP_EXEC=1 -$MAKE_CMD CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=color_terminal -DUSE_GCOV=ON" unittest +$MAKE_CMD CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DUSE_GCOV=ON" unittest coveralls --encoding iso-8859-1 || echo 'coveralls upload failed.' diff --git a/CMakeLists.txt b/CMakeLists.txt index 16887376b2..1043914e8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,7 +147,7 @@ if(CMAKE_GENERATOR MATCHES "Makefiles") endif() if(NOT BUSTED_OUTPUT_TYPE) - set(BUSTED_OUTPUT_TYPE "utf_terminal") + set(BUSTED_OUTPUT_TYPE "utfTerminal") endif() if(BUSTED_PRG) diff --git a/cmake/RunUnittests.cmake b/cmake/RunUnittests.cmake index 6fce228864..f51fc8a90a 100644 --- a/cmake/RunUnittests.cmake +++ b/cmake/RunUnittests.cmake @@ -5,7 +5,7 @@ if(DEFINED ENV{TEST_FILE}) endif() execute_process( - COMMAND ${BUSTED_PRG} -o ${BUSTED_OUTPUT_TYPE} --lpath=${BUILD_DIR}/?.lua ${TEST_DIR} + COMMAND ${BUSTED_PRG} -v -o ${BUSTED_OUTPUT_TYPE} --lpath=${BUILD_DIR}/?.lua ${TEST_DIR} WORKING_DIRECTORY ${WORKING_DIR} RESULT_VARIABLE res) diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index d42bb4a040..ff161a7cc7 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -153,7 +153,7 @@ if(USE_BUNDLED_LUAROCKS) add_custom_command(OUTPUT ${DEPS_BIN_DIR}/busted COMMAND ${DEPS_BIN_DIR}/luarocks - ARGS build busted 1.10.0 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} + ARGS build busted 2.0.rc3 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} DEPENDS luarocks) add_custom_target(busted DEPENDS ${DEPS_BIN_DIR}/busted) |