diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-03 21:24:07 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-03 21:24:07 +0100 |
| commit | 476268c387a05cfda9feaca8d1a5eeb535ed9f49 (patch) | |
| tree | 534d40e043bc102eef48770cc5b3544ceccb21b0 /src/libvterm | |
| parent | c0d670ce16d0e148b7d39ac354571b3d284a0b53 (diff) | |
| download | vim-git-476268c387a05cfda9feaca8d1a5eeb535ed9f49.tar.gz | |
patch 8.2.2086: libvterm tests are only run on Linuxv8.2.2086
Problem: Libvterm tests are only run on Linux.
Solution: Use static libraries. (Ozaki Kiichi, closes #7419)
Diffstat (limited to 'src/libvterm')
| -rw-r--r-- | src/libvterm/Makefile | 2 | ||||
| -rw-r--r-- | src/libvterm/t/run-test.pl | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libvterm/Makefile b/src/libvterm/Makefile index 852c97fbe..be01dd070 100644 --- 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 96f47fb86..82abb291e 100644 --- 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; |