X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Ftest_kernel_streaming;h=e80e78a8cf64650c94f6507c6f7a05be63356bca;hb=3a1744008331a0604479d3d7461f77056fad3a64;hp=3fa37eb1ab226105ff8608d43805005cada6ac33;hpb=b178f53e90c376dd44b020535c32649edef8f80e;p=lttng-tools.git

diff --git a/tests/regression/tools/snapshots/test_kernel_streaming b/tests/regression/tools/snapshots/test_kernel_streaming
index 3fa37eb1a..e80e78a8c 100755
--- 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)/
@@ -22,9 +12,9 @@ EVENT_NAME="sched_switch"
 SESSION_NAME=""
 CHANNEL_NAME="chan1"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d -t tmp.test_snapshots_kernel_streaming_trace_path.XXXXXX)
 
-NUM_TESTS=61
+NUM_TESTS=66
 
 source $TESTDIR/utils/utils.sh
 
@@ -137,6 +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_path_kernel_snapshot_network "$TRACE_PATH" "$SESSION_NAME" "snapshot-1" $(( i - 1 )) ""
 		validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
 		if [ $? -ne 0 ]; then
 			return 1
@@ -154,13 +145,7 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-if [ "$(id -u)" == "0" ]; then
-	isroot=1
-else
-	isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_TESTS ||
+check_skip_kernel_test $NUM_TESTS "Skipping all tests." ||
 {
 	validate_lttng_modules_present