diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rwxr-xr-x | ci/before_script.sh | 4 | ||||
| -rw-r--r-- | ci/build.ps1 | 2 | ||||
| -rw-r--r-- | ci/common/test.sh | 7 | ||||
| -rw-r--r-- | cmake/mingw32-w64-cross-travis.toolchain.cmake | 53 |
6 files changed, 11 insertions, 59 deletions
diff --git a/.travis.yml b/.travis.yml index 63f86ab2d8..8ccc45084b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ jobs: # store 32-bit dependencies in a separate cache. compiler: gcc env: BUILD_32BIT=ON - - if: branch = master + - if: branch = master AND commit_message !~ /\[skip.lint\]/ os: linux env: CI_TARGET=lint diff --git a/appveyor.yml b/appveyor.yml index 11ff5daa01..f3b4175d52 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,6 +20,8 @@ init: } # RDP #- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +matrix: + fast_finish: true install: [] before_build: - ps: Install-Product node 8 diff --git a/ci/before_script.sh b/ci/before_script.sh index 49b4e068b5..ae20eef1fc 100755 --- a/ci/before_script.sh +++ b/ci/before_script.sh @@ -20,8 +20,8 @@ if [[ -n "${LLVM_SYMBOLIZER}" ]] && [[ ! $(type -P "${LLVM_SYMBOLIZER}") ]]; the exit 1 fi -# Show ccache stats so we can compare in before_cache -ccache -s 2>/dev/null || true +# Reset ccache stats for real results in before_cache. +ccache --zero-stats if [[ "${TRAVIS_OS_NAME}" == osx ]]; then # Adds user to a dummy group. diff --git a/ci/build.ps1 b/ci/build.ps1 index 151563709c..d3686e2914 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -129,6 +129,8 @@ if ($uploadToCodecov) { } # Old tests +# Add MSYS to path, required for e.g. `find` used in test scripts. +# But would break functionaltests, where its `more` would be used then. $env:PATH = "C:\msys64\usr\bin;$env:PATH" & "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1 diff --git a/ci/common/test.sh b/ci/common/test.sh index 18b5639885..0912c3965f 100644 --- a/ci/common/test.sh +++ b/ci/common/test.sh @@ -32,11 +32,12 @@ check_core_dumps() { shift fi local app="${1:-${BUILD_DIR}/bin/nvim}" + local cores if test "${TRAVIS_OS_NAME}" = osx ; then - local cores="$(find /cores/ -type f -print)" + cores="$(find /cores/ -type f -print)" local _sudo='sudo' else - local cores="$(find ./ -type f -name 'core.*' -print)" + cores="$(find ./ -type f -name 'core.*' -print)" local _sudo= fi @@ -94,7 +95,7 @@ run_unittests() {( fail 'unittests' F 'Unit tests failed' fi submit_coverage unittest - check_core_dumps "$(which luajit)" + check_core_dumps "$(command -v luajit)" exit_suite )} diff --git a/cmake/mingw32-w64-cross-travis.toolchain.cmake b/cmake/mingw32-w64-cross-travis.toolchain.cmake deleted file mode 100644 index bdd14365c6..0000000000 --- a/cmake/mingw32-w64-cross-travis.toolchain.cmake +++ /dev/null @@ -1,53 +0,0 @@ -# -# Mingw-w64 cross compiler toolchain -# -# - The usual CMAKE variables will point to the cross compiler -# - HOST_EXE_LINKER, HOST_C_COMPILER, HOST_EXE_LINKER_FLAGS, -# HOST_C_FLAGS point to a host compiler -# - -set(MINGW_TRIPLET i686-w64-mingw32) -# For x86_64 use -#set(MINGW_TRIPLET x86_64-w64-mingw32) - -# The location of your toolchain sys-root -set(MINGW_PREFIX_PATH /opt/mingw32/${MINGW_TRIPLET}/) -# or sometimes like this -#set(MINGW_PREFIX_PATH /usr/${MINGW_TRIPLET}/sys-root) - -# the name of the target operating system -set(CMAKE_SYSTEM_NAME Windows) - -# which compilers to use for C and C++ -set(CMAKE_C_COMPILER ${MINGW_TRIPLET}-gcc) -set(CMAKE_CXX_COMPILER ${MINGW_TRIPLET}-g++) -set(CMAKE_RC_COMPILER ${MINGW_TRIPLET}-windres) -set(CMAKE_C_COMPILER ${MINGW_TRIPLET}-gcc) -set(CMAKE_CXX_COMPILER ${MINGW_TRIPLET}-g++) -set(CMAKE_RC_COMPILER ${MINGW_TRIPLET}-windres) - -# Where is the target environment located -set(CMAKE_FIND_ROOT_PATH "${MINGW_PREFIX_PATH}/mingw") - -# adjust the default behaviour of the FIND_XXX() commands: -# search headers and libraries in the target environment, search -# programs in the host environment -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - -set(CROSS_TARGET ${MINGW_TRIPLET}) - -# We need a host compiler too - assuming mildly sane Unix -# defaults here -set(HOST_C_COMPILER cc) -set(HOST_EXE_LINKER ld) - -if (MINGW_TRIPLET MATCHES "^x86_64") - set(HOST_C_FLAGS) - set(HOST_EXE_LINKER_FLAGS) -else() - # In 32 bits systems have the HOST compiler generate 32 bits binaries - set(HOST_C_FLAGS -m32) - set(HOST_EXE_LINKER_FLAGS -m32) -endif() |