aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-04-10 14:39:22 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-04-10 15:12:42 -0400
commitfad0fc3c9a9759dfb2bb1bdf1aaa5e1d08c0ab9c (patch)
tree171a786bf91ea495e0df681633d3c1d414e1d807 /contrib/devtools
parent8d651ae32013440b2af1267e87a9d93759a9471f (diff)
Refine travis check for duplicate includes
This partially reverts commit c36b720d009f1ab1c3900750e05c1f17412e564d.
Diffstat (limited to 'contrib/devtools')
-rwxr-xr-xcontrib/devtools/lint-includes.sh11
1 files changed, 0 insertions, 11 deletions
diff --git a/contrib/devtools/lint-includes.sh b/contrib/devtools/lint-includes.sh
index baca2f8a1f..f54be46b52 100755
--- a/contrib/devtools/lint-includes.sh
+++ b/contrib/devtools/lint-includes.sh
@@ -19,17 +19,6 @@ for HEADER_FILE in $(filter_suffix h); do
echo
EXIT_CODE=1
fi
- CPP_FILE=${HEADER_FILE/%\.h/.cpp}
- if [[ ! -e $CPP_FILE ]]; then
- continue
- fi
- DUPLICATE_INCLUDES_IN_HEADER_AND_CPP_FILES=$(grep -hE "^#include " <(sort -u < "${HEADER_FILE}") <(sort -u < "${CPP_FILE}") | grep -E "^#include " | sort | uniq -d)
- if [[ ${DUPLICATE_INCLUDES_IN_HEADER_AND_CPP_FILES} != "" ]]; then
- echo "Include(s) from ${HEADER_FILE} duplicated in ${CPP_FILE}:"
- echo "${DUPLICATE_INCLUDES_IN_HEADER_AND_CPP_FILES}"
- echo
- EXIT_CODE=1
- fi
done
for CPP_FILE in $(filter_suffix cpp); do
DUPLICATE_INCLUDES_IN_CPP_FILE=$(grep -E "^#include " < "${CPP_FILE}" | sort | uniq -d)