Tests: use babeltrace2 for all tests

[lttng-tools.git] / tests / regression / kernel / test_callstack

diff --git a/tests/regression/kernel/test_callstack b/tests/regression/kernel/test_callstack
index b5759d442d1670f158e01ec4603eca4a884cd13a..ad506b5534f603e67153d1d7a28fd3cc3bd0512f 100755 (executable)
--- 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,13 @@ 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
+       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
 }