patch 7.4.2113

Problem:    Test for undo is flaky.
Solution:   Turn it into a new style test.  Use test_settime() to avoid
            flakyness.

Author: brammool

src/Makefile

@@ -2044,7 +2044,7 @@ test1 \
 	test30 test31 test32 test33 test34 test36 test37 test38 test39 \
 	test40 test41 test42 test43 test44 test45 test46 test47 test48 test49 \
 	test50 test51 test52 test53 test54 test55 test56 test57 test58 test59 \
-	test60 test61 test62 test63 test64 test65 test66 test67 test68 test69 \
+	test60 test62 test63 test64 test65 test66 test67 test68 test69 \
 	test70 test71 test72 test73 test74 test75 test76 test77 test78 test79 \
 	test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \
 	test90 test91 test92 test93 test94 test95 test97 test98 test99 \
@@ -2119,9 +2119,9 @@ test_arglist \
 	test_textobjects \
 	test_timers \
 	test_true_false \
-	test_undolevels \
-	test_usercommands \
+	test_undo \
 	test_unlet \
+	test_usercommands \
 	test_viminfo \
 	test_viml \
 	test_visual \

src/testdir/Make_all.mak

@@ -51,7 +51,6 @@ SCRIPTS_ALL = \
 	test56.out \
 	test57.out \
 	test60.out \
-	test61.out \
 	test62.out \
 	test63.out \
 	test64.out \
@@ -188,6 +187,7 @@ NEW_TESTS = test_arglist.res \
 	    test_stat.res \
 	    test_syntax.res \
 	    test_textobjects.res \
+	    test_undo.res \
 	    test_usercommands.res \
 	    test_viminfo.res \
 	    test_viml.res \

src/testdir/test61.in

@@ -36,6 +36,5 @@ source test_tabline.vim
 source test_tagjump.vim
 source test_timers.vim
 source test_true_false.vim
-source test_undolevels.vim
 source test_unlet.vim
 source test_window_cmd.vim