X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fstreaming%2Ftest_ust;h=27f6b679bc551abc8fdfa92677bc63b3031e4cd0;hb=8ab63dfb6a51460c9744828f7248d0fdca602ad3;hp=2d5d0ca5b07352d4538453be2f8c952d270df927;hpb=6c4a91d639747f260ab46decebc50998ef063712;p=lttng-tools.git

diff --git a/tests/regression/tools/streaming/test_ust b/tests/regression/tools/streaming/test_ust
index 2d5d0ca5b..27f6b679b 100755
--- a/tests/regression/tools/streaming/test_ust
+++ b/tests/regression/tools/streaming/test_ust
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2012 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 - User space tracing"
 
 CURDIR=$(dirname $0)/
@@ -26,9 +16,9 @@ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="stream"
 EVENT_NAME="tp:tptest"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d -t tmp.test_streaming_ust_trace_path.XXXXXX)
 
-NUM_TESTS=16
+NUM_TESTS=18
 
 source $TESTDIR/utils/utils.sh
 
@@ -40,7 +30,7 @@ fi
 
 function test_ust_before_start ()
 {
-	local file_sync_before_last=$(mktemp -u)
+	local file_sync_before_last=$(mktemp -u -t "tmp.test_${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
 	diag "Test UST streaming BEFORE tracing starts"
 	create_lttng_session_uri $SESSION_NAME net://localhost
@@ -63,7 +53,7 @@ function test_ust_before_start ()
 
 function test_ust_after_start ()
 {
-	local file_sync_after_first=$(mktemp -u)
+	local file_sync_after_first=$(mktemp -u -t "tmp.test_${FUNCNAME[0]}_sync_after_first.XXXXXX")
 
 	diag "Test UST streaming AFTER tracing starts"
 	create_lttng_session_uri $SESSION_NAME net://localhost
@@ -89,6 +79,7 @@ function test_ust_after_start ()
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
+bail_out_if_no_babeltrace
 
 start_lttng_relayd "-o $TRACE_PATH"
 start_lttng_sessiond
@@ -101,6 +92,7 @@ do
 	${fct_test}
 
 	# Validate test
+	validate_trace_path_ust_uid_network "$TRACE_PATH" "$SESSION_NAME"
 	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
 	if [ $? -eq 0 ]; then
 		# Only delete if successful