diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-26 22:29:57 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-26 22:29:57 +0200 |
| commit | 6e3aeec8461cf27396b6574b5438019a00684e00 (patch) | |
| tree | ec3fb8843aeea30de214310d914c424ac6ddfc76 | |
| parent | 2e0866128b6266829a7f38733d5188bc4ec68745 (diff) | |
| download | vim-git-6e3aeec8461cf27396b6574b5438019a00684e00.tar.gz | |
patch 8.2.1525: messages from tests were not always displayedv8.2.1525
Problem: Messages from tests were not always displayed.
Solution: Always show messages, the timing is always useful. (Ken Takata,
closes #6792)
| -rw-r--r-- | src/testdir/Make_dos.mak | 2 | ||||
| -rw-r--r-- | src/testdir/Make_ming.mak | 2 | ||||
| -rw-r--r-- | src/testdir/Makefile | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index ba728df9e..89563848e 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -117,7 +117,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in # Limitation: Only works with the +eval feature. newtests: newtestssilent - @if exist messages (findstr "SKIPPED FAILED" messages > nul) && type messages + @if exist messages type messages newtestssilent: $(NEW_TESTS_RES) diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak index 00c9e1087..f9dcfc86e 100644 --- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -129,7 +129,7 @@ $(DOSTMP)/%.in : %.in # Limitation: Only works with the +eval feature. newtests: newtestssilent - @if exist messages (findstr "SKIPPED FAILED" messages > nul) && type messages + @if exist messages type messages newtestssilent: $(NEW_TESTS_RES) diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 7033d1e46..6431f6a6b 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -12,7 +12,7 @@ SCRIPTSOURCE = ../../runtime # Comment out this line to see the verbose output of tests. # # Catches SwapExists to avoid hanging at the ATTENTION prompt. -REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' > /dev/null +#REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' > /dev/null # Uncomment this line to use valgrind for memory leaks and extra warnings. # The output goes into a file "valgrind.testN" @@ -126,7 +126,7 @@ tinytests: $(SCRIPTS_TINY_OUT) RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim newtests: newtestssilent - @/bin/sh -c "if test -f messages && grep -q 'SKIPPED\|FAILED' messages; then cat messages; fi" + @/bin/sh -c "if test -f messages; then cat messages; fi" newtestssilent: $(NEW_TESTS_RES) diff --git a/src/version.c b/src/version.c index 70fe7df1f..71851c849 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1525, +/**/ 1524, /**/ 1523, |