Tests: consolidate session creation with a uri parameter in utils.sh

[lttng-tools.git] / tests / regression / tools / rotation / test_kernel

diff --git a/tests/regression/tools/rotation/test_kernel b/tests/regression/tools/rotation/test_kernel
index 93b3da1c0f0d5670dd9edc4a802cf91adae8cfc8..6f5647f373ca723e76b430ab0182d6480b55265f 100755 (executable)
--- a/tests/regression/tools/rotation/test_kernel
+++ b/tests/regression/tools/rotation/test_kernel
@@ -29,20 +29,6 @@ NUM_TESTS=68
 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
@@ -78,9 +64,9 @@ function rotate_kernel_test ()
 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}*"
-       rm -rf ${TRACE_PATH}/${HOSTNAME}
+       clean_path $TRACE_PATH
 }
 
 function test_kernel_local ()
@@ -105,13 +91,13 @@ 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
-       rm -rf ${TRACE_PATH}/${HOSTNAME}
+       clean_path $TRACE_PATH
 }
 
 plan_tests $NUM_TESTS
@@ -126,6 +112,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
@@ -142,3 +130,5 @@ skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_
        stop_lttng_sessiond
        stop_lttng_relayd
 }
+
+rm -rf $TRACE_PATH