patch 8.2.2086: libvterm tests are only run on Linux

Problem:    Libvterm tests are only run on Linux.
Solution:   Use static libraries. (Ozaki Kiichi, closes #7419)

diff --git a/.travis.yml b/.travis.yml
index d3bb30192227363578a29c1ce473ee868fbeb9fa..b89f27677546c7a6f9152ae0b2f4f4735c542897 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -240,8 +240,6 @@ jobs:
       env:
         - *linux-huge
         - *coverage
-        # Clang cannot compile test_libvterm with "--coverage" flag.
-        - TEST=scripttests
       after_success: *eval-coverage
     - <<: *linux
       name: huge+coverage/gcc

diff --git a/src/Makefile b/src/Makefile
index 05c32a2a52a882affac0784f09e2dd910156db69..c30af8b2952badbe776f8ba2a8e3207cf1d237bd 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2293,11 +2293,10 @@ run_message_test: $(MESSAGE_TEST_TARGET)
        $(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.
+# This works only on GNU make, not on BSD make.
 test_libvterm:
-       @if test `uname` = "Linux"; then \
-               cd libvterm; $(MAKE) -f Makefile test \
-                       CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
+       @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.

diff --git a/src/libvterm/Makefile b/src/libvterm/Makefile
index 852c97fbe8137a4c785d61cee1f7de66d5351ee1..be01dd070544b07f46e6fb8a39e02181ca40f0f3 100644 (file)
--- a/src/libvterm/Makefile
+++ b/src/libvterm/Makefile
@@ -78,7 +78,7 @@ t/harness.lo: t/harness.c $(HFILES)
        $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -o $@ -c $<
 
 t/harness: t/harness.lo $(LIBRARY)
-       $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+       $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -static
 
 .PHONY: test
 test: $(LIBRARY) t/harness

diff --git a/src/libvterm/t/run-test.pl b/src/libvterm/t/run-test.pl
index 96f47fb86881f5de7dba244d2847077b23fd84dc..82abb291e023e12547448728a77e68f48c304956 100644 (file)
--- a/src/libvterm/t/run-test.pl
+++ b/src/libvterm/t/run-test.pl
@@ -8,7 +8,7 @@ use IPC::Open2 qw( open2 );
 use POSIX qw( WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG );
 
 my $VALGRIND = 0;
-my $EXECUTABLE = "t/.libs/harness";
+my $EXECUTABLE = "t/harness";
 GetOptions(
    'valgrind|v+' => \$VALGRIND,
    'executable|e=s' => \$EXECUTABLE,
@@ -17,7 +17,6 @@ GetOptions(
 
 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;
 

diff --git a/src/version.c b/src/version.c
index 096698b7f489a5c6d8e1ba6250c811fb3f57fd44..eb5a8e228a84de9269b19f6980e1078ff23efb02 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2086,
 /**/
     2085,
 /**/