From 0ece093a5efae41a271edd3d2123d5c54f5a3812 Mon Sep 17 00:00:00 2001 From: Pham Huu Dang Nhat Date: Tue, 25 Nov 2014 09:09:07 +0700 Subject: [PATCH 1/2] CI: removed AC in extern C check --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc1e614a23..bb0ad50ba4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,10 +46,7 @@ script: - ./dist/tools/licenses/check.sh master --diff-filter=MR --error-exitcode=0 || exit - ./dist/tools/licenses/check.sh master --diff-filter=AC || exit -# TODO: -# Remove the `AC` argument when all headers have been -# taken care of in master. - - ./dist/tools/externc/check.sh master AC || exit + - ./dist/tools/externc/check.sh master || exit # TODO: # Remove all but `master` parameters to cppcheck (and remove second From bb85671ea7372760032044b8b40e79838fe3db81 Mon Sep 17 00:00:00 2001 From: Pham Huu Dang Nhat Date: Tue, 25 Nov 2014 21:42:39 +0700 Subject: [PATCH 2/2] CI: replaced head with cat and filtered out tools for extern "C" check. --- dist/tools/externc/check.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/tools/externc/check.sh b/dist/tools/externc/check.sh index c83ec323f8..7311be26b5 100755 --- a/dist/tools/externc/check.sh +++ b/dist/tools/externc/check.sh @@ -21,9 +21,11 @@ else FILES="$(git diff --diff-filter=${DIFFFILTER} --name-only ${BRANCH} | grep -E '\.h$')" fi +FILES=$(echo "${FILES}" | grep -v -E '^(dist/tools|boards/msba2-common/tools/)') + # check files for FILE in ${FILES}; do - if head -100 "${ROOT}/${FILE}" \ + if cat "${ROOT}/${FILE}" \ | sed -e 's/$/ /' \ | tr -d '\r\n' \ | sed -e 's/ */ /g' \