diff src/testdir/Makefile @ 12602:9359ed49d375 v8.0.1179

patch 8.0.1179: Test_popup_and_window_resize() does not always pass commit https://github.com/vim/vim/commit/631820536e4084e01bf990f9314ec385b60b21d7 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 7 20:03:23 2017 +0200 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)
author Christian Brabandt <cb@256bit.org>
date Sat, 07 Oct 2017 20:15:04 +0200
parents d8a550329a97
children 15f0f9f16cd9
line wrap: on
line diff
--- 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