Use LTTNG_TEST_TRACE_FORMAT from env to chose the session trace format

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

diff --git a/tests/regression/tools/live/test_kernel b/tests/regression/tools/live/test_kernel
index 58fe34936d287e46b29fec76594a7944b7b7771b..8a948d82410effac5d5e9f7374426dce14086723 100755 (executable)
--- a/tests/regression/tools/live/test_kernel
+++ b/tests/regression/tools/live/test_kernel
@@ -25,7 +25,7 @@ source $TESTDIR/utils/utils.sh
 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
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$EVENT_NAME" -s $SESSION_NAME -k >/dev/null 2>&1
@@ -43,7 +43,7 @@ function clean_live_tracing()
 if [ "$(id -u)" == "0" ]; then
        isroot=1
 else
-       echo "Root access is needed. Skipping all tests."
+       plan_skip_all "Root access is needed. Skipping all tests."
        exit 0
 fi