diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-13 22:44:51 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-13 22:44:51 +0200 |
| commit | 837854d1bc01d91ff463a2cfdf8aec9b89d5fbd1 (patch) | |
| tree | 1e4924dea6cbbdb30f618f1ac0c0a13dc1ef49d8 | |
| parent | 87dcfd75c218107ca966c80a0a56b236be046fc9 (diff) | |
| download | vim-git-837854d1bc01d91ff463a2cfdf8aec9b89d5fbd1.tar.gz | |
patch 8.1.1169: writing coverage info in a separate dir is not neededv8.1.1169
Problem: Writing coverage info in a separate dir is not needed.
Solution: Revert the changes to use a separate directory.
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | src/testdir/screendump.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 240de516e..d683b13ef 100644 --- 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: diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim index 1630dfa0c..9687dc806 100644 --- 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. diff --git a/src/version.c b/src/version.c index 99ffbc3bb..367b170a1 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1169, +/**/ 1168, /**/ 1167, |