From d785989d0405ca2cebcdeb30b58cb4295e1d3d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= Date: Thu, 15 Dec 2016 11:49:34 +0100 Subject: [PATCH] tools: static_tests.sh: rm dependency to 'riot' remote --- dist/tools/static-tests.sh | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/dist/tools/static-tests.sh b/dist/tools/static-tests.sh index d04c197637..c6973fa46b 100755 --- a/dist/tools/static-tests.sh +++ b/dist/tools/static-tests.sh @@ -11,35 +11,15 @@ cd "$(dirname "$0")/../../" function dep { - which $1 2>&1 1>/dev/null + command -v $1 2>&1 1>/dev/null if (( $? != 0 )); then echo "Dependency not met: $1" exit 1 fi } -function abort { - echo "$(tput setaf 1)$1$(tput sgr0)" - exit 1 -} - -function request_confirmation { - read -p "$(tput setaf 4)$1 (y/n) $(tput sgr0)" - [ "$REPLY" == "y" ] || abort "Aborted!" -} - # Make sure all required commands are available dep cppcheck dep pcregrep -RIOT_REMOTE_COUNT="$(git remote | grep "^riot$" | wc -l)" -if (( "$RIOT_REMOTE_COUNT" != 1 )); then - echo "The static test setup expect a remote called 'riot', pointing to the" - echo "central repository. This remote currently does not exist." - request_confirmation "Do you wish to create it?" - - git remote add riot https://github.com/RIOT-OS/RIOT.git - git fetch riot -fi - -BUILDTEST_MCU_GROUP=static-tests ./dist/tools/travis-scripts/build_and_test.sh +BUILDTEST_MCU_GROUP=static-tests ./dist/tools/ci/build_and_test.sh