From 631820536e4084e01bf990f9314ec385b60b21d7 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 7 Oct 2017 20:03:23 +0200 Subject: patch 8.0.1179: Test_popup_and_window_resize() does not always pass Problem: Test_popup_and_window_resize() does not always pass. Solution: Do not use $VIMPROG, pass the Vim executable in the vimcmd file. (Ozaki Kiichi, closes #2186) --- src/testdir/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/testdir/Makefile') diff --git a/src/testdir/Makefile b/src/testdir/Makefile index ce1c24cd68..3a69c6c1ac 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -126,18 +126,21 @@ newtests: newtestssilent newtestssilent: $(NEW_TESTS) -.vim.res: - @echo "$(RUN_VIMTEST)" > vimcmd +.vim.res: writevimcmd + @echo "$(VIMPROG)" > vimcmd + @echo "$(RUN_VIMTEST)" >> vimcmd $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim $*.vim @rm vimcmd test_gui.res: test_gui.vim - @echo "$(RUN_GVIMTEST)" > vimcmd + @echo "$(VIMPROG)" > vimcmd + @echo "$(RUN_GVIMTEST)" >> vimcmd $(RUN_VIMTEST) -u NONE $(NO_INITS) -S runtest.vim $< @rm vimcmd test_gui_init.res: test_gui_init.vim - @echo "$(RUN_GVIMTEST_WITH_GVIMRC)" > vimcmd + @echo "$(VIMPROG)" > vimcmd + @echo "$(RUN_GVIMTEST_WITH_GVIMRC)" >> vimcmd $(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< @rm vimcmd -- cgit v1.2.3