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 0012309985431de96371bfa8061dbb5eea990dbe..ecceaf50498cdc0c2846bcf910f98ee54f9e6898 100644 (file)
--- 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 b1de233f9fa19f4d39f4707d015fc0abb2984236..0a94f3101e2672bbcf0564d78ff9811791752831 100644 (file)
--- 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,
 /**/