Tests: use babeltrace2 for all tests

[lttng-tools.git] / tests / regression / tools / live / test_lttng_ust

diff --git a/tests/regression/tools/live/test_lttng_ust b/tests/regression/tools/live/test_lttng_ust
index e292cde6d2c50c3d730c9efc47a0b9aa19092b24..3aa1083b0518da95fe5d3e9f86dc2b3fa7ab71a8 100755 (executable)
--- a/tests/regression/tools/live/test_lttng_ust
+++ b/tests/regression/tools/live/test_lttng_ust
@@ -19,7 +19,7 @@ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="live"
 EVENT_NAME="tp:tptest"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp --tmpdir -d tmp.test_test_live_lttng_ust_trace_path.XXXXXX)
 
 DIR=$(readlink -f $TESTDIR)
 
@@ -32,6 +32,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 function test_custom_url()
 {
        # Create session with custom URL
@@ -62,7 +64,6 @@ start_lttng_relayd "-o $TRACE_PATH"
 
 setup_live_tracing
 
-# Run app in background
 $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT >/dev/null 2>&1
 
 clean_live_tracing