From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 15 Dec 2018 14:39:28 +0000 (+0100)
Subject: patch 8.1.0594: libvterm tests fail to run on Mac
X-Git-Tag: v8.1.0594
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b321d6a521e76c5cbe640272574e4fbd42cba9b;p=vim

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.
---

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
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    594,
 /**/
     593,
 /**/