Tests: use babeltrace2 for all tests

[lttng-tools.git] / tests / regression / ust / buffers-pid / test_buffers_pid

diff --git a/tests/regression/ust/buffers-pid/test_buffers_pid b/tests/regression/ust/buffers-pid/test_buffers_pid
index 59f218c85090ac6320778854eb616f399835fae3..982ee2d58dff73a25f7c0f4a41589634b317d601 100755 (executable)
--- a/tests/regression/ust/buffers-pid/test_buffers_pid
+++ b/tests/regression/ust/buffers-pid/test_buffers_pid
@@ -64,8 +64,8 @@ test_after_multiple_apps() {
 test_before_multiple_apps() {
        local out
        local i
-       local file_sync_after_first=$(mktemp -u)
-       local file_sync_before_last=$(mktemp -u)
+       local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+       local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
        diag "Start multiple applications BEFORE tracing is started"
 
@@ -98,7 +98,7 @@ test_before_multiple_apps() {
                rm -f ${file_sync_before_last}_${i}
        done
 
-       out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l)
+       out=$("$BABELTRACE_BIN" $TRACE_PATH | grep $EVENT_NAME | wc -l)
        if [ $out -eq 0 ]; then
                fail "Trace validation"
                diag "No event(s) found. We are supposed to have at least one."
@@ -137,8 +137,8 @@ test_after_app() {
 
 test_before_app() {
        local out
-       local file_sync_after_first=$(mktemp -u)
-       local file_sync_before_last=$(mktemp -u)
+       local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+       local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
        diag "Start application BEFORE tracing is started"
 
@@ -165,7 +165,7 @@ test_before_app() {
        rm -f ${file_sync_after_first}
        rm -f ${file_sync_before_last}
 
-       out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l)
+       out=$("$BABELTRACE_BIN" $TRACE_PATH | grep $EVENT_NAME | wc -l)
        if [ $out -eq 0 ]; then
                fail "Trace validation"
                diag "No event(s) found. We are supposed to have at least one."
@@ -222,6 +222,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 TESTS=(
        "test_before_app"
        "test_after_app"
@@ -236,7 +238,7 @@ i=0
 start_lttng_sessiond
 
 while [ $i -lt $TEST_COUNT ]; do
-       TRACE_PATH=$(mktemp -d)
+       TRACE_PATH=$(mktemp --tmpdir -d tmp.test_buffers_pid_trace_path.XXXXXX)
        ${TESTS[$i]}
        rm -rf $TRACE_PATH
        let "i++"