X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Ftools%2Fmetadata%2Ftest_ust;h=810a226cf9fd7e3ec26d9eecc508202d3fd5d428;hb=33e557114a2ba28e26e220a833e8a449c78b8b65;hp=529b0a21153265198a7043e7643217c54acafbbe;hpb=01654d6926771be58b4350463b0f12ea2e6aa34c;p=lttng-tools.git

diff --git a/tests/regression/tools/metadata/test_ust b/tests/regression/tools/metadata/test_ust
index 529b0a211..810a226cf 100755
--- a/tests/regression/tools/metadata/test_ust
+++ b/tests/regression/tools/metadata/test_ust
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2019 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2019 Jonathan Rajotte <jonathan.rajotte-julien@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="Metadata env - User space tracing"
 
 CURDIR=$(dirname "$0")/
@@ -23,7 +13,7 @@ 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_metadata_env_ust_trace_path.XXXXXX)
 
 NUM_TESTS=37
 
@@ -41,24 +31,21 @@ fi
 
 function test_per_uid ()
 {
-	local metadata
-	local metadata_env
 	local metadata_path
 	local value
 	local value2
 
 	local expected_path="${TRACE_PATH}/lttng-traces"
 	local session_name="per-uid"
-
-	metadata=$(mktemp)
-	metadata_env=$(mktemp)
+	local metadata=$(mktemp --tmpdir tmp.test_${FUNCNAME[0]}_metadata.XXXXXX)
+	local metadata_env=$(mktemp --tmpdir tmp.test_${FUNCNAME[0]}_metadata_env.XXXXXX)
 
 	diag "Test UST metadata env field in per-uid mode"
 	create_lttng_session_ok "$session_name"
 	enable_ust_lttng_event_ok "$session_name" $EVENT_NAME
 	start_lttng_tracing_ok "$session_name"
 
-	$TESTAPP_BIN $NR_ITER
+	$TESTAPP_BIN -i $NR_ITER
 
 	stop_lttng_tracing_ok "$session_name"
 	destroy_lttng_session_ok "$session_name"
@@ -66,7 +53,7 @@ function test_per_uid ()
 	# bt1 accepts only a directory while bt2 accepts either the metadata
 	# file directly or a directory with an immediate metadata file.
 	# Settle for the common denominator.
-	metadata_path=$(find "${expected_path}/${session_name}"* | grep metadata)
+	metadata_path=$(find "${expected_path}/${session_name}"* -name "metadata")
 	metadata_path=$(dirname "$metadata_path")
 
 	$BABELTRACE_BIN --output-format=ctf-metadata "${metadata_path}" > "$metadata"
@@ -131,8 +118,6 @@ function test_per_uid ()
 
 function test_per_pid ()
 {
-	local metadata
-	local metadata_env
 	local metadata_path
 	local testapp_pid
 	local value
@@ -140,9 +125,8 @@ function test_per_pid ()
 
 	local expected_path="${TRACE_PATH}/lttng-traces"
 	local session_name="per-pid"
-
-	metadata=$(mktemp)
-	metadata_env=$(mktemp)
+	local metadata=$(mktemp --tmpdir tmp.test_${FUNCNAME[0]}_metadata.XXXXXX)
+	local metadata_env=$(mktemp --tmpdir tmp.test_${FUNCNAME[0]}_metadata_env.XXXXXX)
 
 	diag "Test UST metadata env field in per-pid mode"
 	create_lttng_session_ok "$session_name"
@@ -150,7 +134,7 @@ function test_per_pid ()
 	enable_ust_lttng_event_ok "$session_name" $EVENT_NAME channel
 	start_lttng_tracing_ok "$session_name"
 
-	$TESTAPP_BIN "$NR_ITER" "$NR_USEC_WAIT" &
+	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT &
 	testapp_pid=$!
 	wait $testapp_pid
 
@@ -160,7 +144,7 @@ function test_per_pid ()
 	# bt1 accepts only a directory while bt2 accepts either the metadata
 	# file directly or a directory with an immediate metadata file.
 	# Settle for the common denominator.
-	metadata_path=$(find "${expected_path}/${session_name}"* | grep metadata)
+	metadata_path=$(find "${expected_path}/${session_name}"* -name "metadata")
 	metadata_path=$(dirname "$metadata_path")
 
 	$BABELTRACE_BIN --output-format=ctf-metadata "${metadata_path}" 1> "$metadata"