diff options
| -rw-r--r-- | .ci/common/test.sh | 4 | ||||
| -rwxr-xr-x | .ci/run_tests.sh | 1 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/nvim/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_cmdline.vim | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
6 files changed, 5 insertions, 11 deletions
diff --git a/.ci/common/test.sh b/.ci/common/test.sh index 4137472385..b28e46a4df 100644 --- a/.ci/common/test.sh +++ b/.ci/common/test.sh @@ -109,10 +109,6 @@ run_oldtests() { check_core_dumps } -run_single_includes_tests() { - ${MAKE_CMD} -C "${BUILD_DIR}" check-single-includes -} - install_nvim() { ${MAKE_CMD} -C "${BUILD_DIR}" install diff --git a/.ci/run_tests.sh b/.ci/run_tests.sh index d994db471f..6347ac15d4 100755 --- a/.ci/run_tests.sh +++ b/.ci/run_tests.sh @@ -10,7 +10,6 @@ source "${CI_DIR}/common/test.sh" check_core_dumps --delete quiet prepare_build -run_single_includes_tests build_nvim if [ "$CLANG_SANITIZER" != "TSAN" ]; then @@ -132,9 +132,9 @@ clint: -DLINT_SUPPRESS_URL="$(DOC_DOWNLOAD_URL_BASE)$(CLINT_ERRORS_FILE_PATH)" \ -P cmake/RunLint.cmake -lint: clint testlint - check-single-includes: build/.ran-cmake +$(BUILD_CMD) -C build check-single-includes +lint: check-single-includes clint testlint + .PHONY: test testlint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 1c2932ed50..c5bf79c0e5 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -456,10 +456,8 @@ foreach(hfile ${NVIM_HEADERS}) if(NOT ${hfile} MATCHES "[.]c[.]h$") set(tsource "${GENERATED_DIR}/${r}.test-include.c") - set(tresult "${GENERATED_DIR}/${r}.test-include.i") string(REPLACE "/" "-" texe "test-incl-${r}") write_file("${tsource}" "#include \"${hfile}\"\nint main(int argc, char **argv) { return 0; }") - get_preproc_output(PREPROC_OUTPUT ${tresult}) add_executable( ${texe} EXCLUDE_FROM_ALL diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim index f56227250c..0c9d1297d6 100644 --- a/src/nvim/testdir/test_cmdline.vim +++ b/src/nvim/testdir/test_cmdline.vim @@ -201,5 +201,6 @@ func Test_expand_star_star() call writefile(['asdfasdf'], 'a/b/fileXname') call feedkeys(":find **/fileXname\<Tab>\<CR>", 'xt') call assert_equal('find a/b/fileXname', getreg(':')) + bwipe! call delete('a', 'rf') endfunc diff --git a/src/nvim/version.c b/src/nvim/version.c index f1d39b8492..9275a2e5bd 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -165,14 +165,14 @@ static const int included_patches[] = { 2279, // 2278 NA 2277, - // 2276, + 2276, 2275, 2274, 2273, 2272, // 2271 NA // 2270 NA - // 2269, + 2269, // 2268, // 2267 NA 2266, |