From 2631ad00bdfd1d0416f317fb5007aab538779d11 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 18 Nov 2017 11:24:16 +0100 Subject: [PATCH] allow additional cake params to be passed via env variables (#5371) This allows for non-standard paths and the likes (helps a lot on OSX). --- tools/commit-tests.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh index 5eee1f36c..9f0a67105 100755 --- a/tools/commit-tests.sh +++ b/tools/commit-tests.sh @@ -38,7 +38,7 @@ if [ "$(uname)" = "Darwin" ]; then else SCRIPT=$(readlink -f "$0") fi -#export CMAKE_PREFIX_PATH=/opt/qt${QT_BASE} + if [[ ! -z ${GCC_ARM} ]] ; then export PATH=${GCC_ARM}:$PATH fi @@ -48,6 +48,10 @@ fi : ${COMMON_OPTIONS:="-DCMAKE_BUILD_TYPE=Debug -DTRACE_SIMPGMSPACE=NO -DVERBOSE_CMAKELISTS=YES -DCMAKE_RULE_MESSAGES=OFF -Wno-dev"} if (( $WERROR )); then COMMON_OPTIONS+=" -DWARNINGS_AS_ERRORS=YES"; fi +: ${EXTRA_OPTIONS:="$EXTRA_OPTIONS"} + +COMMON_OPTIONS+=${EXTRA_OPTIONS} + : ${TEST_OPTIONS:="--gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure"} : ${FIRMARE_TARGET:="firmware-size"}