changeset 15168:1cc5524d1081 v8.1.0594

patch 8.1.0594: libvterm tests fail to run on Mac commit https://github.com/vim/vim/commit/8b321d6a521e76c5cbe640272574e4fbd42cba9b Author: Bram Moolenaar <Bram@vim.org> Date: Sat Dec 15 15:39:28 2018 +0100 patch 8.1.0594: libvterm tests fail to run on Mac Problem: Libvterm tests fail to run on Mac. Solution: Only run libvterm tests on Linux.
author Bram Moolenaar <Bram@vim.org>
date Sat, 15 Dec 2018 15:45:05 +0100
parents e958bbe5bf1b
children a000d97ce1db
files src/Makefile src/version.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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,