X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Ftest_kernel;h=d7f04bed0275293d6b9b8ba5fff84652a4256d61;hp=3ef3b7dfd298e85dd8d42f2e0c9d66d77481f76b;hb=36e6632013ee40eabfbe50db19ebd8e606ba0204;hpb=9dc506ae3b7d654f25b8bdf905bc4ddfbe6c33dc

diff --git a/tests/regression/tools/rotation/test_kernel b/tests/regression/tools/rotation/test_kernel
index 3ef3b7dfd..d7f04bed0 100755
--- a/tests/regression/tools/rotation/test_kernel
+++ b/tests/regression/tools/rotation/test_kernel
@@ -19,30 +19,14 @@ TEST_DESC="Rotation - Kernel tracing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="lttng_test_filter_event"
-PID_RELAYD=0
-SESSION_NAME=""
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=68
+NUM_TESTS=64
 
 source $TESTDIR/utils/utils.sh
 source $CURDIR/rotate_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 rotate_kernel_test ()
 {
 	local_path=$1
@@ -64,23 +48,14 @@ function rotate_kernel_test ()
 
 	destroy_lttng_session_ok $SESSION_NAME
 
-	# The tests on the chunk folder rely on the date staying the same during
-	# the duration of the test, if this fail we will now why the other checks
-	# fail afterwards. There is a short window of time where an automated test
-	# could fail because of that.
-	now=$(date +%Y%m%d)
-	test $today = $now
-	ok $? "Date did not change during the test"
-
 	validate_test_chunks $local_path $today kernel kernel 0
 }
 
 function test_kernel_streaming ()
 {
 	diag "Test kernel streaming with session rotation"
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	rotate_kernel_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*"
-	clean_path $TRACE_PATH
 }
 
 function test_kernel_local ()
@@ -105,13 +80,12 @@ function test_kernel_local_timer ()
 function test_kernel_streaming_timer ()
 {
 	diag "Test kernel remote with session rotation timer"
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
 	lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
 	start_lttng_tracing_ok $SESSION_NAME
 
 	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 0
-	clean_path $TRACE_PATH
 }
 
 plan_tests $NUM_TESTS
@@ -126,6 +100,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
 	modprobe lttng-test
@@ -136,6 +112,7 @@ skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_
 	do
 		SESSION_NAME=$(randstring 16 0)
 		${fct_test}
+		clean_path $TRACE_PATH
 	done
 
 	rmmod lttng-test