diff --git a/dist/tools/endingcheck/check.sh b/dist/tools/endingcheck/check.sh deleted file mode 100755 index f6a97b06be..0000000000 --- a/dist/tools/endingcheck/check.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2015 Kushal Singh -# -# This file is subject to the terms and conditions of the GNU Lesser -# General Public License v2.1. See the file LICENSE in the top level -# directory for more details. -# - -BRANCH=${1} -ENDREGEX='^M$' - -# If no branch but an option is given, unset BRANCH. -# Otherwise, consume this parameter. -if echo "${BRANCH}" | grep -q '^-'; then - BRANCH="" -else - if [ -n "${BRANCH}" ]; then - shift 1 - fi -fi - -# If the --diff-filter option is given, consume this parameter. -# Set the default DIFFFILTER option otherwise. -DIFFFILTER="${1}" -if echo "${DIFFFILTER}" | grep -q '^--diff-filter='; then - shift 1 -else - DIFFFILTER="--diff-filter=ACMR" -fi - -# select either all or only touched-in-branch files, filter through FILEREGEX -if [ -z "${BRANCH}" ]; then - FILES="$(git ls-tree -r --full-tree --name-only HEAD)" -else - FILES="$(git diff ${DIFFFILTER} --name-only ${BRANCH})" -fi - -if [ -z "${FILES}" ]; then - exit -fi - -grep -E -R -l ${ENDREGEX} ${FILES} > /dev/null - -if [ $? -eq 0 ] -then - echo "ERROR: carriage return error found" - exit 1 -else - exit 0 -fi diff --git a/dist/tools/travis-scripts/build_and_test.sh b/dist/tools/travis-scripts/build_and_test.sh index 90e39f2797..20346b4d36 100755 --- a/dist/tools/travis-scripts/build_and_test.sh +++ b/dist/tools/travis-scripts/build_and_test.sh @@ -45,9 +45,6 @@ then ./dist/tools/externc/check.sh master RESULT=$(set_result $? $RESULT) - ./dist/tools/endingcheck/check.sh riot/master --diff-filter=MA - RESULT=$(set_result $? $RESULT) - # TODO: # Remove all but `master` parameters to cppcheck (and remove second # invocation) once all warnings of cppcheck have been taken care of