summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-07 22:40:25 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-07 22:40:25 +0200
commit4e0bf846279f3efa6299a98143033db1fdfa143a (patch)
tree7db8b18b9e1c177e1ac37b0b008c9c728af6bf0c
parent64416127fc184b5544530afe818722679158f059 (diff)
patch 8.1.1490: when a single test fails the exit code is not setv8.1.1490
Problem: When a single test fails the exit code is not set. (Daniel Hahler) Solution: Add an exit command. (closes #4506)
-rw-r--r--src/testdir/Makefile4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index f28c9414f7..bf64a03837 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -74,10 +74,10 @@ $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS_RES): $(SCRIPTS_FIRST)
$(NEW_TESTS):
rm -f $@.res test.log messages
$(MAKE) -f Makefile $@.res
+ cat messages
@if test -f test.log; then \
- cat test.log; \
+ exit 1; \
fi
- cat messages
RM_ON_RUN = test.out X* viminfo
RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim test.ok benchmark.out
diff --git a/src/version.c b/src/version.c
index f63c5f37fa..75ebdc1edc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1490,
+/**/
1489,
/**/
1488,