Skip to content

Commit d5b952a

Browse files
k-takatabrammool
authored andcommitted
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 vim#12535) Adjust the paths.
1 parent 46acad7 commit d5b952a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ VIM_FOR_SYNTAXTEST = ../../src/vim
6666
syntaxtest:
6767
cd runtime/syntax && \
6868
$(MAKE) clean && \
69-
$(MAKE) test VIM="$(VIM_FOR_SYNTAXTEST)"
69+
$(MAKE) test VIMPROG="$(VIM_FOR_SYNTAXTEST)"
7070

7171

7272
#########################################################################

runtime/syntax/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ VIMRUNTIME = ../..
1111

1212
# ENVVARS = LC_ALL=C LANG=C LANGUAGE=C
1313

14-
RUN_VIMTEST = VIMRUNTIME=$(VIMRUNTIME) $(VALGRIND) $(ENVVARS) $(VIMPROG) -f $(GUI_FLAG)
14+
RUN_VIMTEST = VIMRUNTIME=$(VIMRUNTIME) $(VALGRIND) $(ENVVARS) ../$(VIMPROG) -f $(GUI_FLAG)
1515

1616
# Run the tests that didn't run yet or failed previously.
1717
# If a test succeeds a testdir/done/{name} file will be written.
1818
# If a test fails a testdir/failed/{name}.dump file will be written.
1919
test:
2020
@# the "vimcmd" file is used by the screendump utils
21-
@echo "$(VIMPROG)" > testdir/vimcmd
21+
@echo "../$(VIMPROG)" > testdir/vimcmd
2222
@echo "$(RUN_VIMTEST)" >> testdir/vimcmd
2323
VIMRUNTIME=$(VIMRUNTIME) $(VIMPROG) --clean --not-a-term -u testdir/runtest.vim
2424

src/version.c

+2
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1628,
698700
/**/
699701
1627,
700702
/**/

0 commit comments

Comments
 (0)