X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_callstack;h=ad506b5534f603e67153d1d7a28fd3cc3bd0512f;hp=b5759d442d1670f158e01ec4603eca4a884cd13a;hb=c125de8f5c0dc9ba3ada63e9317e468ffb9e335a;hpb=53f8be7a05e14be1d0bebc8575d0e5ce394111b2 diff --git a/tests/regression/kernel/test_callstack b/tests/regression/kernel/test_callstack index b5759d442..ad506b553 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,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 }