diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-03-29 18:44:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-29 18:44:43 +0200 |
| commit | c35420558bed0bfa9938ecd1facec88f1df392a5 (patch) | |
| tree | 0c5a27ab1e15948ffff4516b4af086a93d2eabaa | |
| parent | 2846d508b24eb9f8ab59d21a060fd8130906392f (diff) | |
| parent | afacda046d4cce07cb80ba2cf43341c03131c683 (diff) | |
| download | rneovim-c35420558bed0bfa9938ecd1facec88f1df392a5.tar.gz rneovim-c35420558bed0bfa9938ecd1facec88f1df392a5.tar.bz2 rneovim-c35420558bed0bfa9938ecd1facec88f1df392a5.zip | |
Merge #6394 'ci: check-single-includes only in "lint" build'
| -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 |
4 files changed, 2 insertions, 9 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 e752f5d4df..bad43e7f72 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -461,10 +461,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 |