summaryrefslogtreecommitdiffstats
path: root/src/testdir/Make_dos.mak
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-25 21:21:52 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-25 21:21:52 +0100
commit49c39ff678e2ba9f7dc280b25368e12084a610cf (patch)
tree77c3d7db0cfdb0c23fac78b8fcd168eff947b94a /src/testdir/Make_dos.mak
parent923d926d57d985ec8965da9d0cd3634e6b24bfe1 (diff)
patch 7.4.1419v7.4.1419
Problem: Tests slowed down because of the "not a terminal" warning. Solution: Add the --not-a-term command line argument.
Diffstat (limited to 'src/testdir/Make_dos.mak')
-rw-r--r--src/testdir/Make_dos.mak8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 3073e9eb5c..bfd624c512 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -38,7 +38,7 @@ win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests report
$(DOSTMP_INFILES): $(*B).in
if not exist $(DOSTMP)\NUL md $(DOSTMP)
if exist $@ del $@
- $(VIMPROG) -u dos.vim -U NONE --noplugin "+set ff=dos|f $@|wq" $(*B).in
+ $(VIMPROG) -u dos.vim $(NO_PLUGIN) "+set ff=dos|f $@|wq" $(*B).in
# For each input file dostmp/test99.in run the tests.
# This moves test99.in to test99.in.bak temporarily.
@@ -47,7 +47,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
move $(*B).in $(*B).in.bak
copy $(DOSTMP)\$(*B).in $(*B).in
copy $(*B).ok test.ok
- $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $(*B).in
+ $(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.ok del test.ok
@@ -55,7 +55,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
-@if exist Xfind rd /s /q Xfind
-@del X*
-@if exist viminfo del viminfo
- $(VIMPROG) -u dos.vim -U NONE --noplugin "+set ff=unix|f test.out|wq" \
+ $(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 \
@@ -104,7 +104,7 @@ benchmark:
bench_re_freeze.out: bench_re_freeze.vim
-if exist benchmark.out del benchmark.out
- $(VIMPROG) -u dos.vim -U NONE --noplugin $*.in
+ $(VIMPROG) -u dos.vim $(NO_PLUGIN) $*.in
@IF EXIST benchmark.out ( type benchmark.out )
# New style of tests uses Vim script with assert calls. These are easier