X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Ftest_kernel_streaming;h=06e0a5c4a6eb52fc5ae51e4c4084050255a1e9d3;hb=c4a29317fe4eddfd4a779906a108f5779683843f;hp=aa4c5b558af68d095e9dae5902989f37cfa2ce7c;hpb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00;p=lttng-tools.git

diff --git a/tests/regression/tools/snapshots/test_kernel_streaming b/tests/regression/tools/snapshots/test_kernel_streaming
index aa4c5b558..06e0a5c4a 100755
--- a/tests/regression/tools/snapshots/test_kernel_streaming
+++ b/tests/regression/tools/snapshots/test_kernel_streaming
@@ -19,7 +19,6 @@ TEST_DESC="Streaming - Snapshot Kernel tracing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="sched_switch"
-PID_RELAYD=0
 SESSION_NAME=""
 CHANNEL_NAME="chan1"
 
@@ -29,12 +28,6 @@ NUM_TESTS=36
 
 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 snapshot_add_output ()
 {
 	local sess_name=$1
@@ -67,7 +60,7 @@ function test_kernel_default_name_with_del()
 		return $?
 	fi
 
-	lttng_snapshot_del_output $SESSION_NAME 1
+	lttng_snapshot_del_output_ok $SESSION_NAME 1
 	snapshot_add_output $SESSION_NAME "net://localhost"
 	lttng_snapshot_record $SESSION_NAME
 
@@ -143,6 +136,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