patch 7.4.983
Problem: Executing one test after "make testclean" doesn't work.
Solution: Add a dependency on test1.out.
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 1318cfd..c88ed1c 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -2,9 +2,12 @@
# Common Makefile, defines the list of tests to run.
#
+# The first script creates small.vim.
+SCRIPTS_FIRST = \
+ test1.out
+
# Tests that run on all systems.
SCRIPTS_ALL = \
- test1.out \
test3.out \
test4.out \
test5.out \
diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index 8948382..edb390d 100644
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -20,9 +20,12 @@
SCRIPTS = $(SCRIPTS_ALL) $(SCRIPTS_MORE3) $(SCRIPTS_MORE4)
+# Must run test1 first to create small.vim.
+$(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(SCRIPTS_FIRST)
+
.SUFFIXES: .in .out
-nongui: /tmp $(SCRIPTS)
+nongui: /tmp $(SCRIPTS_FIRST) $(SCRIPTS)
csh -c echo ALL DONE
clean:
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 12ff9ba..6e92668 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -17,20 +17,23 @@
SCRIPTS = $(SCRIPTS_ALL) $(SCRIPTS_MORE1) $(SCRIPTS_MORE3) $(SCRIPTS_MORE4)
-TEST_OUTFILES = $(SCRIPTS) $(SCRIPTS_WIN32) $(SCRIPTS_GUI)
+TEST_OUTFILES = $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) $(SCRIPTS_GUI)
DOSTMP = dostmp
DOSTMP_OUTFILES = $(TEST_OUTFILES:test=dostmp\test)
DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in)
.SUFFIXES: .in .out
-nongui: nolog $(SCRIPTS) report
+# Must run test1 first to create small.vim.
+$(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
+
+nongui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) report
small: nolog report
-gui: nolog $(SCRIPTS) $(SCRIPTS_GUI) report
+gui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) report
-win32: nolog $(SCRIPTS) $(SCRIPTS_WIN32) report
+win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) report
# Copy the input files to dostmp, changing the fileformat to dos.
$(DOSTMP_INFILES): $(*B).in
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 393c60d..2237f57 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -39,12 +39,15 @@
SCRIPTS_BENCH = bench_re_freeze.out
+# Must run test1 first to create small.vim.
+$(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
+
.SUFFIXES: .in .out
-vimall: fixff $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32)
+vimall: fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32)
echo ALL DONE
-nongui: fixff $(SCRIPTS)
+nongui: fixff $(SCRIPTS_FIRST) $(SCRIPTS)
echo ALL DONE
benchmark: $(SCRIPTS_BENCH)
@@ -52,10 +55,10 @@
small:
echo ALL DONE
-gui: fixff $(SCRIPTS) $(SCRIPTS_GUI)
+gui: fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI)
echo ALL DONE
-win32: fixff $(SCRIPTS) $(SCRIPTS_WIN32)
+win32: fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32)
echo ALL DONE
fixff:
diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index 12fe8c0..fd25ab8 100644
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -28,10 +28,13 @@
.SUFFIXES: .in .out
-all: /tmp $(SCRIPTS)
+all: /tmp $(SCRIPTS_FIRST) $(SCRIPTS)
@echo ALL DONE
-$(SCRIPTS): $(VIMPROG)
+$(SCRIPTS_FIRST) $(SCRIPTS): $(VIMPROG)
+
+# Must run test1 first to create small.vim.
+$(SCRIPTS): $(SCRIPTS_FIRST)
benchmark: $(SCRIPTS_BENCH)
diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 8bcf257..415a13f 100644
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -170,7 +170,7 @@
-@ if "''F$SEARCH("Xdotest.*")'" .NES. "" then delete/noconfirm/nolog Xdotest.*.*
-@ 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) \
+all : clean nolog $(SCRIPTS_FIRST) $(SCRIPT) $(SCRIPT_GUI) $(SCRIPT_UNIX) $(SCRIPT_WIN) $(SCRIPT_SPELL) $(SCRIPT_ODS5) $(SCRIPT_GZIP) \
$(SCRIPT_GDIFF) $(SCRIPT_MZSCH) $(SCRIPT_CKSUM) $(SCRIPT_ICONV) $(SCRIPT_LUA) $(SCRIPT_PYTHON) nolog
-@ write sys$output " "
-@ write sys$output "-----------------------------------------------"
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index c8ff87b..ade9752 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -30,9 +30,9 @@
.SUFFIXES: .in .out .res .vim
-nongui: nolog $(SCRIPTS) newtests report
+nongui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) newtests report
-gui: nolog $(SCRIPTS) $(SCRIPTS_GUI) newtests report
+gui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests report
benchmark: $(SCRIPTS_BENCH)
@@ -44,7 +44,10 @@
else echo ALL DONE; \
fi"
-$(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(VIMPROG)
+$(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(VIMPROG)
+
+# Must run test1 first to create small.vim.
+$(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(SCRIPTS_FIRST)
RM_ON_RUN = test.out X* viminfo
RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok benchmark.out
diff --git a/src/version.c b/src/version.c
index 60a9b54..67f8d77 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 983,
+/**/
982,
/**/
981,
