X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=88a4ddd20c30216d6f19ea07b4160df998cb3c9b;hp=d0f76bc6f678adff8375397f673b1e89d95162be;hb=c8e000ef6be08c492f79b51b9752e5d8b9b26d59;hpb=65e663fa0c098f8f8ddd0f0f3d91dbd25d1daa4d

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index d0f76bc6f..88a4ddd20 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -1604,18 +1604,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 +1856,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()