adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.1.2203: running libvterm tests without the +terminal feature

Browse Source 
Problem:    Running libvterm tests without the +terminal feature.
Solution:   Only add the libvterm test target when building libvterm.
This commit is contained in:
Bram Moolenaar
2019-10-23 22:35:36 +02:00
parent 93bbf33ceb
commit 823edd1eed
5 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -2193,7 +2193,7 @@ types.vim: $(TAGS_FILES)
# #
# Execute the test scripts and the unittests. # Execute the test scripts and the unittests.
# Do the scripttests first, so that the summary shows last. # Do the scripttests first, so that the summary shows last.
test check: unittests test_libvterm scripttests test check: unittests $(TERM_TEST) scripttests
# Execute the test scripts. Run these after compiling Vim, before installing. # Execute the test scripts. Run these after compiling Vim, before installing.
# This doesn't depend on $(VIMTARGET), because that won't work when configure # This doesn't depend on $(VIMTARGET), because that won't work when configure

3
src/auto/configure vendored
View File

@ -656,6 +656,7 @@ X_PRE_LIBS
X_CFLAGS X_CFLAGS
XMKMF XMKMF
xmkmfpath xmkmfpath
TERM_TEST
TERM_OBJ TERM_OBJ
TERM_SRC TERM_SRC
CHANNEL_OBJ CHANNEL_OBJ
@ -7911,6 +7912,8 @@ if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then
TERM_OBJ="objects/vterm_encoding.o objects/vterm_keyboard.o objects/vterm_mouse.o objects/vterm_parser.o objects/vterm_pen.o objects/vterm_screen.o objects/vterm_state.o objects/vterm_unicode.o objects/vterm_vterm.o" TERM_OBJ="objects/vterm_encoding.o objects/vterm_keyboard.o objects/vterm_mouse.o objects/vterm_parser.o objects/vterm_pen.o objects/vterm_screen.o objects/vterm_state.o objects/vterm_unicode.o objects/vterm_vterm.o"
TERM_TEST="test_libvterm"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-autoservername argument" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-autoservername argument" >&5

1
src/config.mk.in
View File

@ -87,6 +87,7 @@ CHANNEL_SRC = @CHANNEL_SRC@
CHANNEL_OBJ = @CHANNEL_OBJ@ CHANNEL_OBJ = @CHANNEL_OBJ@
TERM_SRC = @TERM_SRC@ TERM_SRC = @TERM_SRC@
TERM_OBJ = @TERM_OBJ@ TERM_OBJ = @TERM_OBJ@
TERM_TEST = @TERM_TEST@
RUBY = @vi_cv_path_ruby@ RUBY = @vi_cv_path_ruby@
RUBY_SRC = @RUBY_SRC@ RUBY_SRC = @RUBY_SRC@

2
src/configure.ac
View File

@ -2108,6 +2108,8 @@ if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then
AC_SUBST(TERM_SRC) AC_SUBST(TERM_SRC)
TERM_OBJ="objects/vterm_encoding.o objects/vterm_keyboard.o objects/vterm_mouse.o objects/vterm_parser.o objects/vterm_pen.o objects/vterm_screen.o objects/vterm_state.o objects/vterm_unicode.o objects/vterm_vterm.o" TERM_OBJ="objects/vterm_encoding.o objects/vterm_keyboard.o objects/vterm_mouse.o objects/vterm_parser.o objects/vterm_pen.o objects/vterm_screen.o objects/vterm_state.o objects/vterm_unicode.o objects/vterm_vterm.o"
AC_SUBST(TERM_OBJ) AC_SUBST(TERM_OBJ)
TERM_TEST="test_libvterm"
AC_SUBST(TERM_TEST)
fi fi
AC_MSG_CHECKING(--enable-autoservername argument) AC_MSG_CHECKING(--enable-autoservername argument)

2
src/version.c
View File

@ -741,6 +741,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 */
/**/
2203,
/**/ /**/
2202, 2202,
/**/ /**/