thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2086: libvterm tests are only run on Linux

Browse Source 
Problem:    Libvterm tests are only run on Linux.
Solution:   Use static libraries. (Ozaki Kiichi, closes #7419)
This commit is contained in:
Bram Moolenaar
2020-12-03 21:24:07 +01:00
parent c0d670ce16
commit 476268c387
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -240,8 +240,6 @@ jobs:
env: env:
- *linux-huge - *linux-huge
- *coverage - *coverage
# Clang cannot compile test_libvterm with "--coverage" flag.
- TEST=scripttests
after_success: *eval-coverage after_success: *eval-coverage
- <<: *linux - <<: *linux
name: huge+coverage/gcc name: huge+coverage/gcc

7
src/Makefile
View File

@@ -2293,11 +2293,10 @@ run_message_test: $(MESSAGE_TEST_TARGET)
$(VALGRIND) ./$(MESSAGE_TEST_TARGET) || exit 1; echo $* passed; $(VALGRIND) ./$(MESSAGE_TEST_TARGET) || exit 1; echo $* passed;
# Run the libvterm tests. # 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: test_libvterm:
@if test `uname` = "Linux"; then \ @if $(MAKE) --version 2>/dev/null | grep -qs "GNU Make"; then \
cd libvterm; $(MAKE) -f Makefile test \ cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
fi fi
# Run individual OLD style test. # Run individual OLD style test.

2
src/libvterm/Makefile
View File

@@ -78,7 +78,7 @@ t/harness.lo: t/harness.c $(HFILES)
$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -o $@ -c $< $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -o $@ -c $<
t/harness: t/harness.lo $(LIBRARY) 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 .PHONY: test
test: $(LIBRARY) t/harness test: $(LIBRARY) t/harness

3
src/libvterm/t/run-test.pl
View File

@@ -8,7 +8,7 @@ use IPC::Open2 qw( open2 );
use POSIX qw( WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG ); use POSIX qw( WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG );
my $VALGRIND = 0; my $VALGRIND = 0;
my $EXECUTABLE = "t/.libs/harness"; my $EXECUTABLE = "t/harness";
GetOptions( GetOptions(
'valgrind|v+' => \$VALGRIND, 'valgrind|v+' => \$VALGRIND,
'executable|e=s' => \$EXECUTABLE, 'executable|e=s' => \$EXECUTABLE,
@@ -17,7 +17,6 @@ GetOptions(
my ( $hin, $hout, $hpid ); my ( $hin, $hout, $hpid );
{ {
local $ENV{LD_LIBRARY_PATH} = ".libs";
my @command = $EXECUTABLE; my @command = $EXECUTABLE;
unshift @command, "valgrind", "--tool=memcheck", "--leak-check=yes", "--num-callers=25", "--log-file=valgrind.out", "--error-exitcode=126" if $VALGRIND; unshift @command, "valgrind", "--tool=memcheck", "--leak-check=yes", "--num-callers=25", "--log-file=valgrind.out", "--error-exitcode=126" if $VALGRIND;

2
src/version.c
View File

@@ -750,6 +750,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 */
/**/
2086,
/**/ /**/
2085, 2085,
/**/ /**/