comparison src/testdir/Make_dos.mak @ 7395:377253525da5 v7.4.1002

commit https://github.com/vim/vim/commit/604619784c7f9007a883c123231d080598bd49f5 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Dec 30 17:17:10 2015 +0100 patch 7.4.1002 Problem: Cannot run an individual test on MS-Windows. Solution: Move the rule to run test1 downwards. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Wed, 30 Dec 2015 17:30:04 +0100
parents a6c23c3c5880
children e81526d6709f
comparison
equal deleted inserted replaced
7394:81304fd09fec 7395:377253525da5
24 DOSTMP = dostmp 24 DOSTMP = dostmp
25 DOSTMP_OUTFILES = $(TEST_OUTFILES:test=dostmp\test) 25 DOSTMP_OUTFILES = $(TEST_OUTFILES:test=dostmp\test)
26 DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in) 26 DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in)
27 27
28 .SUFFIXES: .in .out .res .vim 28 .SUFFIXES: .in .out .res .vim
29
30 # Must run test1 first to create small.vim.
31 $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
32 29
33 nongui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) newtests report 30 nongui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) newtests report
34 31
35 small: nolog report 32 small: nolog report
36 33
64 @diff test.out $*.ok & if errorlevel 1 \ 61 @diff test.out $*.ok & if errorlevel 1 \
65 ( move /y test.out $*.failed \ 62 ( move /y test.out $*.failed \
66 & del $(DOSTMP)\$(*B).out \ 63 & del $(DOSTMP)\$(*B).out \
67 & echo $* FAILED >> test.log ) \ 64 & echo $* FAILED >> test.log ) \
68 else ( move /y test.out $*.out ) 65 else ( move /y test.out $*.out )
66
67 # Must run test1 first to create small.vim.
68 # This rule must come after the one that copies the input files to dostmp to
69 # allow for running an individual test.
70 $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
69 71
70 report: 72 report:
71 @echo "" 73 @echo ""
72 @echo Test results: 74 @echo Test results:
73 @if exist test.log ( type test.log & echo TEST FAILURE & exit /b 1 ) \ 75 @if exist test.log ( type test.log & echo TEST FAILURE & exit /b 1 ) \