X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=0583b5c1999b757595e430b1032b493851564136;hb=759bfaad8fa2ab638035e495ce1a68df9747f1cc;hp=b326c5bcf94166358e341217078aa1721bb2c8e7;hpb=f2489409aa5ac1d21a40790399f1218c93227491;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index b326c5bcf..0583b5c19 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
@@ -1860,7 +1869,9 @@ function validate_directory_empty ()
 {
 	local trace_path="$1"
 
-	files="$(ls -A "$trace_path")"
+	# 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\""