From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 23 Oct 2019 20:35:36 +0000 (+0200)
Subject: patch 8.1.2203: running libvterm tests without the +terminal feature
X-Git-Tag: v8.1.2203
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=823edd1eed00329e4b269991155bbdb1d9aaa540;p=vim

patch 8.1.2203: running libvterm tests without the +terminal feature

Problem:    Running libvterm tests without the +terminal feature.
Solution:   Only add the libvterm test target when building libvterm.
---

diff --git a/src/Makefile b/src/Makefile
index c08446339..90390e033 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2193,7 +2193,7 @@ types.vim: $(TAGS_FILES)
 #
 # Execute the test scripts and the unittests.
 # 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.
 # This doesn't depend on $(VIMTARGET), because that won't work when configure
diff --git a/src/auto/configure b/src/auto/configure
index 1c00773f2..61b727250 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -656,6 +656,7 @@ X_PRE_LIBS
 X_CFLAGS
 XMKMF
 xmkmfpath
+TERM_TEST
 TERM_OBJ
 TERM_SRC
 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_TEST="test_libvterm"
+
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-autoservername argument" >&5
diff --git a/src/config.mk.in b/src/config.mk.in
index e20a10f8b..6aa842935 100644
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -87,6 +87,7 @@ CHANNEL_SRC	= @CHANNEL_SRC@
 CHANNEL_OBJ	= @CHANNEL_OBJ@
 TERM_SRC	= @TERM_SRC@
 TERM_OBJ	= @TERM_OBJ@
+TERM_TEST	= @TERM_TEST@
 
 RUBY		= @vi_cv_path_ruby@
 RUBY_SRC	= @RUBY_SRC@
diff --git a/src/configure.ac b/src/configure.ac
index 3ad223b39..b59914b62 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2108,6 +2108,8 @@ if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then
   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"
   AC_SUBST(TERM_OBJ)
+  TERM_TEST="test_libvterm"
+  AC_SUBST(TERM_TEST)
 fi
 
 AC_MSG_CHECKING(--enable-autoservername argument)
diff --git a/src/version.c b/src/version.c
index 7e627d2db..e1bc377f9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2203,
 /**/
     2202,
 /**/