diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-06 18:00:12 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-06 18:00:12 +0100 |
| commit | 29891c4ed4a7d08af1ba1628933a387adf5c1555 (patch) | |
| tree | 4db04e5d4a8e65e020dacd1199d8cb469d8801eb | |
| parent | aaeabfbca571e24a29925dacf104e21dc251a771 (diff) | |
patch 8.0.0145: running tests on MS-Windows is noisyv8.0.0145
Problem: Running tests on MS-Windows is a little bit noisy.
Solution: Redirect some output to "nul". (Ken Takata)
| -rw-r--r-- | src/testdir/Make_dos.mak | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index b6aaa6e68f..c28b1a4b1b 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -44,12 +44,12 @@ $(DOSTMP_INFILES): $(*B).in # This moves test99.in to test99.in.bak temporarily. $(TEST_OUTFILES): $(DOSTMP)\$(*B).in -@if exist test.out DEL test.out - move $(*B).in $(*B).in.bak - copy $(DOSTMP)\$(*B).in $(*B).in - copy $(*B).ok test.ok + move $(*B).in $(*B).in.bak > nul + copy $(DOSTMP)\$(*B).in $(*B).in > nul + copy $(*B).ok test.ok > nul $(VIMPROG) -u dos.vim $(NO_PLUGIN) -s dotest.in $(*B).in - -@if exist test.out MOVE /y test.out $(DOSTMP)\$(*B).out - -@if exist $(*B).in.bak move /y $(*B).in.bak $(*B).in + -@if exist test.out MOVE /y test.out $(DOSTMP)\$(*B).out > nul + -@if exist $(*B).in.bak move /y $(*B).in.bak $(*B).in > nul -@if exist test.ok del test.ok -@if exist Xdir1 rd /s /q Xdir1 -@if exist Xfind rd /s /q Xfind @@ -58,10 +58,10 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in $(VIMPROG) -u dos.vim $(NO_PLUGIN) "+set ff=unix|f test.out|wq" \ $(DOSTMP)\$(*B).out @diff test.out $*.ok & if errorlevel 1 \ - ( move /y test.out $*.failed \ + ( move /y test.out $*.failed > nul \ & del $(DOSTMP)\$(*B).out \ & echo $* FAILED >> test.log ) \ - else ( move /y test.out $*.out ) + else ( move /y test.out $*.out > nul ) # Must run test1 first to create small.vim. # This rule must come after the one that copies the input files to dostmp to diff --git a/src/version.c b/src/version.c index 78717e14a6..c3c33dc72f 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 145, +/**/ 144, /**/ 143, |