X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fstreaming%2Ftest_kernel;h=d099f693b3fed6438e9675fd0574cc133bf7469d;hb=03f66fb8271904c7bca9d3cfd5b3cf1d9c4e5221;hp=5718201b8bec515e13c46741dc009554b4b74b72;hpb=e563bbdb8fa6592790e9ac4e9db7d9decf022023;p=lttng-tools.git

diff --git a/tests/regression/tools/streaming/test_kernel b/tests/regression/tools/streaming/test_kernel
index 5718201b8..d099f693b 100755
--- a/tests/regression/tools/streaming/test_kernel
+++ b/tests/regression/tools/streaming/test_kernel
@@ -19,7 +19,6 @@ TEST_DESC="Streaming - Kernel tracing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="sched_switch"
-PID_RELAYD=0
 SESSION_NAME=""
 
 TRACE_PATH=$(mktemp -d)
@@ -28,30 +27,16 @@ NUM_TESTS=10
 
 source $TESTDIR/utils/utils.sh
 
-# LTTng kernel modules check
-out=`ls /lib/modules/$(uname -r)/extra | grep lttng`
-if [ -z "$out" ]; then
-	BAIL_OUT "LTTng modules not detected."
-fi
-
-function lttng_create_session_uri
-{
-	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
-
-	ok $? "Create session $SESSION_NAME"
-}
-
 function test_kernel_before_start ()
 {
 	diag "Test kernel streaming with event enable BEFORE start"
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
 	start_lttng_tracing_ok $SESSION_NAME
 	# Give a second
 	sleep 1
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 # Deactivated since this feature is not yet available where we can enable
@@ -59,13 +44,13 @@ function test_kernel_before_start ()
 function test_kernel_after_start ()
 {
 	diag "Test kernel streaming with event enable AFTER start"
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	start_lttng_tracing_ok $SESSION_NAME
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
 	# Give a second
 	sleep 1
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 plan_tests $NUM_TESTS
@@ -80,6 +65,8 @@ fi
 
 skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_TESTS ||
 {
+	validate_lttng_modules_present
+
 	start_lttng_relayd "-o $TRACE_PATH"
 	start_lttng_sessiond