diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | appveyor.yml | 6 | ||||
| -rw-r--r-- | cmake/RunTests.cmake | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildLua.cmake | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d2314a418..e786112ca6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -602,7 +602,6 @@ if(BUSTED_PRG) -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test -DBUILD_DIR=${CMAKE_BINARY_DIR} -DTEST_TYPE=unit - -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake DEPENDS ${UNITTEST_PREREQS} ${TEST_TARGET_ARGS}) @@ -633,7 +632,6 @@ if(BUSTED_PRG) -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test -DBUILD_DIR=${CMAKE_BINARY_DIR} -DTEST_TYPE=functional - -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake DEPENDS ${FUNCTIONALTEST_PREREQS} ${TEST_TARGET_ARGS}) @@ -650,7 +648,6 @@ if(BUSTED_PRG) -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test -DBUILD_DIR=${CMAKE_BINARY_DIR} -DTEST_TYPE=benchmark - -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake DEPENDS ${BENCHMARK_PREREQS} ${TEST_TARGET_ARGS}) @@ -668,7 +665,6 @@ if(BUSTED_LUA_PRG) -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test -DBUILD_DIR=${CMAKE_BINARY_DIR} -DTEST_TYPE=functional - -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake DEPENDS ${FUNCTIONALTEST_PREREQS} ${TEST_TARGET_ARGS}) @@ -681,7 +677,6 @@ if(LUACHECK_PRG) -DLUACHECK_PRG=${LUACHECK_PRG} -DLUAFILES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test -DIGNORE_PATTERN="*/preload.lua" - -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} -P ${PROJECT_SOURCE_DIR}/cmake/RunLuacheck.cmake) add_custom_target( @@ -690,7 +685,6 @@ if(LUACHECK_PRG) ${CMAKE_COMMAND} -DLUACHECK_PRG=${LUACHECK_PRG} -DLUAFILES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/src/nvim/lua - -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DREAD_GLOBALS=vim -P ${PROJECT_SOURCE_DIR}/cmake/RunLuacheck.cmake ) @@ -700,7 +694,6 @@ if(LUACHECK_PRG) ${CMAKE_COMMAND} -DLUACHECK_PRG=${LUACHECK_PRG} -DLUAFILES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/runtime/lua - -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DREAD_GLOBALS=vim -P ${PROJECT_SOURCE_DIR}/cmake/RunLuacheck.cmake ) diff --git a/appveyor.yml b/appveyor.yml index f3b4175d52..b41f0ee7a8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,6 +27,12 @@ before_build: - ps: Install-Product node 8 build_script: - powershell ci\build.ps1 +after_build: +- ps: | + if (Test-Path $env:GCOV_ERROR_FILE) { + Get-Content $env:GCOV_ERROR_FILE -Head 10 + Get-Content $env:GCOV_ERROR_FILE -Tail 10 + } cache: - C:\projects\nvim-deps -> third-party\** artifacts: diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake index db67b14917..6999ce8343 100644 --- a/cmake/RunTests.cmake +++ b/cmake/RunTests.cmake @@ -41,7 +41,7 @@ endif() set(ENV{TMPDIR} "${BUILD_DIR}/Xtest_tmpdir/${rel_test_path}") execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory $ENV{TMPDIR}) -set(ENV{SYSTEM_NAME} ${SYSTEM_NAME}) +set(ENV{SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_NAME}) # used by test/helpers.lua. execute_process( COMMAND ${BUSTED_PRG} -v -o ${BUSTED_OUTPUT_TYPE} --lazy --helper=${TEST_DIR}/${TEST_TYPE}/preload.lua diff --git a/third-party/cmake/BuildLua.cmake b/third-party/cmake/BuildLua.cmake index da617e3ccd..eab835a096 100644 --- a/third-party/cmake/BuildLua.cmake +++ b/third-party/cmake/BuildLua.cmake @@ -41,7 +41,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(LUA_TARGET freebsd) elseif(CMAKE_SYSTEM_NAME MATCHES "BSD") set(CMAKE_LUA_TARGET bsd) -elseif(SYSTEM_NAME MATCHES "^MINGW") +elseif(CMAKE_SYSTEM_NAME MATCHES "^MINGW") set(CMAKE_LUA_TARGET mingw) else() if(UNIX) |