X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Ftools%2Fstreaming%2Frun-ust;h=1c415cc70b44eb2f1436c6b7ce55f47b52b375b5;hp=0689201621e30d6ecd300c889105491389c851a4;hb=c38b5107fcb9435ea7584e82f6c61319a9391fc0;hpb=f4e40ab68a515750cdde6877b53fafb5210ceac6

diff --git a/tests/tools/streaming/run-ust b/tests/tools/streaming/run-ust
index 068920162..1c415cc70 100755
--- a/tests/tools/streaming/run-ust
+++ b/tests/tools/streaming/run-ust
@@ -14,6 +14,7 @@
 # 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
+TEST_DESC="Streaming - User space tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
@@ -22,11 +23,11 @@ SESSION_NAME="stream"
 EVENT_NAME="tp:tptest"
 PID_RELAYD=0
 
+TRACE_PATH=$(mktemp -d)
+
 source $TESTDIR/utils.sh
 
-echo -e "\n-------------------------------"
-echo -e " Streaming - User space tracing "
-echo -e "--------------------------------"
+print_test_banner "$TEST_DESC"
 
 if [ ! -x "$CURDIR/$BIN_NAME" ]; then
 	echo -e "No UST nevents binary detected. Passing."
@@ -42,7 +43,7 @@ function lttng_create_session
 function lttng_enable_consumer
 {
 	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-consumer -u net://localhost/test >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-consumer -u net://localhost >/dev/null 2>&1
 }
 
 function wait_apps
@@ -91,7 +92,7 @@ function test_ust_after_start ()
 }
 
 start_sessiond
-lttng_start_relayd
+lttng_start_relayd "-o $TRACE_PATH"
 
 tests=( test_ust_before_start test_ust_after_start )
 
@@ -101,11 +102,10 @@ do
 	${fct_test}
 
 	# Validate test
-	validate_trace $EVENT_NAME ~/lttng-traces/$HOSTNAME/$SESSION_NAME*
+	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
-		rm -rf ~/lttng-traces/$HOSTNAME/$SESSION_NAME*
-		rm -rf ~/lttng-traces/$SESSION_NAME*
+		rm -rf $TRACE_PATH
 	else
 		break
 	fi