Mercurial > vim
changeset 23080:8eed19bd0235 v8.2.2086
patch 8.2.2086: libvterm tests are only run on Linux
Commit: https://github.com/vim/vim/commit/476268c387a05cfda9feaca8d1a5eeb535ed9f49
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 3 21:24:07 2020 +0100
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 https://github.com/vim/vim/issues/7419)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 03 Dec 2020 21:30:04 +0100 |
| parents | 56e11a681a56 |
| children | 8352e4d605ed |
| files | .travis.yml src/Makefile src/libvterm/Makefile src/libvterm/t/run-test.pl src/version.c |
| diffstat | 5 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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.
--- 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
--- 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;