From e362bba1ed588cbe9024696a9c8407a8d1cf3b95 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 18 Oct 2017 14:25:04 +0200 Subject: [PATCH] tests: use correct binaries when run in debug mode --- tools/integration-tests.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/integration-tests.sh b/tools/integration-tests.sh index 58b10db18..00686f26f 100755 --- a/tools/integration-tests.sh +++ b/tools/integration-tests.sh @@ -25,10 +25,19 @@ SCRIPT=$(realpath ${BASH_SOURCE[0]}) SCRIPTPATH=$(dirname $SCRIPT) -export SRCDIR=$(realpath ${SCRIPTPATH}/..) -export BUILDDIR=${SRCDIR}/build/release -export LOGDIR=${BUILDDIR}/tests/integration -export PATH=${BUILDDIR}:${PATH} +if [ -n "${DEBUG}" ]; then + VARIANT="debug" +else + VARIANT="release" +fi + +SRCDIR=${SRCDIR:-$(realpath ${SCRIPTPATH}/..)} +BUILDDIR=${BUILDDIR:-${SRCDIR}/build/${VARIANT}} + +LOGDIR=${BUILDDIR}/tests/integration +PATH=${BUILDDIR}:${PATH} + +export PATH SRCDIR BUILDDIR LOGDIR # Default values VERBOSE=${VERBOSE:-0}