# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1555188305 -7200
# Node ID b576f2e069b73d828c14803284741b25d577c082
# Parent  750f687ca105c92d3fcdd7450a10f97fb74d8862
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.

diff --git a/.travis.yml b/.travis.yml
--- 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
--- 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
--- 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,