SoW-2020-0002: Trace Hit Counters: trigger error reporting integration

[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 0b535c612c41f624d01aae2bd97200daed8d66e7..544c2e4db1a4dfdea57654a97b8e9aa079e2fccc 100755 (executable)
--- a/tests/regression/tools/snapshots/test_kernel_streaming
+++ b/tests/regression/tools/snapshots/test_kernel_streaming
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2013 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# SPDX-License-Identifier: LGPL-2.1-only
+
 TEST_DESC="Streaming - Snapshot Kernel tracing"
 
 CURDIR=$(dirname $0)/
@@ -55,7 +45,7 @@ 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
@@ -65,7 +55,7 @@ function test_kernel_default_name_with_del()
        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
@@ -89,7 +79,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
@@ -111,10 +101,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"
@@ -137,7 +127,7 @@ function test_kernel_n_snapshot()
                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*
+               validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
                if [ $? -ne 0 ]; then
                        return 1
                fi
@@ -160,7 +150,7 @@ else
        isroot=0
 fi
 
-skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_TESTS ||
+skip $isroot "Root access is needed. Skipping all kernel streaming tests" $NUM_TESTS ||
 {
        validate_lttng_modules_present