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

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

diff --git a/tests/regression/tools/streaming/test_kernel b/tests/regression/tools/streaming/test_kernel
index 42df7b0d50c00fbe8f0effc4a0d4b1cff737ad7f..a2289e053a84494218016e99558ffdfbe1b78276 100755 (executable)
--- a/tests/regression/tools/streaming/test_kernel
+++ b/tests/regression/tools/streaming/test_kernel
@@ -24,43 +24,20 @@ SESSION_NAME=""
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=11
+NUM_TESTS=10
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
-# 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 $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        # Give a second
        sleep 1
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
-
-       # We can not predict _yet_ when the trace is available so we have to do a
-       # arbitratry sleep to validate the trace.
-       diag "Wait 3 seconds for the trace to be written on disk"
-       for i in `seq 1 3`; do
-               sleep 1
-       done
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 }
 
 # Deactivated since this feature is not yet available where we can enable
@@ -68,17 +45,19 @@ function test_kernel_before_start ()
 function test_kernel_after_start ()
 {
        diag "Test kernel streaming with event enable AFTER start"
-       lttng_create_session_uri
-       start_lttng_tracing $SESSION_NAME
+       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
 
+print_test_banner "$TEST_DESC"
+
 if [ "$(id -u)" == "0" ]; then
        isroot=1
 else
@@ -87,8 +66,10 @@ fi
 
 skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_TESTS ||
 {
-       start_lttng_sessiond
+       validate_lttng_modules_present
+
        start_lttng_relayd "-o $TRACE_PATH"
+       start_lttng_sessiond
 
        tests=( test_kernel_before_start )