comparison src/testdir/Make_dos.mak @ 10510:dfbe8f74806d v8.0.0145

commit https://github.com/vim/vim/commit/29891c4ed4a7d08af1ba1628933a387adf5c1555 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 6 18:00:12 2017 +0100 patch 8.0.0145: running tests on MS-Windows is noisy Problem: Running tests on MS-Windows is a little bit noisy. Solution: Redirect some output to "nul". (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Fri, 06 Jan 2017 18:15:04 +0100
parents 3089f1d99b9e
children 4e2cdce4576c
comparison
equal deleted inserted replaced
10509:9897e7a5c648 10510:dfbe8f74806d
42 42
43 # For each input file dostmp/test99.in run the tests. 43 # For each input file dostmp/test99.in run the tests.
44 # This moves test99.in to test99.in.bak temporarily. 44 # This moves test99.in to test99.in.bak temporarily.
45 $(TEST_OUTFILES): $(DOSTMP)\$(*B).in 45 $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
46 -@if exist test.out DEL test.out 46 -@if exist test.out DEL test.out
47 move $(*B).in $(*B).in.bak 47 move $(*B).in $(*B).in.bak > nul
48 copy $(DOSTMP)\$(*B).in $(*B).in 48 copy $(DOSTMP)\$(*B).in $(*B).in > nul
49 copy $(*B).ok test.ok 49 copy $(*B).ok test.ok > nul
50 $(VIMPROG) -u dos.vim $(NO_PLUGIN) -s dotest.in $(*B).in 50 $(VIMPROG) -u dos.vim $(NO_PLUGIN) -s dotest.in $(*B).in
51 -@if exist test.out MOVE /y test.out $(DOSTMP)\$(*B).out 51 -@if exist test.out MOVE /y test.out $(DOSTMP)\$(*B).out > nul
52 -@if exist $(*B).in.bak move /y $(*B).in.bak $(*B).in 52 -@if exist $(*B).in.bak move /y $(*B).in.bak $(*B).in > nul
53 -@if exist test.ok del test.ok 53 -@if exist test.ok del test.ok
54 -@if exist Xdir1 rd /s /q Xdir1 54 -@if exist Xdir1 rd /s /q Xdir1
55 -@if exist Xfind rd /s /q Xfind 55 -@if exist Xfind rd /s /q Xfind
56 -@del X* 56 -@del X*
57 -@if exist viminfo del viminfo 57 -@if exist viminfo del viminfo
58 $(VIMPROG) -u dos.vim $(NO_PLUGIN) "+set ff=unix|f test.out|wq" \ 58 $(VIMPROG) -u dos.vim $(NO_PLUGIN) "+set ff=unix|f test.out|wq" \
59 $(DOSTMP)\$(*B).out 59 $(DOSTMP)\$(*B).out
60 @diff test.out $*.ok & if errorlevel 1 \ 60 @diff test.out $*.ok & if errorlevel 1 \
61 ( move /y test.out $*.failed \ 61 ( move /y test.out $*.failed > nul \
62 & del $(DOSTMP)\$(*B).out \ 62 & del $(DOSTMP)\$(*B).out \
63 & echo $* FAILED >> test.log ) \ 63 & echo $* FAILED >> test.log ) \
64 else ( move /y test.out $*.out ) 64 else ( move /y test.out $*.out > nul )
65 65
66 # Must run test1 first to create small.vim. 66 # Must run test1 first to create small.vim.
67 # This rule must come after the one that copies the input files to dostmp to 67 # This rule must come after the one that copies the input files to dostmp to
68 # allow for running an individual test. 68 # allow for running an individual test.
69 $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST) 69 $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)