summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-13 13:44:31 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-13 13:44:31 +0200
commit5d48e0d99aaeed9bc0b0d336fe9549149b1eb91d (patch)
tree3df77a95096f6b6570f54d89d3862899c5ba7b37
parentf587ef345e37ec5aa4b419e31780a1d951c9f702 (diff)
patch 8.1.1163: codecov does not report all the coverage informationv8.1.1163
Problem: Codecov does not report all the coverage information. Solution: Make a second run with the nested execution output, expect that Codecov will merge the results.
-rw-r--r--.travis.yml3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index d683b13ef3..240de516e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -170,6 +170,9 @@ 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/version.c b/src/version.c
index 88180a127f..94f13393e7 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 */
/**/
+ 1163,
+/**/
1162,
/**/
1161,