X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=tests%2Futils%2Futils.sh;h=3ad9abe33db4ade3f20f03ebe3fffd68d2f9cac5;hb=032a3d09c1834efc9e4112cce5f5d58082db08ba;hp=d0f76bc6f678adff8375397f673b1e89d95162be;hpb=746aa688d21337d8985e9f6b13c9d2cb4ff8e424;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index d0f76bc6f..3ad9abe33 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -139,10 +139,19 @@ function conf_proc_count()
 # Bail out on failure
 function validate_lttng_modules_present ()
 {
+	# Check for loadable modules.
 	modprobe -n lttng-tracer 2>/dev/null
-	if [ $? -ne 0  ]; then
-		BAIL_OUT "LTTng modules not detected."
+	if [ $? -eq 0 ]; then
+		return 0
+	fi
+
+	# Check for builtin modules.
+	ls /proc/lttng > /dev/null 2>&1
+	if [ $? -eq 0 ]; then
+		return 0
 	fi
+
+	BAIL_OUT "LTTng modules not detected."
 }
 
 function enable_kernel_lttng_event
@@ -655,7 +664,7 @@ function stop_lttng_sessiond_opt()
 
 			if [ -n "$modules" ]; then
 				diag "Unloading all LTTng modules"
-				modprobe -r "$modules"
+				modprobe --remove "$modules"
 			fi
 		fi
 	fi
@@ -1170,8 +1179,16 @@ function enable_ust_lttng_event_filter()
 	local sess_name="$1"
 	local event_name="$2"
 	local filter="$3"
+	local channel_name=$4
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter" 1> $OUTPUT_DEST 2> $ERROR_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 enable-event $chan "$event_name" -s $sess_name -u --filter "$filter" 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
 	ok $? "Enable event $event_name with filtering for session $sess_name"
 }
 
@@ -1410,8 +1427,9 @@ function lttng_snapshot_del_output_fail ()
 function lttng_snapshot_record ()
 {
 	local sess_name=$1
+	local trace_path=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name $trace_path 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s "$sess_name" "$trace_path" 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
 	ok $? "Snapshot recorded"
 }
 
@@ -1604,18 +1622,6 @@ function add_context_kernel_fail()
 	add_context_lttng 1 -k "$@"
 }
 
-function validate_directory_empty ()
-{
-	local trace_path=$1
-
-	ls -A $local_path > /dev/null 2>&1
-	if [ $? -eq 0 ]; then
-		pass "Directory empty"
-	else
-		fail "Directory empty"
-	fi
-}
-
 function wait_live_trace_ready ()
 {
 	local url=$1
@@ -1868,17 +1874,26 @@ function validate_trace_empty()
 	return $ret
 }
 
-function validate_folder_is_empty()
+function validate_directory_empty ()
 {
-	local folder=$1
+	local trace_path="$1"
+
+	# Do not double quote `$trace_path` below as we want wildcards to be
+	# expanded.
+	files="$(ls -A $trace_path)"
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		fail "Failed to list content of directory \"$trace_path\""
+		return $ret
+	fi
 
-	test -z "$(ls -A "$folder")"
-	ok $? "Folder ${folder} is empty"
+	nb_files="$(echo -n "$files" | wc -l)"
+	ok $nb_files "Directory \"$trace_path\" is empty"
 }
 
 function validate_trace_session_ust_empty()
 {
-	validate_folder_is_empty "$1"/ust
+	validate_directory_empty "$1"/ust
 }
 
 function validate_trace_session_kernel_empty()
@@ -1963,7 +1978,7 @@ function rotate_session_fail ()
 
 function destructive_tests_enabled ()
 {
-	if [ ${LTTNG_ENABLE_DESTRUCTIVE_TESTS} = "will-break-my-system" ]; then
+	if [ "$LTTNG_ENABLE_DESTRUCTIVE_TESTS" = "will-break-my-system" ]; then
 		return 0
 	else
 		return 1