# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1544885105 -3600
# Node ID 1cc5524d10814b03580de6680f224a0c50a4d90b
# Parent  e958bbe5bf1bb95c530d109d816b79c55442edaf
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.

diff --git a/src/Makefile b/src/Makefile
--- 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
--- 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,