From 85cfac2f5d7f9a6a9a5d8a790e54ea7c15a94b1c Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Thu, 20 Apr 2017 17:16:20 -0400 Subject: [PATCH] Test: utils.sh: use getconf to start either 32 or 64 consumerd MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- tests/utils/utils.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 9db0640b7..080aa4d5d 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -384,27 +384,44 @@ function start_lttng_sessiond_opt() local withtap=$1 local load_path=$2 + local consumerd="" + local long_bit_value=$(getconf LONG_BIT) + if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then # Env variable requested no session daemon return fi + DIR=$(readlink -f $TESTDIR) + + # Get long_bit value for 32/64 consumerd + case "$long_bit_value" in + 32) + consumerd="--consumerd32-path=$DIR/../src/bin/lttng-consumerd/lttng-consumerd" + ;; + 64) + consumerd="--consumerd64-path=$DIR/../src/bin/lttng-consumerd/lttng-consumerd" + ;; + *) + return + ;; + esac + validate_kernel_version if [ $? -ne 0 ]; then fail "Start session daemon" BAIL_OUT "*** Kernel too old for session daemon tests ***" fi - DIR=$(readlink -f $TESTDIR) : ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/} export LTTNG_SESSION_CONFIG_XSD_PATH if [ -z $(pgrep ${SESSIOND_MATCH}) ]; then # Have a load path ? if [ -n "$load_path" ]; then - $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$load_path" --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" + $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$load_path" --background $consumerd else - $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" + $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background $consumerd fi #$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --verbose-consumer >>/tmp/sessiond.log 2>&1 status=$? -- 2.34.1