IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6394 'ci: check-single-includes only in "lint" build'

Browse Source
This commit is contained in:
Justin M. Keyes 2017-03-29 18:44:43 +02:00 committed by GitHub
commit c35420558b
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/common/test.sh
View File

@ -109,10 +109,6 @@ run_oldtests() {
check_core_dumps check_core_dumps
} }
run_single_includes_tests() {
${MAKE_CMD} -C "${BUILD_DIR}" check-single-includes
}
install_nvim() { install_nvim() {
${MAKE_CMD} -C "${BUILD_DIR}" install ${MAKE_CMD} -C "${BUILD_DIR}" install

1
.ci/run_tests.sh
View File

@ -10,7 +10,6 @@ source "${CI_DIR}/common/test.sh"
check_core_dumps --delete quiet check_core_dumps --delete quiet
prepare_build prepare_build
run_single_includes_tests
build_nvim build_nvim
if [ "$CLANG_SANITIZER" != "TSAN" ]; then if [ "$CLANG_SANITIZER" != "TSAN" ]; then

4
Makefile
View File

@ -132,9 +132,9 @@ clint:
-DLINT_SUPPRESS_URL="$(DOC_DOWNLOAD_URL_BASE)$(CLINT_ERRORS_FILE_PATH)" \ -DLINT_SUPPRESS_URL="$(DOC_DOWNLOAD_URL_BASE)$(CLINT_ERRORS_FILE_PATH)" \
-P cmake/RunLint.cmake -P cmake/RunLint.cmake
lint: clint testlint
check-single-includes: build/.ran-cmake check-single-includes: build/.ran-cmake
+$(BUILD_CMD) -C build check-single-includes +$(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 .PHONY: test testlint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install

2
src/nvim/CMakeLists.txt
View File

@ -461,10 +461,8 @@ foreach(hfile ${NVIM_HEADERS})
if(NOT ${hfile} MATCHES "[.]c[.]h$") if(NOT ${hfile} MATCHES "[.]c[.]h$")
set(tsource "${GENERATED_DIR}/${r}.test-include.c") set(tsource "${GENERATED_DIR}/${r}.test-include.c")
set(tresult "${GENERATED_DIR}/${r}.test-include.i")
string(REPLACE "/" "-" texe "test-incl-${r}") string(REPLACE "/" "-" texe "test-incl-${r}")
write_file("${tsource}" "#include \"${hfile}\"\nint main(int argc, char **argv) { return 0; }") write_file("${tsource}" "#include \"${hfile}\"\nint main(int argc, char **argv) { return 0; }")
get_preproc_output(PREPROC_OUTPUT ${tresult})
add_executable( add_executable(
${texe} ${texe}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL