Use LTTNG_TEST_TRACE_FORMAT from env to chose the session trace format

[deliverable/lttng-tools.git] / tests / regression / tools / live / test_lttng_kernel

diff --git a/tests/regression/tools/live/test_lttng_kernel b/tests/regression/tools/live/test_lttng_kernel
index 010ff855ac141e33eaf8bb18cbc49ec096db0f8a..93d1ebef3014cd70be8c524ea2833d284abde54c 100755 (executable)
--- a/tests/regression/tools/live/test_lttng_kernel
+++ b/tests/regression/tools/live/test_lttng_kernel
@@ -14,7 +14,7 @@ DELAY_USEC=2000000
 SESSION_NAME="live"
 EVENT_NAME="lttng_test_filter_event"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp --tmpdir -d tmp.test_lttng_live_kernel_trace_path.XXXXXX)
 
 DIR=$(readlink -f $TESTDIR)
 
@@ -30,7 +30,7 @@ print_test_banner "$TEST_DESC"
 function setup_live_tracing()
 {
        # Create session with default path
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --live $DELAY_USEC \
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create --trace-format="$TRACE_FORMAT_OUTPUT" $SESSION_NAME --live $DELAY_USEC \
                -U net://localhost >/dev/null 2>&1
        ok $? "Create session in live mode with delay $DELAY_USEC"