X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=4b081a48ba365198b68a8873ae5964f0c1fb202c;hb=eb82f91d0a44a7c51781d261a6b50d804246ff1e;hp=21212bc8a010505a17528e45dde7a3584cc2c8ab;hpb=312dabc3ec56987e3c92ecf7cdfb037abe1ec4fb;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 21212bc8a..4b081a48b 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -51,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
@@ -82,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
@@ -153,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
@@ -171,7 +174,12 @@ function start_lttng_sessiond()
 	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"
@@ -209,14 +217,14 @@ function stop_lttng_sessiond ()
 
 function list_lttng_with_opts ()
 {
-	opts=$1
+	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 >$OUTPUT_DEST
 	ok $? "Create session $sess_name in no-output mode"
@@ -224,18 +232,15 @@ function create_lttng_session_no_output ()
 
 function create_lttng_session ()
 {
-	sess_name=$1
-	trace_path=$2
-	expected_to_fail=$3
+	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 > $OUTPUT_DEST
 	ret=$?
 	if [[ $expected_to_fail ]]; then
-		if [[ $ret ]]; then
-			pass "Expected fail on session creation $sess_name in $trace_path"
-		else
-			fail "Session $sess_name creation in $trace_path was expected to fail"
-		fi
+		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
@@ -243,18 +248,15 @@ function create_lttng_session ()
 
 function enable_ust_lttng_channel()
 {
-	sess_name=$1
-	channel_name=$2
-	expect_fail=$3
+	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 >$OUTPUT_DEST
 	ret=$?
 	if [[ $expect_fail ]]; then
-		if [[ $ret ]]; then
-			pass "Enable channel $channel_name for session $sess_name expected fail"
-		else
-			fail "Enable channel $channel_name for session $sess_name did not fail as expected"
-		fi
+		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
@@ -262,8 +264,8 @@ function enable_ust_lttng_channel()
 
 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 >$OUTPUT_DEST
 	ok $? "Disable channel $channel_name for session $sess_name"
@@ -271,8 +273,8 @@ function disable_ust_lttng_channel()
 
 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 >$OUTPUT_DEST
 	ok $? "Enable channel $channel_name for session $sess_name"
@@ -280,8 +282,8 @@ function enable_lttng_mmap_overwrite_kernel_channel()
 
 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 >$OUTPUT_DEST
 	ok $? "Enable channel $channel_name for session $sess_name"
@@ -289,9 +291,10 @@ function enable_lttng_mmap_overwrite_ust_channel()
 
 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
@@ -301,7 +304,13 @@ function enable_ust_lttng_event ()
 	fi
 
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u >$OUTPUT_DEST
-	ok $? "Enable event $event_name for session $sess_name"
+	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()
@@ -323,10 +332,10 @@ function enable_jul_lttng_event()
 
 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
@@ -341,9 +350,9 @@ function enable_jul_lttng_event_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" >$OUTPUT_DEST
 	ok $? "Enable event $event_name with filtering for session $sess_name"
@@ -351,9 +360,9 @@ function enable_ust_lttng_event_filter()
 
 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 >$OUTPUT_DEST
 	ok $? "Enable event $event_name with loglevel $loglevel"
@@ -361,9 +370,9 @@ function enable_ust_lttng_event_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 >$OUTPUT_DEST
 	ok $? "Enable event $event_name with loglevel-only $loglevel"
@@ -371,10 +380,18 @@ function enable_ust_lttng_event_loglevel_only()
 
 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 >$OUTPUT_DEST
+	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"
 }
 
@@ -389,26 +406,47 @@ function disable_jul_lttng_event ()
 
 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 >$OUTPUT_DEST
-	ok $? "Start tracing for session $sess_name"
+	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 >$OUTPUT_DEST
-	ok $? "Stop lttng tracing for session $sess_name"
+	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
-	ok $? "Destroy lttng session $sess_name"
+	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
 }
 
 function destroy_lttng_sessions ()
@@ -419,31 +457,52 @@ function destroy_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 >$OUTPUT_DEST
-	ok $? "Added snapshot output file://$trace_path"
+	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 >$OUTPUT_DEST
-	ok $? "Deleted snapshot output id $id"
+	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 >$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
@@ -463,14 +522,14 @@ function lttng_load()
 
 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"
@@ -482,8 +541,8 @@ function trace_matches ()
 
 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