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

diff --git a/tests/utils.sh b/tests/utils.sh
index 352a19837..f0a2e25dd 100644
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/src/bin/bash
 #
 # Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
 #
@@ -19,11 +19,42 @@ SESSIOND_BIN="lttng-sessiond"
 LTTNG_BIN="lttng"
 BABELTRACE_BIN="babeltrace"
 
-function start_sessiond ()
+# Minimal kernel version supported for session daemon tests
+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'))
+	if [ ${kern_version[0]} -gt $KERNEL_MAJOR_VERSION ]; then
+		return 0
+	fi
+	if [ ${kern_version[1]} -gt $KERNEL_MINOR_VERSION ]; then
+		return 0
+	fi
+	if [ ${kern_version[2]} -ge $KERNEL_PATCHLEVEL_VERSION ]; then
+		return 0
+	fi
+	return 1
+}
+
+function spawn_sessiond ()
 {
-	if [ -z $(pidof $SESSIOND_BIN) ]; then
-		echo -n "Starting session daemon... "
-		$TESTDIR/../lttng-sessiond/$SESSIOND_BIN --daemonize --quiet
+	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
+
+	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
@@ -31,10 +62,39 @@ function start_sessiond ()
 			echo -e "\e[1;32mOK\e[0m"
 		fi
 	fi
+
+	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... "
@@ -53,7 +113,7 @@ function create_lttng_session ()
 	trace_path=$2
 
 	echo -n "Creating lttng session $SESSION_NAME in $TRACE_PATH "
-	$TESTDIR/../lttng/$LTTNG_BIN create $sess_name -o $trace_path >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path >/dev/null 2>&1
 	if [ $? -eq 1 ]; then
 		echo -e "\e[1;31mFAILED\e[0m"
 		return 1
@@ -69,7 +129,7 @@ function enable_ust_lttng_event ()
 	event_name=$2
 
 	echo -n "Enabling lttng event $event_name for session $sess_name "
-	$TESTDIR/../lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u >/dev/null 2>&1
 	if [ $? -eq 1 ]; then
 		echo -e '\e[1;31mFAILED\e[0m'
 		return 1
@@ -83,7 +143,7 @@ function start_tracing ()
 	sess_name=$1
 
 	echo -n "Start lttng tracing for session $sess_name "
-	$TESTDIR/../lttng/$LTTNG_BIN start $sess_name >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >/dev/null 2>&1
 	if [ $? -eq 1 ]; then
 		echo -e '\e[1;31mFAILED\e[0m'
 		return 1
@@ -97,7 +157,7 @@ function stop_tracing ()
 	sess_name=$1
 
 	echo -n "Stop lttng tracing for session $sess_name "
-	$TESTDIR/../lttng/$LTTNG_BIN stop $sess_name >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >/dev/null 2>&1
 	if [ $? -eq 1 ]; then
 		echo -e '\e[1;31mFAILED\e[0m'
 		return 1
@@ -111,7 +171,7 @@ function destroy_lttng_session ()
 	sess_name=$1
 
 	echo -n "Destroy lttng session $sess_name "
-	$TESTDIR/../lttng/$LTTNG_BIN destroy $sess_name >/dev/null 2>&1 
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >/dev/null 2>&1
 	if [ $? -eq 1 ]; then
 		echo -e '\e[1;31mFAILED\e[0m'
 		return 1
@@ -126,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)