Mercurial > vim
comparison src/Make_mvc.mak @ 18404:b1a10a018f83 v8.1.2196
patch 8.1.2196: MS-Windows: running tests with MSVC lacks updates
Commit: https://github.com/vim/vim/commit/d53ebfc6246b2f29752adbda13cd2c11acca285a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Oct 20 21:47:20 2019 +0200
patch 8.1.2196: MS-Windows: running tests with MSVC lacks updates
Problem: MS-Windows: running tests with MSVC lacks updates.
Solution: Improve running individual tests on MS-Windows. (closes https://github.com/vim/vim/issues/4922)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 20 Oct 2019 22:00:03 +0200 |
parents | b506809f5d38 |
children | 652ac5edf8d0 |
comparison
equal
deleted
inserted
replaced
18403:991d8bbaba1a | 18404:b1a10a018f83 |
---|---|
1277 MAIN_TARGET = $(GVIM).exe $(VIM).exe $(VIMDLLBASE).dll | 1277 MAIN_TARGET = $(GVIM).exe $(VIM).exe $(VIMDLLBASE).dll |
1278 !else | 1278 !else |
1279 MAIN_TARGET = $(VIM).exe | 1279 MAIN_TARGET = $(VIM).exe |
1280 !endif | 1280 !endif |
1281 | 1281 |
1282 # Target to run individual tests. | |
1283 VIMTESTTARGET = $(VIM).exe | |
1284 | |
1285 OLD_TEST_OUTFILES = \ | |
1286 $(SCRIPTS_FIRST) \ | |
1287 $(SCRIPTS_ALL) \ | |
1288 $(SCRIPTS_MORE1) \ | |
1289 $(SCRIPTS_MORE4) \ | |
1290 $(SCRIPTS_WIN32) \ | |
1291 $(SCRIPTS_GUI) | |
1292 | |
1282 all: $(MAIN_TARGET) \ | 1293 all: $(MAIN_TARGET) \ |
1283 vimrun.exe \ | 1294 vimrun.exe \ |
1284 install.exe \ | 1295 install.exe \ |
1285 uninstall.exe \ | 1296 uninstall.exe \ |
1286 xxd/xxd.exe \ | 1297 xxd/xxd.exe \ |
1368 $(CTAGS) $(TAGS_FILES) | 1379 $(CTAGS) $(TAGS_FILES) |
1369 | 1380 |
1370 notags: | 1381 notags: |
1371 - if exist tags del tags | 1382 - if exist tags del tags |
1372 | 1383 |
1373 clean: | 1384 clean: testclean |
1374 - if exist $(OUTDIR)/nul $(DEL_TREE) $(OUTDIR) | 1385 - if exist $(OUTDIR)/nul $(DEL_TREE) $(OUTDIR) |
1375 - if exist *.obj del *.obj | 1386 - if exist *.obj del *.obj |
1376 - if exist $(VIM).exe del $(VIM).exe | 1387 - if exist $(VIM).exe del $(VIM).exe |
1377 - if exist $(VIM).ilk del $(VIM).ilk | 1388 - if exist $(VIM).ilk del $(VIM).ilk |
1378 - if exist $(VIM).pdb del $(VIM).pdb | 1389 - if exist $(VIM).pdb del $(VIM).pdb |
1403 $(MAKE) /NOLOGO -f Make_mvc.mak clean | 1414 $(MAKE) /NOLOGO -f Make_mvc.mak clean |
1404 cd .. | 1415 cd .. |
1405 cd GvimExt | 1416 cd GvimExt |
1406 $(MAKE) /NOLOGO -f Makefile clean | 1417 $(MAKE) /NOLOGO -f Makefile clean |
1407 cd .. | 1418 cd .. |
1408 - if exist testdir\*.out del testdir\*.out | |
1409 | 1419 |
1410 test: | 1420 test: |
1411 cd testdir | 1421 cd testdir |
1412 $(MAKE) /NOLOGO -f Make_dos.mak win32 | 1422 $(MAKE) /NOLOGO -f Make_dos.mak win32 |
1413 cd .. | 1423 cd .. |
1420 testclean: | 1430 testclean: |
1421 cd testdir | 1431 cd testdir |
1422 $(MAKE) /NOLOGO -f Make_dos.mak clean | 1432 $(MAKE) /NOLOGO -f Make_dos.mak clean |
1423 cd .. | 1433 cd .. |
1424 | 1434 |
1435 # Run individual OLD style test. | |
1436 # These do not depend on the executable, compile it when needed. | |
1437 $(OLD_TEST_OUTFILES:.out=): | |
1438 cd testdir | |
1439 - if exist $@.out del $@.out | |
1440 $(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) nolog | |
1441 $(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) $@.out | |
1442 @ if exist test.log ( type test.log & exit /b 1 ) | |
1443 cd .. | |
1444 | |
1445 # Run individual NEW style test. | |
1446 # These do not depend on the executable, compile it when needed. | |
1425 $(NEW_TESTS): | 1447 $(NEW_TESTS): |
1426 cd testdir | 1448 cd testdir |
1427 - if exist $@.res del $@.res | 1449 - if exist $@.res del $@.res |
1428 $(MAKE) /NOLOGO -f Make_dos.mak nolog | 1450 $(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) nolog |
1429 $(MAKE) /NOLOGO -f Make_dos.mak $@.res | 1451 $(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) $@.res |
1430 $(MAKE) /NOLOGO -f Make_dos.mak report | 1452 $(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) report |
1431 type messages | |
1432 cd .. | 1453 cd .. |
1433 | 1454 |
1434 ########################################################################### | 1455 ########################################################################### |
1435 | 1456 |
1436 # Create a default rule for transforming .c files to .obj files in $(OUTDIR) | 1457 # Create a default rule for transforming .c files to .obj files in $(OUTDIR) |