X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Ftest_lttng_kernel;h=2fcd147b30ce92c043187a9e63bebc7cc46a8905;hb=d6431f8e4894c48cbc70ec1af96b6d87508834a2;hp=f4d7d419f2ef0dffbd674abc462ff3866221ba56;hpb=1b368955ffa0497c25b3d769a7259409cbb9233c;p=lttng-tools.git

diff --git a/tests/regression/tools/live/test_lttng_kernel b/tests/regression/tools/live/test_lttng_kernel
index f4d7d419f..2fcd147b3 100755
--- a/tests/regression/tools/live/test_lttng_kernel
+++ b/tests/regression/tools/live/test_lttng_kernel
@@ -20,13 +20,10 @@ TEST_DESC="Live - Kernel space tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
-SESSIOND_BIN="lttng-sessiond"
-RELAYD_BIN="lttng-relayd"
-LTTNG_BIN="lttng"
 DELAY_USEC=2000000
 
 SESSION_NAME="live"
-EVENT_NAME="sched_switch"
+EVENT_NAME="lttng_test_filter_event"
 
 TRACE_PATH=$(mktemp -d)
 
@@ -49,13 +46,13 @@ function setup_live_tracing()
 	ok $? "Create session in live mode with delay $DELAY_USEC"
 
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 }
 
 function clean_live_tracing()
 {
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 # Need root access for kernel tracing.
@@ -67,13 +64,14 @@ fi
 
 skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
 {
+	modprobe lttng-test
+
 	start_lttng_sessiond
 	start_lttng_relayd "-o $TRACE_PATH"
 
 	setup_live_tracing
 
-	# Just hit some events
-	sleep 2
+	echo -n "1" > /proc/lttng-test-filter-event
 
 	clean_live_tracing
 
@@ -82,4 +80,6 @@ skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
 
 	stop_lttng_relayd
 	stop_lttng_sessiond
+
+	modprobe --remove lttng-test
 }