X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fregen-statedump%2Ftest_kernel;h=e9932122ceea16c27b31d37e462766b5ec7ad7ad;hb=962971d24e31ba0a82094e1786a2bfce124cc29f;hp=85afe76a18756782626c1cc50dee66af5cf403f9;hpb=54cd6107ba9eacbe6e54292293698a8d2d5083c7;p=lttng-tools.git

diff --git a/tests/regression/tools/regen-statedump/test_kernel b/tests/regression/tools/regen-statedump/test_kernel
index 85afe76a1..e9932122c 100755
--- a/tests/regression/tools/regen-statedump/test_kernel
+++ b/tests/regression/tools/regen-statedump/test_kernel
@@ -19,7 +19,6 @@ TEST_DESC="Regenerate the statedump - Kernel tracing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="lttng_test_filter_event"
-PID_RELAYD=0
 SESSION_NAME=""
 EVENT_NAME="lttng_statedump_start,lttng_statedump_end"
 
@@ -29,12 +28,6 @@ NUM_TESTS=11
 
 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 test_kernel_local ()
 {
 	diag "Test kernel local with statedump regeneration"
@@ -64,6 +57,7 @@ fi
 
 skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_TESTS ||
 {
+	validate_lttng_modules_present
 	start_lttng_sessiond
 	modprobe lttng-test
 
@@ -75,6 +69,6 @@ skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_
 		${fct_test}
 	done
 
-	rmmod lttng-test
+	modprobe --remove lttng-test
 	stop_lttng_sessiond
 }