diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-28 21:35:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-28 21:35:14 +0100 |
| commit | da9888a3f0118ce1ce5acbdcf4720602c2de2a3b (patch) | |
| tree | c679abcfb9a689a2bd7816a8562d9cb2ff206f48 | |
| parent | f2f6d297966ec0e357640b71a238e51afcaba6cc (diff) | |
patch 7.4.986v7.4.986
Problem: Test49 doesn't work on MS-Windows. test70 is listed twice.
Solution: Move test49 to the group not used on Amiga and MS-Windows.
Remove test70 from SCRIPTS_WIN32.
| -rw-r--r-- | src/testdir/Make_all.mak | 4 | ||||
| -rw-r--r-- | src/testdir/Make_dos.mak | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index c88ed1c2f7..d0e277df8d 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -127,7 +127,6 @@ SCRIPTS_ALL = \ # Tests that run on most systems, but not on Amiga. SCRIPTS_MORE1 = \ test11.out \ - test49.out \ test52.out \ test85.out \ test86.out \ @@ -141,6 +140,7 @@ SCRIPTS_MORE2 = \ test12.out \ test25.out \ test27.out \ + test49.out \ test97.out @@ -163,7 +163,7 @@ SCRIPTS_MORE4 = \ # Tests specifically for MS-Windows. -SCRIPTS_WIN32 = test50.out test70.out +SCRIPTS_WIN32 = test50.out # Tests for the GUI. diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 6e92668c8b..b907fe7051 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -13,6 +13,7 @@ VIMPROG = ..\\vim # test12 can't unlink a swap file # test25 uses symbolic link # test27 can't edit file with "*" in file name +# test49 fails in various ways # test97 \{ and \$ are not escaped characters. SCRIPTS = $(SCRIPTS_ALL) $(SCRIPTS_MORE1) $(SCRIPTS_MORE3) $(SCRIPTS_MORE4) diff --git a/src/version.c b/src/version.c index d46aeae6a6..8412461771 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 986, +/**/ 985, /**/ 984, |