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 5e4a8d882539f211801d9d5a1137a027a276cc95..8a948d82410effac5d5e9f7374426dce14086723 100755 (executable)
--- a/tests/regression/tools/live/test_kernel
+++ b/tests/regression/tools/live/test_kernel
@@ -14,9 +14,9 @@ NR_USEC_WAIT=1
 DELAY_USEC=2000000
 
 SESSION_NAME="live"
-EVENT_NAME="sched_switch"
+EVENT_NAME="lttng_test_filter_event"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp --tmpdir -d tmp.test_live_kernel_trace_path.XXXXXX)
 
 DIR=$(readlink -f $TESTDIR)
 
@@ -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,15 +43,19 @@ 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
 
+modprobe lttng-test
+
 start_lttng_sessiond_notap
 start_lttng_relayd_notap "-o $TRACE_PATH"
 
 setup_live_tracing
 
+echo -n "1" > /proc/lttng-test-filter-event
+
 # Start the live test
 $TESTDIR/regression/tools/live/live_test
 
@@ -59,3 +63,5 @@ clean_live_tracing
 
 stop_lttng_relayd_notap
 stop_lttng_sessiond_notap
+
+modprobe --remove lttng-test