diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-12-15 15:39:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-12-15 15:39:28 +0100 |
| commit | 8b321d6a521e76c5cbe640272574e4fbd42cba9b (patch) | |
| tree | fb893f15411b3f1b0f8e63895e09b30788de98ca | |
| parent | 37e3edce200c5a0ae8f81ca729b18d75477d2725 (diff) | |
| download | vim-git-8b321d6a521e76c5cbe640272574e4fbd42cba9b.tar.gz | |
patch 8.1.0594: libvterm tests fail to run on Macv8.1.0594
Problem: Libvterm tests fail to run on Mac.
Solution: Only run libvterm tests on Linux.
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 001230998..ecceaf504 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2160,8 +2160,12 @@ 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. test_libvterm: - cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" + @if test `uname` = "Linux"; then \ + cd libvterm; $(MAKE) -f Makefile test \ + CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \ + fi # Run individual OLD style test. # These do not depend on the executable, compile it when needed. diff --git a/src/version.c b/src/version.c index b1de233f9..0a94f3101 100644 --- a/src/version.c +++ b/src/version.c @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 594, +/**/ 593, /**/ 592, |