Generate session name and default output on sessiond's end

[lttng-tools.git] / tests / regression / tools / snapshots / test_kernel_streaming

diff --git a/tests/regression/tools/snapshots/test_kernel_streaming b/tests/regression/tools/snapshots/test_kernel_streaming
index aa4c5b558af68d095e9dae5902989f37cfa2ce7c..3fa37eb1ab226105ff8608d43805005cada6ac33 100755 (executable)
--- a/tests/regression/tools/snapshots/test_kernel_streaming
+++ b/tests/regression/tools/snapshots/test_kernel_streaming
@@ -19,22 +19,15 @@ TEST_DESC="Streaming - Snapshot Kernel tracing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="sched_switch"
-PID_RELAYD=0
 SESSION_NAME=""
 CHANNEL_NAME="chan1"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=36
+NUM_TESTS=61
 
 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
@@ -62,17 +55,17 @@ function test_kernel_default_name_with_del()
        lttng_snapshot_record $SESSION_NAME
 
        # Validate test
-       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
+       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
        if [ $? -ne 0 ]; then
                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
 
        # Validate test with the next ID since a del output was done prior.
-       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-2*
+       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-2*
        if [ $? -ne 0 ]; then
                return $?
        fi
@@ -96,7 +89,7 @@ function test_kernel_default_name()
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
        # Validate test
-       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
+       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
        out=$?
 
        return $out
@@ -118,10 +111,10 @@ function test_kernel_custom_name()
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
 
-       if ls $TRACE_PATH/$HOSTNAME/$name* &> /dev/null; then
+       if ls $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/$name* &> /dev/null; then
                ok 0 "Custom name snapshot exists"
                # Validate test
-               validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$name-*
+               validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/$name-*
                out=$?
        else
                fail "No custom name snapshot found"
@@ -131,6 +124,32 @@ function test_kernel_custom_name()
        return $out
 }
 
+function test_kernel_n_snapshot()
+{
+       diag "Test kernel snapshot streaming multiple consecutive snapshot"
+       create_lttng_session_no_output $SESSION_NAME
+       enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
+       lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       snapshot_add_output $SESSION_NAME "net://localhost"
+
+       for i in {1..5};
+       do
+               start_lttng_tracing_ok $SESSION_NAME
+               lttng_snapshot_record $SESSION_NAME
+               stop_lttng_tracing_ok $SESSION_NAME
+               validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
+               if [ $? -ne 0 ]; then
+                       return 1
+               fi
+               set -u
+               rm -rf $TRACE_PATH/$HOSTNAME
+               set +u
+       done
+
+       destroy_lttng_session_ok $SESSION_NAME
+       return 0
+}
+
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
@@ -143,11 +162,16 @@ 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
 
-       tests=( test_kernel_default_name test_kernel_custom_name \
-                       test_kernel_default_name_with_del )
+       tests=( test_kernel_default_name
+               test_kernel_custom_name
+               test_kernel_default_name_with_del
+               test_kernel_n_snapshot
+       )
 
        for fct_test in ${tests[@]};
        do