X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=0583b5c1999b757595e430b1032b493851564136;hp=88a4ddd20c30216d6f19ea07b4160df998cb3c9b;hb=03f1168604d69a01bb891d2c8745acbd8050a545;hpb=11a49e7e09792a8cf39b5250dde806032ce7a39b

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 88a4ddd20..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