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.

diff --git a/.travis.yml b/.travis.yml
index 240de516e7fe66b764214a99c051922690d48610..d683b13ef3bca8d26a08bf39d83763b1c4a09757 100644 (file)
--- 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 1630dfa0c570790e0fd47ffac8a15bf9d10f971d..9687dc806e2a4c78247d14ed45a9d05dcd308389 100644 (file)
--- 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 99ffbc3bb5bb98b382cb86cf4457a95af8997c48..367b170a16f2db0a78ff8c364c44b1fd6194fac2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1169,
 /**/
     1168,
 /**/