Tests: use babeltrace2 for all tests

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

diff --git a/tests/regression/kernel/test_clock_override b/tests/regression/kernel/test_clock_override
index 4b185db89f7e4ef9808575b44cc237c7f7e16cc4..9dcde73d821e2939ddb2efcf39370b71becca5af 100755 (executable)
--- a/tests/regression/kernel/test_clock_override
+++ b/tests/regression/kernel/test_clock_override
@@ -64,8 +64,8 @@ function extract_clock_metadata_token()
 
 function test_clock_override_metadata()
 {
-       local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXXX)
-       local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXXX)
+       local ctf_metadata_file=$(mktemp --tmpdir -p $TRACE_PATH ctf-metadata.XXXXXX)
+       local clock_metadata_file=$(mktemp --tmpdir -p $TRACE_PATH clock-metadata.XXXXXX)
        local result=""
 
        diag "Clock override plugin metadata test"
@@ -164,6 +164,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 TESTS=(
        "test_clock_override_metadata"
        "test_clock_override_timestamp"
@@ -184,7 +186,7 @@ skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
 
        while [ "$i" -lt "$TEST_COUNT" ]; do
 
-               TRACE_PATH=$(mktemp -d)
+               TRACE_PATH=$(mktemp --tmpdir -d tmp.test_clock_override_trace_path.XXXXXX)
 
                # Execute test
                ${TESTS[$i]}