mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 9.0.1628: syntax tests fail on FreeBSD
Problem: Syntax tests fail on FreeBSD. Solution: Pass the Vim executable path with VIMPROG. (Ken Takata, closes #12535) Adjust the paths.
This commit is contained in:
2
Makefile
2
Makefile
@@ -66,7 +66,7 @@ VIM_FOR_SYNTAXTEST = ../../src/vim
|
|||||||
syntaxtest:
|
syntaxtest:
|
||||||
cd runtime/syntax && \
|
cd runtime/syntax && \
|
||||||
$(MAKE) clean && \
|
$(MAKE) clean && \
|
||||||
$(MAKE) test VIM="$(VIM_FOR_SYNTAXTEST)"
|
$(MAKE) test VIMPROG="$(VIM_FOR_SYNTAXTEST)"
|
||||||
|
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
@@ -11,14 +11,14 @@ VIMRUNTIME = ../..
|
|||||||
|
|
||||||
# ENVVARS = LC_ALL=C LANG=C LANGUAGE=C
|
# ENVVARS = LC_ALL=C LANG=C LANGUAGE=C
|
||||||
|
|
||||||
RUN_VIMTEST = VIMRUNTIME=$(VIMRUNTIME) $(VALGRIND) $(ENVVARS) $(VIMPROG) -f $(GUI_FLAG)
|
RUN_VIMTEST = VIMRUNTIME=$(VIMRUNTIME) $(VALGRIND) $(ENVVARS) ../$(VIMPROG) -f $(GUI_FLAG)
|
||||||
|
|
||||||
# Run the tests that didn't run yet or failed previously.
|
# Run the tests that didn't run yet or failed previously.
|
||||||
# If a test succeeds a testdir/done/{name} file will be written.
|
# If a test succeeds a testdir/done/{name} file will be written.
|
||||||
# If a test fails a testdir/failed/{name}.dump file will be written.
|
# If a test fails a testdir/failed/{name}.dump file will be written.
|
||||||
test:
|
test:
|
||||||
@# the "vimcmd" file is used by the screendump utils
|
@# the "vimcmd" file is used by the screendump utils
|
||||||
@echo "$(VIMPROG)" > testdir/vimcmd
|
@echo "../$(VIMPROG)" > testdir/vimcmd
|
||||||
@echo "$(RUN_VIMTEST)" >> testdir/vimcmd
|
@echo "$(RUN_VIMTEST)" >> testdir/vimcmd
|
||||||
VIMRUNTIME=$(VIMRUNTIME) $(VIMPROG) --clean --not-a-term -u testdir/runtest.vim
|
VIMRUNTIME=$(VIMRUNTIME) $(VIMPROG) --clean --not-a-term -u testdir/runtest.vim
|
||||||
|
|
||||||
|
@@ -695,6 +695,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1628,
|
||||||
/**/
|
/**/
|
||||||
1627,
|
1627,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user