X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=fe552830cf5d89b9e73e29e13f6e2e96b0d5a04c;hp=a1a26d9df00a67c761ece45efd5ad8eba4f987f7;hb=d53addeb964039ae2f544de1d7d452fb5ad6da69;hpb=e02b109ba0132f2c715fdb9db55cbdf8f8203749

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index a1a26d9df..fe552830c 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -20,6 +20,7 @@ CONSUMERD_BIN="lttng-consumerd"
 RELAYD_BIN="lttng-relayd"
 LTTNG_BIN="lttng"
 BABELTRACE_BIN="babeltrace"
+OUTPUT_DEST=/dev/null 2>&1
 
 # Minimal kernel version supported for session daemon tests
 KERNEL_MAJOR_VERSION=2
@@ -50,13 +51,13 @@ function print_fail ()
 
 function print_test_banner ()
 {
-	desc="$1"
+	local desc="$1"
 	diag "$desc"
 }
 
 function validate_kernel_version ()
 {
-	kern_version=($(uname -r | awk -F. '{ printf("%d.%d.%d\n",$1,$2,$3); }' | tr '.' '\n'))
+	local 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
@@ -81,9 +82,9 @@ function randstring()
 
 function lttng_enable_kernel_event
 {
-	sess_name=$1
-	event_name=$2
-	channel_name=$3
+	local sess_name=$1
+	local event_name=$2
+	local channel_name=$3
 
 	if [ -z $event_name ]; then
 		# Enable all event if no event name specified
@@ -97,7 +98,7 @@ function lttng_enable_kernel_event
 		chan="-c $channel_name"
 	fi
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -k >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -k >$OUTPUT_DEST
 	ok $? "Enable kernel event $event_name for session $sess_name"
 }
 
@@ -108,7 +109,7 @@ function start_lttng_relayd
 	DIR=$(readlink -f $TESTDIR)
 
 	if [ -z $(pidof lt-$RELAYD_BIN) ]; then
-		$DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt >/dev/null 2>&1
+		$DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt >$OUTPUT_DEST
 		#$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
 		if [ $? -eq 1 ]; then
 			fail "Start lttng-relayd (opt: $opt)"
@@ -126,7 +127,7 @@ function stop_lttng_relayd_nocheck
 	PID_RELAYD=`pidof lt-$RELAYD_BIN`
 
 	diag "Killing lttng-relayd (pid: $PID_RELAYD)"
-	kill $PID_RELAYD >/dev/null 2>&1
+	kill $PID_RELAYD >$OUTPUT_DEST
 	retval=$?
 
 	if [ $retval -eq 1 ]; then
@@ -152,8 +153,11 @@ function stop_lttng_relayd
 	fi
 }
 
+#First argument: load path for automatic loading
 function start_lttng_sessiond()
 {
+
+	local load_path="$1"
 	if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
 		# Env variable requested no session daemon
 		return
@@ -166,9 +170,16 @@ function start_lttng_sessiond()
 	fi
 
 	DIR=$(readlink -f $TESTDIR)
+	: ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/}
+	export LTTNG_SESSION_CONFIG_XSD_PATH
 
 	if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
-		$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"
+		# Have a load path ?
+		if [ -n "$1" ]; then
+			$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$1" --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-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"
+		fi
 		#$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --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=$?
 		ok $status "Start session daemon"
@@ -184,7 +195,7 @@ function stop_lttng_sessiond ()
 
 	PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
 
-	kill $PID_SESSIOND >/dev/null 2>&1
+	kill $PID_SESSIOND >$OUTPUT_DEST
 
 	if [ $? -eq 1 ]; then
 		fail "Kill sessions daemon"
@@ -204,64 +215,86 @@ function stop_lttng_sessiond ()
 	fi
 }
 
+function list_lttng_with_opts ()
+{
+	local opts=$1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN list $opts >$OUTPUT_DEST
+	ok $? "Lttng-tool list command with option $opts"
+}
+
 function create_lttng_session_no_output ()
 {
-	sess_name=$1
+	local sess_name=$1
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output >$OUTPUT_DEST
 	ok $? "Create session $sess_name in no-output mode"
 }
 
 function create_lttng_session ()
 {
-	sess_name=$1
-	trace_path=$2
+	local sess_name=$1
+	local trace_path=$2
+	local expected_to_fail=$3
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path >/dev/null 2>&1
-	ok $? "Create session $sess_name in $trace_path"
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path > $OUTPUT_DEST
+	ret=$?
+	if [[ $expected_to_fail ]]; then
+		test "$ret" -ne "0"
+		ok $? "Expected fail on session creation $sess_name in $trace_path"
+	else
+		ok $ret "Create session $sess_name in $trace_path"
+	fi
 }
 
 function enable_ust_lttng_channel()
 {
-	sess_name=$1
-	channel_name=$2
+	local sess_name=$1
+	local channel_name=$2
+	local expect_fail=$3
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name >/dev/null 2>&1
-	ok $? "Enable channel $channel_name for session $sess_name"
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
+	ret=$?
+	if [[ $expect_fail ]]; then
+		test "$ret" -ne "0"
+		ok $? "Expected fail on ust channel creation $channel_name in $sess_name"
+	else
+		ok $ret "Enable channel $channel_name for session $sess_name"
+	fi
 }
 
 function disable_ust_lttng_channel()
 {
-	sess_name=$1
-	channel_name=$2
+	local sess_name=$1
+	local channel_name=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -u $channel_name -s $sess_name >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
 	ok $? "Disable channel $channel_name for session $sess_name"
 }
 
 function enable_lttng_mmap_overwrite_kernel_channel()
 {
-	sess_name=$1
-	channel_name=$2
+	local sess_name=$1
+	local channel_name=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --overwrite >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --overwrite >$OUTPUT_DEST
 	ok $? "Enable channel $channel_name for session $sess_name"
 }
 
 function enable_lttng_mmap_overwrite_ust_channel()
 {
-	sess_name=$1
-	channel_name=$2
+	local sess_name=$1
+	local channel_name=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -u --output mmap --overwrite >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -u --output mmap --overwrite >$OUTPUT_DEST
 	ok $? "Enable channel $channel_name for session $sess_name"
 }
 
 function enable_ust_lttng_event ()
 {
-	sess_name=$1
-	event_name="$2"
-	channel_name=$3
+	local sess_name=$1
+	local event_name="$2"
+	local channel_name=$3
+	local expected_to_fail=$4
 
 	if [ -z $channel_name ]; then
 		# default channel if none specified
@@ -270,8 +303,14 @@ function enable_ust_lttng_event ()
 		chan="-c $channel_name"
 	fi
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u >/dev/null 2>&1
-	ok $? "Enable event $event_name for session $sess_name"
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u >$OUTPUT_DEST
+	ret=$?
+	if [[ $expected_to_fail ]]; then
+		test $ret -ne "0"
+		ok $? "Enable ust event $event_name for session $session_name on channel $channel_name failed as expected"
+	else
+		ok $ret "Enable event $event_name for session $sess_name"
+	fi
 }
 
 function enable_jul_lttng_event()
@@ -287,16 +326,16 @@ function enable_jul_lttng_event()
 		chan="-c $channel_name"
 	fi
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -j >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -j >$OUTPUT_DEST
 	ok $? "Enable JUL event $event_name for session $sess_name"
 }
 
 function enable_jul_lttng_event_loglevel()
 {
-	sess_name=$1
-	event_name="$2"
-	loglevel=$3
-	channel_name=$4
+	local sess_name=$1
+	local event_name="$2"
+	local loglevel=$3
+	local channel_name=$4
 
 	if [ -z $channel_name ]; then
 		# default channel if none specified
@@ -305,107 +344,171 @@ function enable_jul_lttng_event_loglevel()
 		chan="-c $channel_name"
 	fi
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -j >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -j >$OUTPUT_DEST
 	ok $? "Enable JUL event $event_name for session $sess_name with loglevel $loglevel"
 }
 
 function enable_ust_lttng_event_filter()
 {
-	sess_name="$1"
-	event_name="$2"
-	filter="$3"
+	local sess_name="$1"
+	local event_name="$2"
+	local filter="$3"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter" >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter" >$OUTPUT_DEST
 	ok $? "Enable event $event_name with filtering for session $sess_name"
 }
 
 function enable_ust_lttng_event_loglevel()
 {
-	sess_name="$1"
-	event_name="$2"
-	loglevel="$3"
+	local sess_name="$1"
+	local event_name="$2"
+	local loglevel="$3"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel $loglevel >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel $loglevel >$OUTPUT_DEST
 	ok $? "Enable event $event_name with loglevel $loglevel"
 }
 
 function enable_ust_lttng_event_loglevel_only()
 {
-	sess_name="$1"
-	event_name="$2"
-	loglevel="$3"
+	local sess_name="$1"
+	local event_name="$2"
+	local loglevel="$3"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel >$OUTPUT_DEST
 	ok $? "Enable event $event_name with loglevel-only $loglevel"
 }
 
 function disable_ust_lttng_event ()
 {
-	sess_name="$1"
-	event_name="$2"
+	local sess_name="$1"
+	local event_name="$2"
+	local channel_name="$3"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -u >/dev/null 2>&1
+	if [ -z $channel_name ]; then
+		# default channel if none specified
+		chan=""
+	else
+		chan="-c $channel_name"
+	fi
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name $chan -u >$OUTPUT_DEST
 	ok $? "Disable event $event_name for session $sess_name"
 }
 
+function disable_jul_lttng_event ()
+{
+	local sess_name="$1"
+	local event_name="$2"
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -j >/dev/null 2>&1
+	ok $? "Disable JUL event $event_name for session $sess_name"
+}
+
 function start_lttng_tracing ()
 {
-	sess_name=$1
+	local sess_name=$1
+	local expected_to_fail=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >/dev/null 2>&1
-	ok $? "Start tracing for session $sess_name"
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >$OUTPUT_DEST
+	ret=$?
+	if [[ $expected_to_fail ]]; then
+		test "$ret" -ne "0"
+		ok $? "Expected fail on start tracing for session: $sess_name"
+	else
+		ok $ret "Start tracing for session $sess_name"
+	fi
 }
 
 function stop_lttng_tracing ()
 {
-	sess_name=$1
+	local sess_name=$1
+	local expected_to_fail=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >/dev/null 2>&1
-	ok $? "Stop lttng tracing for session $sess_name"
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >$OUTPUT_DEST
+	ret=$?
+	if [[ $expected_to_fail ]]; then
+		test "$ret" -ne "0"
+		ok $? "Expected fail on stop tracing for session: $sess_name"
+	else
+		ok $ret "Stop lttng tracing for session $sess_name"
+	fi
 }
 
 function destroy_lttng_session ()
 {
-	sess_name=$1
+	local sess_name=$1
+	local expected_to_fail=$2
 
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >$OUTPUT_DEST
+	ret=$?
+	if [[ $expected_to_fail ]]; then
+		test "$ret" -ne "0"
+		ok $? "Expected fail on session deletion $sess_name"
+	else
+		ok $ret "Destroy session $sess_name"
+	fi
+}
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >/dev/null 2>&1
-	ok $? "Destroy lttng session $sess_name"
+function destroy_lttng_sessions ()
+{
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all >$OUTPUT_DEST
+	ok $? "Destroy all lttng sessions"
 }
 
 function lttng_snapshot_add_output ()
 {
-	sess_name=$1
-	trace_path=$2
+	local sess_name=$1
+	local trace_path=$2
+	local expected_to_fail=$3
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path >/dev/null 2>&1
-	ok $? "Added snapshot output file://$trace_path"
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path >$OUTPUT_DEST
+	ret=$?
+	if [[ $expected_to_fail ]]; then
+		test "$ret" -ne "0"
+		ok $? "Failed to add a  snapshot output file://$trace_path as expected"
+	else
+		ok $ret "Added snapshot output file://$trace_path"
+	fi
 }
 
 function lttng_snapshot_del_output ()
 {
 	local sess_name=$1
 	local id=$2
+	local expected_to_fail=$3
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id >/dev/null 2>&1
-	ok $? "Deleted snapshot output id $id"
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id >$OUTPUT_DEST
+	ret=$?
+	if [[ $expected_to_fail ]]; then
+		test "$ret" -ne "0"
+		ok $? "Expect fail on deletion of snapshot output id $id"
+	else
+		ok $ret "Deleted snapshot output id $id"
+	fi
 }
 
 function lttng_snapshot_record ()
 {
-	sess_name=$1
-	trace_path=$2
+	local sess_name=$1
+	local trace_path=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name >$OUTPUT_DEST
 	ok $? "Snapshot recorded"
 }
 
+function lttng_snapshot_list ()
+{
+	local sess_name=$1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot list-output -s $sess_name >$OUTPUT_DEST
+	ok $? "Snapshot list"
+}
+
 function lttng_save()
 {
 	local sess_name=$1
 	local opts=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts >$OUTPUT_DEST
 	ok $? "Session successfully saved"
 }
 
@@ -413,20 +516,20 @@ function lttng_load()
 {
 	local opts=$1
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts >$OUTPUT_DEST
 	ok $? "Load command successful"
 }
 
 function trace_matches ()
 {
-	event_name=$1
-	nr_iter=$2
-	trace_path=$3
+	local event_name=$1
+	local nr_iter=$2
+	local trace_path=$3
 
 	which $BABELTRACE_BIN >/dev/null
 	skip $? -ne 0 "Babeltrace binary not found. Skipping trace matches"
 
-	count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)
+	local count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)
 
 	if [ "$count" -ne "$nr_iter" ]; then
 		fail "Trace match"
@@ -436,10 +539,30 @@ function trace_matches ()
 	fi
 }
 
+function trace_match_only()
+{
+	local event_name=$1
+	local nr_iter=$2
+	local trace_path=$3
+
+	which $BABELTRACE_BIN >/dev/null
+	skip $? -ne 0 "Babeltrace binary not found. Skipping trace matches"
+
+	local count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)
+	local total=$($BABELTRACE_BIN $trace_path | wc -l)
+
+    if [ "$nr_iter" -eq "$count" ] && [ "$total" -eq "$nr_iter" ]; then
+        pass "Trace match with $total event $event_name"
+    else
+        fail "Trace match"
+        diag "$total event(s) found, expecting $nr_iter of event $event_name and only found $count"
+    fi
+}
+
 function validate_trace
 {
-	event_name=$1
-	trace_path=$2
+	local event_name=$1
+	local trace_path=$2
 
 	which $BABELTRACE_BIN >/dev/null
 	if [ $? -ne 0 ]; then