X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fbase-path%2Ftest_ust;h=fd1a67af8147d370e62eb21d8a18b2409a29e78d;hp=84d4345510207c5104b06554b1cad564c6100fe6;hb=33e557114a2ba28e26e220a833e8a449c78b8b65;hpb=3c3c793599c40378d96b2fa135c748352c775606

diff --git a/tests/regression/tools/base-path/test_ust b/tests/regression/tools/base-path/test_ust
index 84d434551..fd1a67af8 100755
--- a/tests/regression/tools/base-path/test_ust
+++ b/tests/regression/tools/base-path/test_ust
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2019 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+# Copyright (C) 2019 Mathieu Desnoyers <mathieu.desnoyers@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 Base Path Override - User space tracing"
 
 CURDIR=$(dirname "$0")/
@@ -23,9 +13,9 @@ TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 EVENT_NAME="tp:tptest"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp --tmpdir -d tmp.test_base_path_ust_trace_path.XXXXXX)
 
-NUM_TESTS=37
+NUM_TESTS=42
 
 source "$TESTDIR/utils/utils.sh"
 
@@ -50,6 +40,7 @@ function ust_app_stream_base_path ()
 	destroy_lttng_session_ok $session_name
 
 	# validate test
+	validate_trace_path_ust_uid_network "$TRACE_PATH" "" "$base_path"
 	if validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$base_path"; then
 		# only delete if successful
 		rm -rf "$TRACE_PATH"
@@ -77,6 +68,7 @@ function ust_app_snapshot_create_base_path ()
 	destroy_lttng_session_ok $session_name
 
 	# validate test
+	validate_trace_path_ust_uid_snapshot_network "$TRACE_PATH" "" "snapshot-1" 0 "$base_path"
 	if validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$base_path"; then
 		# only delete if successful
 		rm -rf "$TRACE_PATH"
@@ -103,6 +95,7 @@ function ust_app_snapshot_base_path ()
 	destroy_lttng_session_ok $session_name
 
 	# validate test
+	validate_trace_path_ust_uid_snapshot_network "$TRACE_PATH" "" "snapshot-0" 0 "$base_path"
 	if validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$base_path"; then
 		# only delete if successful
 		rm -rf "$TRACE_PATH"
@@ -130,6 +123,7 @@ function ust_app_snapshot_add_output_base_path ()
 	destroy_lttng_session_ok $session_name
 
 	# validate test
+	validate_trace_path_ust_uid_snapshot_network "$TRACE_PATH" "" "snapshot-1" 0 "$base_path"
 	if validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$base_path"; then
 		# only delete if successful
 		rm -rf "$TRACE_PATH"
@@ -151,6 +145,7 @@ function ust_app_stream_base_path_via_load ()
 	destroy_lttng_session_ok $session_name
 
 	# validate test
+	validate_trace_path_ust_uid_network "$TRACE_PATH" "" "$base_path"
 	if validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$base_path"; then
 		# only delete if successful
 		rm -rf "$TRACE_PATH"