comparison 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
comparison
equal deleted inserted replaced
12601:f6be693907fa 12602:9359ed49d375
124 @/bin/sh -c "if test -f messages && grep -q 'SKIPPED\|FAILED' messages; then cat messages && if test -f test.log; then cat test.log; fi ; fi" 124 @/bin/sh -c "if test -f messages && grep -q 'SKIPPED\|FAILED' messages; then cat messages && if test -f test.log; then cat test.log; fi ; fi"
125 125
126 newtestssilent: $(NEW_TESTS) 126 newtestssilent: $(NEW_TESTS)
127 127
128 128
129 .vim.res: 129 .vim.res: writevimcmd
130 @echo "$(RUN_VIMTEST)" > vimcmd 130 @echo "$(VIMPROG)" > vimcmd
131 @echo "$(RUN_VIMTEST)" >> vimcmd
131 $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim $*.vim 132 $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim $*.vim
132 @rm vimcmd 133 @rm vimcmd
133 134
134 test_gui.res: test_gui.vim 135 test_gui.res: test_gui.vim
135 @echo "$(RUN_GVIMTEST)" > vimcmd 136 @echo "$(VIMPROG)" > vimcmd
137 @echo "$(RUN_GVIMTEST)" >> vimcmd
136 $(RUN_VIMTEST) -u NONE $(NO_INITS) -S runtest.vim $< 138 $(RUN_VIMTEST) -u NONE $(NO_INITS) -S runtest.vim $<
137 @rm vimcmd 139 @rm vimcmd
138 140
139 test_gui_init.res: test_gui_init.vim 141 test_gui_init.res: test_gui_init.vim
140 @echo "$(RUN_GVIMTEST_WITH_GVIMRC)" > vimcmd 142 @echo "$(VIMPROG)" > vimcmd
143 @echo "$(RUN_GVIMTEST_WITH_GVIMRC)" >> vimcmd
141 $(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< 144 $(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
142 @rm vimcmd 145 @rm vimcmd
143 146
144 opt_test.vim: ../option.c gen_opt_test.vim 147 opt_test.vim: ../option.c gen_opt_test.vim
145 $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c 148 $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c