diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-06 14:28:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-06 14:28:54 +0200 |
| commit | 18250e291a5b4b8e32229d99ccb7c895ff0ca637 (patch) | |
| tree | 27486f45355464d35f22506c6b930ecd30b1fb46 | |
| parent | c7500f9cb5b9fbedb9f1a385fdc3790335054bd3 (diff) | |
patch 8.1.1478: still an error when running tests with the tiny versionv8.1.1478
Problem: Still an error when running tests with the tiny version.
Solution: Do not try reading test.log
| -rw-r--r-- | src/testdir/Makefile | 5 | ||||
| -rw-r--r-- | src/testdir/summarize.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 0abf66137d..4bfc40096e 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -49,6 +49,11 @@ gui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests report benchmark: $(SCRIPTS_BENCH) report: + # without the +eval feature test_result.log is a copy of test.log + @/bin/sh -c "if test -f test.log; \ + then cp test.log test_result.log; \ + else echo No failures reported > test_result.log; \ + fi" $(RUN_VIMTEST) $(NO_INITS) -S summarize.vim messages $(REDIR_TEST_TO_NULL) @echo @echo 'Test results:' diff --git a/src/testdir/summarize.vim b/src/testdir/summarize.vim index 54cb5c1841..5baee63489 100644 --- a/src/testdir/summarize.vim +++ b/src/testdir/summarize.vim @@ -50,12 +50,7 @@ if 1 catch " Catch-all finally call writefile(output, 'test_result.log') " overwrites an existing file - q! endtry endif -" This is executed without the eval feature -%d -r test.log -w test_result.log q! diff --git a/src/version.c b/src/version.c index 1c8da448e7..648391162a 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 */ /**/ + 1478, +/**/ 1477, /**/ 1476, |