Tests: take multiple snapshots in streaming mode

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/regression/tools/snapshots/test_kernel_streaming b/tests/regression/tools/snapshots/test_kernel_streaming
index 7653bd9f970923d47aea71a5dcd22a96edc5b487..7b96ef27072157d1010e278c8a09e7224d551985 100755 (executable)
--- a/tests/regression/tools/snapshots/test_kernel_streaming
+++ b/tests/regression/tools/snapshots/test_kernel_streaming
@@ -25,7 +25,7 @@ CHANNEL_NAME="chan1"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=36
+NUM_TESTS=61
 
 source $TESTDIR/utils/utils.sh
 
@@ -131,6 +131,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/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"
@@ -146,8 +172,11 @@ skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_
        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

diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming
index 9c416648c11b66023ab70312a32db8a3af560653..93b0957f3e8d28650c0e0f576d973ba416bb6447 100755 (executable)
--- a/tests/regression/tools/snapshots/test_ust_streaming
+++ b/tests/regression/tools/snapshots/test_ust_streaming
@@ -32,7 +32,7 @@ APPS_PID=
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=49
+NUM_TESTS=75
 
 source $TESTDIR/utils/utils.sh
 
@@ -207,6 +207,33 @@ function test_ust_custom_name()
        return $out
 }
 
+function test_ust_n_snapshot()
+{
+       diag "Test ust snapshot streaming multiple consecutive snapshot"
+       create_lttng_session_no_output $SESSION_NAME
+       enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       snapshot_add_output $SESSION_NAME "net://localhost" $name
+       start_test_app
+       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/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
+       stop_test_apps
+       return 0
+}
+
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
@@ -220,7 +247,12 @@ fi
 start_lttng_relayd "-o $TRACE_PATH"
 start_lttng_sessiond
 
-tests=( test_ust_default_name_with_del test_ust_default_name test_ust_custom_name test_ust_default_name_custom_uri )
+tests=( test_ust_default_name_with_del
+       test_ust_default_name
+       test_ust_custom_name
+       test_ust_default_name_custom_uri
+       test_ust_n_snapshot
+)
 
 for fct_test in ${tests[@]};
 do