patch 8.0.1253: still too many old style tests

Problem:    Still too many old style tests.
Solution:   Convert a few more tests to new style. (Yegappan Lakshmanan,
            closes #2272)

Author: brammool

src/Makefile

@@ -2103,13 +2103,13 @@ test1 \
 	test_listchars \
 	test_search_mbyte \
 	test_wordcount \
-	test3 test11 test12 test14 test15 test17 \
+	test3 test11 test14 test15 test17 \
 	test29 test30 test36 test37 test39 \
-	test40 test42 test44 test45 test48 test49 \
+	test42 test44 test48 test49 \
 	test50 test52 test55 test59 \
 	test64 test68 test69 \
-	test70 test72 test73 test77 \
-	test83 test85 test86 test87 test88 \
+	test70 test72 test73 \
+	test85 test86 test87 test88 \
 	test94 test95 test99 test108:
 	cd testdir; rm -f [email protected]; $(MAKE) -f Makefile [email protected] VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
 

src/testdir/Make_all.mak

@@ -20,10 +20,8 @@ SCRIPTS_ALL = \
 	test36.out \
 	test37.out \
 	test39.out \
-	test40.out \
 	test42.out \
 	test44.out \
-	test45.out \
 	test48.out \
 	test55.out \
 	test64.out \
@@ -58,7 +56,6 @@ SCRIPTS_MORE1 = \
 
 # Tests that run on most systems, but not on Amiga and DOS/Windows.
 SCRIPTS_MORE2 = \
-	test12.out \
 	test49.out
 
 
@@ -68,7 +65,6 @@ SCRIPTS_MORE4 = \
 	test30.out \
 	test59.out \
 	test72.out \
-	test83.out
 
 
 # Tests specifically for MS-Windows.
@@ -79,7 +75,7 @@ SCRIPTS_WIN32 = test50.out
 SCRIPTS_GUI =
 
 
-# Tests using runtest.vim.vim.
+# Tests using runtest.vim
 # Keep test_alot*.res as the last one, sort the others.
 NEW_TESTS = test_arabic.res \
 	    test_arglist.res \
@@ -164,6 +160,7 @@ NEW_TESTS = test_arabic.res \
 	    test_startup_utf8.res \
 	    test_stat.res \
 	    test_substitute.res \
+	    test_swap.res \
 	    test_syntax.res \
 	    test_system.res \
 	    test_tab.res \

src/testdir/Make_amiga.mak

@@ -13,7 +13,6 @@ include Make_all.mak
 # test2		"\\tmp" doesn't work
 # test10	'errorformat' is different
 # test11	"cat" doesn't work properly
-# test12	can't unlink a swap file
 # test52	only for Win32
 # test85	no Lua interface
 # test86, 87	no Python interface

src/testdir/Make_dos.mak

@@ -12,7 +12,6 @@ default: nongui
 # Omitted:
 # test2		"\\tmp" doesn't work.
 # test10	'errorformat' is different
-# test12	can't unlink a swap file
 # test49	fails in various ways
 # test97	\{ and \$ are not escaped characters.
 

src/testdir/Make_ming.mak

@@ -31,7 +31,6 @@ include Make_all.mak
 # Omitted:
 # test2		"\\tmp" doesn't work.
 # test10	'errorformat' is different
-# test12	can't unlink a swap file
 # test97	\{ and \$ are not escaped characters
 
 SCRIPTS = $(SCRIPTS_ALL) $(SCRIPTS_MORE1) $(SCRIPTS_MORE4) $(SCRIPTS_WIN32)

src/testdir/Make_vms.mms

@@ -75,13 +75,13 @@ VIMPROG = <->vim.exe
 
 SCRIPT = test1.out test3.out \
        test14.out test15.out \
-       test29.out test30.out \
-       test36.out test37.out test39.out \
-       test40.out test42.out test44.out test45.out \
-       test48.out test49.out test55.out \
+       test29.out \
+       test30.out test36.out test37.out test39.out \
+       test42.out test44.out test48.out test49.out \
+       test55.out \
        test64.out test68.out test69.out \
        test72.out test77a.out test88.out \
-       test94.out test95.out test99.out test108.out\
+       test94.out test95.out test99.out test108.out \
        test_autocmd_option.out \
        test_breakindent.out \
        test_changelist.out \
@@ -107,7 +107,6 @@ SCRIPT = test1.out test3.out \
 #
 # test72: bug - Vim hangs at :rename (while rename works well otherwise)
 # test78: bug - Vim dies at :recover Xtest 
-# test83: ?
 # test85: no Lua interface
 # test89: bug - findfile() does not work on VMS (just in the current directory) 
 # test102: Just ODS-5 supports space and special chars in the filename.
@@ -119,7 +118,7 @@ GUI_OPTION = -g
 .ENDIF
 
 .IFDEF WANT_UNIX
-SCRIPT_UNIX = test10.out test12.out test17.out test27.out test49.out test73.out
+SCRIPT_UNIX = test10.out test17.out test27.out test49.out test73.out
 .ENDIF
 
 .IFDEF WANT_WIN
@@ -146,10 +145,6 @@ SCRIPT_GZIP = test11.out
 SCRIPT_GDIFF = test47.out
 .ENDIF
 
-.IFDEF HAVE_ICONV
-SCRIPT_ICONV = test83.out
-.ENDIF
-
 .IFDEF HAVE_LUA
 SCRIPT_LUA = test85.out
 .ENDIF
@@ -179,7 +174,7 @@ SCRIPT_PYTHON = test86.out test87.out
 	-@ if "''F$SEARCH("Xtest.*")'"    .NES. "" then delete/noconfirm/nolog Xtest.*.*
 
 all : clean nolog $(START_WITH) $(SCRIPT) $(SCRIPT_GUI) $(SCRIPT_UNIX) $(SCRIPT_WIN) $(SCRIPT_SPELL) $(SCRIPT_ODS5) $(SCRIPT_GZIP) \
-    $(SCRIPT_GDIFF) $(SCRIPT_MZSCH) $(SCRIPT_ICONV) $(SCRIPT_LUA) $(SCRIPT_PYTHON) nolog 
+    $(SCRIPT_GDIFF) $(SCRIPT_MZSCH) $(SCRIPT_LUA) $(SCRIPT_PYTHON) nolog 
 	-@ write sys$output " "
 	-@ write sys$output "-----------------------------------------------"
 	-@ write sys$output "                All done"

src/testdir/main.aap

@@ -6,12 +6,12 @@ VimProg ?= ../vim
 
 Scripts = test1.out test2.out test3.out test6.out
 		test11.out
-		test12.out  test13.out test14.out test15.out test17.out
+		test13.out test14.out test15.out test17.out
 		test18.out test21.out
 		test27.out test29.out test30.out
 		test36.out test37.out
-		test39.out test40.out test42.out
-		test44.out test45.out test46.out test47.out
+		test39.out test42.out
+		test44.out test46.out test47.out
 		test48.out test49.out test74.out
 
 ScriptsGUI = test16.out