Use compiler-agnostic defines to silence warning

[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..f9ece05b8d1fab2f26825799b7eec2b7ca787d02 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=$(TMPDIR="$TRACE_PATH" mktemp -t ctf-metadata.XXXXXX)
+       local clock_metadata_file=$(TMPDIR="$TRACE_PATH" mktemp -t clock-metadata.XXXXXX)
        local result=""
 
        diag "Clock override plugin metadata test"
@@ -87,7 +87,7 @@ function test_clock_override_metadata()
        local TRACE_METADATA_FILE_PATH="$(find "$TRACE_PATH" -name metadata -type f)"
        local TRACE_METADATA_DIR="$(dirname "$TRACE_METADATA_FILE_PATH")"
 
-       $BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_METADATA_DIR
+       _run_babeltrace_cmd -o ctf-metadata -w $ctf_metadata_file $TRACE_METADATA_DIR
        ok $? "Metadata extraction from babeltrace"
 
        extract_clock_metadata $ctf_metadata_file $clock_metadata_file
@@ -126,7 +126,7 @@ function test_clock_override_timestamp()
 
        # Use Babeltrace with "-n all" to give a comma separated list for
        # easy extraction of timestamps.
-       unique_timestamps_count=$($BABELTRACE_BIN -n all $TRACE_PATH | \
+       unique_timestamps_count=$(_run_babeltrace_cmd -n all $TRACE_PATH | \
                cut -d, -f1 | uniq | wc -l)
        test $unique_timestamps_count -gt 1
        ok $? "Unique event timestamps without clock override: $unique_timestamps_count expect >1"
@@ -149,11 +149,11 @@ function test_clock_override_timestamp()
        destroy_lttng_session_ok $SESSION_NAME
 
        stop_lttng_sessiond
-       modprobe --remove lttng-clock-plugin-test lttng-clock lttng-test
+       modprobe --remove lttng-test lttng-clock-plugin-test lttng-clock
 
        # Use Babeltrace with "-n all" to give a comma separated list for
        # easy extraction of timestamps.
-       unique_timestamps_count=$($BABELTRACE_BIN -n all $TRACE_PATH | \
+       unique_timestamps_count=$(_run_babeltrace_cmd -n all $TRACE_PATH | \
                cut -d, -f1 | uniq | wc -l)
        test $unique_timestamps_count -eq 1
        ok $? "Unique event timestamps with clock override: $unique_timestamps_count expect 1"
@@ -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"
@@ -172,19 +174,14 @@ TESTS=(
 TEST_COUNT=${#TESTS[@]}
 i=0
 
-if [ "$(id -u)" == "0" ]; then
-       isroot=1
-else
-       isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
+check_skip_kernel_test "$NUM_TESTS" "Skipping all tests." ||
 {
+       validate_lttng_modules_present
        trap signal_cleanup SIGTERM SIGINT
 
        while [ "$i" -lt "$TEST_COUNT" ]; do
 
-               TRACE_PATH=$(mktemp -d)
+               TRACE_PATH=$(mktemp -d -t tmp.test_clock_override_trace_path.XXXXXX)
 
                # Execute test
                ${TESTS[$i]}