diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-12-15 14:24:39 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-12-15 14:24:39 +0100 |
| commit | 471f65813592238509923f2c8748df5be03513e9 (patch) | |
| tree | 4ab9a34a6fa5a737c024468f7d6e99df605229d2 | |
| parent | 6c8dd39df938c7502a740f59825feeaa5736b245 (diff) | |
patch 8.1.0592: the libvterm tests are not run as part of Vim testsv8.1.0592
Problem: The libvterm tests are not run as part of Vim tests.
Solution: Add testing libvterm.
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/libvterm/Makefile | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index aca1236d08..0012309985 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2107,7 +2107,7 @@ types.vim: $(TAGS_SRC) $(TAGS_INCL) # TESTING # # Execute the test scripts and the unittests. -test check: scripttests unittests +test check: scripttests unittests test_libvterm # Execute the test scripts. Run these after compiling Vim, before installing. # This doesn't depend on $(VIMTARGET), because that won't work when configure @@ -2159,6 +2159,10 @@ run_memfile_test: $(MEMFILE_TEST_TARGET) run_message_test: $(MESSAGE_TEST_TARGET) $(VALGRIND) ./$(MESSAGE_TEST_TARGET) || exit 1; echo $* passed; +# Run the libvterm tests. +test_libvterm: + cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" + # Run individual OLD style test. # These do not depend on the executable, compile it when needed. test1 \ diff --git a/src/libvterm/Makefile b/src/libvterm/Makefile index 05f68dd605..6eacab7661 100644 --- a/src/libvterm/Makefile +++ b/src/libvterm/Makefile @@ -8,8 +8,7 @@ ifneq ($(VERBOSE),1) LIBTOOL +=--quiet endif -# override CFLAGS +=-Wall -Iinclude -std=c99 -DINLINE="static inline" -DUSE_INLINE -override CFLAGS +=-Wall -Iinclude -std=c90 -Wpedantic -DINLINE="" +override CFLAGS +=-Wall -Iinclude -std=c99 -Wpedantic -DINLINE="" ifeq ($(shell uname),SunOS) override CFLAGS +=-D__EXTENSIONS__ -D_XPG6 -D__XOPEN_OR_POSIX diff --git a/src/version.c b/src/version.c index aafd4cba2d..4e79d28a29 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 */ /**/ + 592, +/**/ 591, /**/ 590, |