X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_callstack;h=9e554bbc0d538859ac1bf94d8d0174292210b733;hb=f46376a14da2eb796690cb4e718e8b213839d6ea;hp=b5759d442d1670f158e01ec4603eca4a884cd13a;hpb=33e557114a2ba28e26e220a833e8a449c78b8b65;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_callstack b/tests/regression/kernel/test_callstack
index b5759d442..9e554bbc0 100755
--- a/tests/regression/kernel/test_callstack
+++ b/tests/regression/kernel/test_callstack
@@ -134,6 +134,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 if [ "$(id -u)" == "0" ]; then
 	isroot=1
 else
@@ -142,18 +144,14 @@ fi
 
 skip $isroot "Root access is needed. Skipping all tests." "$NUM_TESTS" ||
 {
-	which "$BABELTRACE_BIN" > /dev/null
-	test $? -ne 0
-	skip $? "Babeltrace binary not found. Skipping callstack tests" "$NUM_TESTS" ||
-	{
-		start_lttng_sessiond
+	validate_lttng_modules_present
+	start_lttng_sessiond
 
-		if test $RUN_USERSPACE_TEST == 1; then
-			test_user_callstack
-		fi
+	if test $RUN_USERSPACE_TEST == 1; then
+		test_user_callstack
+	fi
 
-		test_kernel_callstack
+	test_kernel_callstack
 
-		stop_lttng_sessiond
-	}
+	stop_lttng_sessiond
 }