Mercurial > vim
changeset 16328:b576f2e069b7 v8.1.1169
patch 8.1.1169: writing coverage info in a separate dir is not needed
commit https://github.com/vim/vim/commit/837854d1bc01d91ff463a2cfdf8aec9b89d5fbd1
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Apr 13 22:44:51 2019 +0200
patch 8.1.1169: writing coverage info in a separate dir is not needed
Problem: Writing coverage info in a separate dir is not needed.
Solution: Revert the changes to use a separate directory.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 13 Apr 2019 22:45:05 +0200 |
| parents | 750f687ca105 |
| children | ee09f240ebcd |
| files | .travis.yml src/testdir/screendump.vim src/version.c |
| diffstat | 3 files changed, 2 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.travis.yml +++ b/.travis.yml @@ -170,9 +170,6 @@ after_success: - | if [[ "${COVERAGE}" = "yes" ]]; then (cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash)) - # Also do this for nested executions, codecov will merge the results. - mv "${SRCDIR}"/testdir/nested/* "${SRCDIR}"/objects - (cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash)) fi # vim:set sts=2 sw=2 tw=0 et:
--- a/src/testdir/screendump.vim +++ b/src/testdir/screendump.vim @@ -55,15 +55,11 @@ func RunVimInTerminal(arguments, options let cmd = GetVimCommandClean() " Add -v to have gvim run in the terminal (if possible) - " The GCOV_ environment variables cause the Vim running in the terminal to - " write the coverage information in the "nested" directory, to avoid two Vim - " instances try to write to the same coverage info file. let cmd .= ' -v ' . a:arguments let buf = term_start(cmd, { \ 'curwin': 1, \ 'term_rows': rows, \ 'term_cols': cols, - \ 'env': {'GCOV_PREFIX': 'nested', 'GCOV_PREFIX_STRIP': 99}, \ }) if &termwinsize == '' " in the GUI we may end up with a different size, try to set it.