From 05b74399aa40c813b195d595aa3878ff42e61ab8 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 29 Mar 2017 17:39:06 +0200
Subject: [PATCH 1/2] build: remove unused get_preproc_output() call

ref https://github.com/neovim/neovim/pull/6375#discussion_r108573471
---
 src/nvim/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

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

From afacda046d4cce07cb80ba2cf43341c03131c683 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 29 Mar 2017 17:45:48 +0200
Subject: [PATCH 2/2] ci: Run check-single-includes in "lint" build only

---
 .ci/common/test.sh | 4 ----
 .ci/run_tests.sh   | 1 -
 Makefile           | 4 ++--
 3 files changed, 2 insertions(+), 7 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
diff --git a/Makefile b/Makefile
index 47fb1e5edd..d2f6c11b19 100644
--- a/Makefile
+++ b/Makefile
@@ -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