ci: AppVeyor: fix cov job, remove duplicate non-cov one (#10217)

* ci: AppVeyor: set GCOV_ERROR_FILE

This prevents the warnings/errors to be spilled into test results,
causing them to fail them, e.g.:

    [  FAILED  ] C:/projects/neovim/test/functional\core\main_spec.lua @ 97: Command-line option -s errors out when trying to use nonexistent file with -s
    C:/projects/neovim/test/functional\core\main_spec.lua:98: Expected objects to be the same.
    Passed in:
    (string) 'Cannot open for reading: "Xtest-functional-core-main-s.nonexistent": no such file or directory
    profiling:C:\projects\neovim\build/src/nvim/CMakeFiles/nvim.dir/buffer.c.gcda:Data file mismatch - some data files may have been concurrently updated without locking support
    '
    Expected:
    (string) 'Cannot open for reading: "Xtest-functional-core-main-s.nonexistent": no such file or directory
    '

    stack traceback:
            C:/projects/neovim/test/functional\core\main_spec.lua:98: in function <C:/projects/neovim/test/functional\core\main_spec.lua:97>

For reference, the locking appears to have been reworked for gcc 9.1 [1].

1: https://github.com/gcc-mirror/gcc/commit/56621355b

helpers.clear: keep GCOV_ERROR_FILE in environment

* ci: AppVeyor: remove MINGW_64 config (used with cov now)

Also:

- run MINGW_64-gcov first, and with PRs, since it provides coverage.
This commit is contained in:
Daniel Hahler 2019-06-14 13:39:57 +02:00 committed by GitHub
parent fdbb5a8f72
commit 93f8c2793c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions

View File

@ -3,25 +3,23 @@ environment:
APPVEYOR_CACHE_ENTRY_ZIP_ARGS: "-t7z -m0=lzma -mx=9" APPVEYOR_CACHE_ENTRY_ZIP_ARGS: "-t7z -m0=lzma -mx=9"
DEPS_BUILD_DIR: "C:/projects/nvim-deps" DEPS_BUILD_DIR: "C:/projects/nvim-deps"
DEPS_PREFIX: "C:/projects/nvim-deps/usr" DEPS_PREFIX: "C:/projects/nvim-deps/usr"
# Silence/redirect errors due to missing locking support (via libgcov).
GCOV_ERROR_FILE: "$(TEMP)/libgcov-errors.log"
image: Visual Studio 2017 image: Visual Studio 2017
configuration: configuration:
- MINGW_64-gcov
- MINGW_32
- MSVC_64 - MSVC_64
- MSVC_32 - MSVC_32
- MINGW_64
- MINGW_32
- MINGW_64-gcov
init: init:
- ps: | - ps: |
# Pull requests: skip some build configurations to save time. # Pull requests: skip some build configurations to save time.
if ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -and $env:CONFIGURATION -match '^(MSVC_64|MINGW_32|MINGW_64-gcov)$') { if ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -and $env:CONFIGURATION -match '^(MSVC_64|MINGW_32)$') {
$env:APPVEYOR_CACHE_SKIP_SAVE = "true" $env:APPVEYOR_CACHE_SKIP_SAVE = "true"
Exit-AppVeyorBuild Exit-AppVeyorBuild
} }
# RDP # RDP
#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) #- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
matrix:
allow_failures:
- configuration: MINGW_64-gcov
install: [] install: []
before_build: before_build:
- ps: Install-Product node 8 - ps: Install-Product node 8

View File

@ -430,6 +430,7 @@ local function clear(...)
'PATH', 'PATH',
'NVIM_LOG_FILE', 'NVIM_LOG_FILE',
'NVIM_RPLUGIN_MANIFEST', 'NVIM_RPLUGIN_MANIFEST',
'GCOV_ERROR_FILE',
}) do }) do
if not env_tbl[k] then if not env_tbl[k] then
env_tbl[k] = os.getenv(k) env_tbl[k] = os.getenv(k)