[lttng-dev] [PATCH lttng-tools 1/2] Tests: take multiple snapshots in streaming mode

[Jérémie Galarneau]

Both patches of this series were merged all the way to 2.9.

Thanks!
Jérémie

On Thu, 7 Feb 2019 at 20:25, Jonathan Rajotte
<jonathan.rajotte-julien at efficios.com> wrote:
>
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
> ---
>  .../tools/snapshots/test_kernel_streaming     | 35 ++++++++++++++++--
>  .../tools/snapshots/test_ust_streaming        | 36 +++++++++++++++++--
>  2 files changed, 66 insertions(+), 5 deletions(-)
>
> diff --git a/tests/regression/tools/snapshots/test_kernel_streaming b/tests/regression/tools/snapshots/test_kernel_streaming
> index 06e0a5c4a..0b535c612 100755
> --- a/tests/regression/tools/snapshots/test_kernel_streaming
> +++ b/tests/regression/tools/snapshots/test_kernel_streaming
> @@ -24,7 +24,7 @@ CHANNEL_NAME="chan1"
>
>  TRACE_PATH=$(mktemp -d)
>
> -NUM_TESTS=36
> +NUM_TESTS=61
>
>  source $TESTDIR/utils/utils.sh
>
> @@ -124,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/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"
> @@ -141,8 +167,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 c97813e40..20d4f7f6b 100755
> --- a/tests/regression/tools/snapshots/test_ust_streaming
> +++ b/tests/regression/tools/snapshots/test_ust_streaming
> @@ -31,7 +31,7 @@ APPS_PID=
>
>  TRACE_PATH=$(mktemp -d)
>
> -NUM_TESTS=49
> +NUM_TESTS=75
>
>  source $TESTDIR/utils/utils.sh
>
> @@ -206,6 +206,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"
> @@ -219,7 +246,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
> --
> 2.17.1
>


-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com