X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils.sh;h=f0a2e25dd7fde160e603f57f8b16b65c1fae6428;hp=01e8eae21b3886c0bd532f0e438610e94e74c8cf;hb=3badf2bf32930336a4902002d840402adb6859e1;hpb=fd4dfcecf4a21f7797d350e8dcd291c6f0c64e86

diff --git a/tests/utils.sh b/tests/utils.sh
index 01e8eae21..f0a2e25dd 100644
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -24,6 +24,8 @@ KERNEL_MAJOR_VERSION=2
 KERNEL_MINOR_VERSION=6
 KERNEL_PATCHLEVEL_VERSION=27
 
+alias realpath='readlink -f'
+
 function validate_kernel_version ()
 {
 	kern_version=($(uname -r | awk -F. '{ printf("%d.%d.%d\n",$1,$2,$3); }' | tr '.' '\n'))
@@ -39,17 +41,20 @@ function validate_kernel_version ()
 	return 1
 }
 
-function start_sessiond ()
+function spawn_sessiond ()
 {
+	echo ""
+	echo -n "Starting session daemon... "
 	validate_kernel_version
 	if [ $? -ne 0 ]; then
 		echo -e "\n*** Kernel to old for session daemon tests ***\n"
 		return 2
 	fi
 
-	if [ -z $(pidof $SESSIOND_BIN) ]; then
-		echo -n "Starting session daemon... "
-		$TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --quiet
+	DIR=$(realpath $TESTDIR)
+
+	if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
+		$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
 		if [ $? -eq 1 ]; then
 			echo -e "\e[1;31mFAILED\e[0m"
 			return 1
@@ -61,8 +66,35 @@ function start_sessiond ()
 	return 0
 }
 
+function start_sessiond()
+{
+	if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
+		# Env variable requested no session daemon
+		return
+	fi
+
+	spawn_sessiond
+	out=$?
+	if [ $out -eq 2 ]; then
+		# Kernel version is not compatible.
+		exit 0
+	elif [ $out -ne 0 ]; then
+		echo "NOT bad $?"
+		exit 1
+	fi
+
+	# Simply wait for the session daemon bootstrap
+	echo "Waiting for the session daemon to bootstrap (2 secs)"
+	sleep 2
+}
+
 function stop_sessiond ()
 {
+	if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
+		# Env variable requested no session daemon
+		return
+	fi
+
 	PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
 
 	echo -e -n "Killing session daemon... "
@@ -154,6 +186,12 @@ function trace_matches ()
 	nr_iter=$2
 	trace_path=$3
 
+	which $BABELTRACE_BIN >/dev/null
+	if [ $? -eq 1 ]; then
+		echo "Babeltrace binary not found. Skipping trace matches"
+		return 0
+	fi
+
 	echo -n "Looking for $nr_iter $event_name in $trace_path "
 
 	count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)