1
0
forked from aniani/vim

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.
This commit is contained in:
Bram Moolenaar
2019-04-13 22:44:51 +02:00
parent 87dcfd75c2
commit 837854d1bc
3 changed files with 2 additions and 7 deletions

View File

@@ -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:

View File

@@ -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.

View File

@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1169,
/**/
1168,
/**/