diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-18 22:14:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-18 22:14:43 +0200 |
| commit | cd67059c0c3abf1e28aa66458abdf6f338252eb2 (patch) | |
| tree | 638b3405cc9de2eec8cf653c95abf314788640c2 | |
| parent | 181d4f58cc421f2e6d3b16333d4cb70d35ad1342 (diff) | |
| download | vim-git-cd67059c0c3abf1e28aa66458abdf6f338252eb2.tar.gz | |
patch 8.1.2056: "make test" for indent files doesn't cause make to failv8.1.2056
Problem: "make test" for indent files doesn't cause make to fail.
Solution: Exit the script with ":cquit". (Daniel Hahler, closes #4949)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | runtime/indent/testdir/runtest.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 230401f8a..0fd5ba047 100644 --- a/.gitignore +++ b/.gitignore @@ -77,6 +77,7 @@ src/testdir/messages src/testdir/viminfo src/testdir/opt_test.vim runtime/indent/testdir/*.out +runtime/indent/testdir/*.fail src/memfile_test src/json_test src/message_test diff --git a/runtime/indent/testdir/runtest.vim b/runtime/indent/testdir/runtest.vim index 0f0051415..9502c42f3 100644 --- a/runtime/indent/testdir/runtest.vim +++ b/runtime/indent/testdir/runtest.vim @@ -20,6 +20,7 @@ func HandleSwapExists() endif endfunc +let failed_count = 0 for fname in glob('testdir/*.in', 1, 1) let root = substitute(fname, '\.in', '', '') @@ -110,6 +111,7 @@ for fname in glob('testdir/*.in', 1, 1) endif if failed + let failed_count += 1 exe 'write ' . root . '.fail' echoerr 'Test ' . fname . ' FAILED!' else @@ -123,4 +125,8 @@ endfor " Matching "if 1" at the start. endif +if failed_count > 0 + " have make report an error + cquit +endif qall! diff --git a/src/version.c b/src/version.c index 1c7ece3c8..50c1c4cd9 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2056, +/**/ 2055, /**/ 2054, |