summaryrefslogtreecommitdiff
path: root/src/testdir/Makefile
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-14 15:46:32 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-14 15:46:32 +0200
commitd9b0d83b13d2691e4544709abd87eac004715175 (patch)
tree6e5c779b4f4f12be9b8e0b366c2a7f16ed5dec24 /src/testdir/Makefile
parent57da69816872d53038e8a7e8dd4dc39a31192f0d (diff)
downloadvim-git-d9b0d83b13d2691e4544709abd87eac004715175.tar.gz
patch 8.1.2028: options test script does not workv8.1.2028
Problem: Options test script does not work. Solution: Use optiondefs.h for input.
Diffstat (limited to 'src/testdir/Makefile')
-rw-r--r--src/testdir/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 0efebb5a3..bcf2f8c37 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -83,6 +83,8 @@ RM_ON_RUN = test.out X* viminfo
RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim test.ok benchmark.out
RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in
+# Delete files that may interfere with running tests. This includes some files
+# that may result from working on the tests, not only from running them.
clean:
-rm -rf *.out *.failed *.res *.rej *.orig XfakeHOME Xdir1 Xfind
-rm -f opt_test.vim test.log test_result.log messages
@@ -176,8 +178,8 @@ test_gui_init.res: test_gui_init.vim
$(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
@rm vimcmd
-opt_test.vim: ../option.c gen_opt_test.vim
- $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c
+opt_test.vim: ../optiondefs.h gen_opt_test.vim
+ $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h
test_xxd.res:
XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim