Patch 8.2.2086

[Bram Moolenaar]

Patch 8.2.2086
Problem: Libvterm tests are only run on Linux.
Solution: Use static libraries. (Ozaki Kiichi, closes #7419)
Files: .travis.yml, src/Makefile, src/libvterm/Makefile,
src/libvterm/t/run-test.pl


*** ../vim-8.2.2085/.travis.yml 2020-09-03 16:04:25.972190623 +0200
--- .travis.yml 2020-12-03 21:17:49.074785640 +0100
***************
*** 240,247 ****
env:
- *linux-huge
- *coverage
- # Clang cannot compile test_libvterm with "--coverage" flag.
- - TEST=scripttests
after_success: *eval-coverage
- <<: *linux
name: huge+coverage/gcc
--- 240,245 ----
*** ../vim-8.2.2085/src/Makefile 2020-09-05 15:48:32.465546702 +0200
--- src/Makefile 2020-12-03 21:17:49.074785640 +0100
***************
*** 2293,2303 ****
$(VALGRIND) ./$(MESSAGE_TEST_TARGET) || exit 1; echo $* passed;

# Run the libvterm tests.
! # This currently doesn't work on Mac, only run on Linux for now.
test_libvterm:
! @if test `uname` = "Linux"; then \
! cd libvterm; $(MAKE) -f Makefile test \
! CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
fi

# Run individual OLD style test.
--- 2293,2302 ----
$(VALGRIND) ./$(MESSAGE_TEST_TARGET) || exit 1; echo $* passed;

# Run the libvterm tests.
! # This works only on GNU make, not on BSD make.
test_libvterm:
! @if $(MAKE) --version 2>/dev/null | grep -qs "GNU Make"; then \
! cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
fi

# Run individual OLD style test.
*** ../vim-8.2.2085/src/libvterm/Makefile 2020-05-17 22:27:36.728262245 +0200
--- src/libvterm/Makefile 2020-12-03 21:17:49.074785640 +0100
***************
*** 78,84 ****
$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -o $@ -c $<

t/harness: t/harness.lo $(LIBRARY)
! $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)

.PHONY: test
test: $(LIBRARY) t/harness
--- 78,84 ----
$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -o $@ -c $<

t/harness: t/harness.lo $(LIBRARY)
! $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -static

.PHONY: test
test: $(LIBRARY) t/harness
*** ../vim-8.2.2085/src/libvterm/t/run-test.pl 2020-05-20 19:30:13.828123549 +0200
--- src/libvterm/t/run-test.pl 2020-12-03 21:17:49.074785640 +0100
***************
*** 8,14 ****
use POSIX qw( WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG );

my $VALGRIND = 0;
! my $EXECUTABLE = "t/.libs/harness";
GetOptions(
'valgrind|v+' => \$VALGRIND,
'executable|e=s' => \$EXECUTABLE,
--- 8,14 ----
use POSIX qw( WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG );

my $VALGRIND = 0;
! my $EXECUTABLE = "t/harness";
GetOptions(
'valgrind|v+' => \$VALGRIND,
'executable|e=s' => \$EXECUTABLE,
***************
*** 17,23 ****

my ( $hin, $hout, $hpid );
{
- local $ENV{LD_LIBRARY_PATH} = ".libs";
my @command = $EXECUTABLE;
unshift @command, "valgrind", "--tool=memcheck", "--leak-check=yes", "--num-callers=25", "--log-file=valgrind.out", "--error-exitcode=126" if $VALGRIND;

--- 17,22 ----
*** ../vim-8.2.2085/src/version.c 2020-12-03 21:08:32.948412699 +0100
--- src/version.c 2020-12-03 21:19:31.234477290 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2086,
/**/

--
Save the plankton - eat a whale.

/// Bram Moolenaar -- Br...@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 ///