To: vim_dev@googlegroups.com
Subject: Patch 8.1.2203
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.1.2203
Problem:    Running libvterm tests without the +terminal feature.
Solution:   Only add the libvterm test target when building libvterm.
Files:	    src/configure.ac, src/auto/configure, src/config.mk.in,
            src/Makefile


*** ../vim-8.1.2202/src/configure.ac	2019-10-10 13:22:36.963636175 +0200
--- src/configure.ac	2019-10-23 22:00:57.094980806 +0200
***************
*** 2108,2113 ****
--- 2108,2115 ----
    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)
*** ../vim-8.1.2202/src/auto/configure	2019-10-10 13:22:36.963636175 +0200
--- src/auto/configure	2019-10-23 22:02:47.454659443 +0200
***************
*** 656,661 ****
--- 656,662 ----
  X_CFLAGS
  XMKMF
  xmkmfpath
+ TERM_TEST
  TERM_OBJ
  TERM_SRC
  CHANNEL_OBJ
***************
*** 7911,7916 ****
--- 7912,7919 ----
  
    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
*** ../vim-8.1.2202/src/config.mk.in	2019-04-11 15:25:36.987065321 +0200
--- src/config.mk.in	2019-10-23 22:02:38.890684794 +0200
***************
*** 87,92 ****
--- 87,93 ----
  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@
*** ../vim-8.1.2202/src/Makefile	2019-10-10 13:22:36.963636175 +0200
--- src/Makefile	2019-10-23 22:34:36.214166928 +0200
***************
*** 2193,2199 ****
  #
  # Execute the test scripts and the unittests.
  # Do the scripttests first, so that the summary shows last.
! test check: unittests test_libvterm 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
--- 2195,2201 ----
  #
  # Execute the test scripts and the unittests.
  # Do the scripttests first, so that the summary shows last.
! 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
*** ../vim-8.1.2202/src/version.c	2019-10-23 21:43:13.368623922 +0200
--- src/version.c	2019-10-23 22:32:44.498617631 +0200
***************
*** 743,744 ****
--- 743,746 ----
  {   /* Add new patch number below this line */
+ /**/
+     2203,
  /**/

-- 
Eye have a spelling checker, it came with my PC;
It plainly marks four my revue mistakes I cannot sea.
I've run this poem threw it, I'm sure your please to no,
It's letter perfect in it's weigh, my checker tolled me sew!

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///