X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fstress%2Ftest_multi_sessions_per_uid_5app_streaming;h=4203ac30ee1210e61d7eadc97fc9cdf76f957414;hb=55c9e7cac24318259d4f2549c97f7577b7b52db4;hp=3d355822476b1ecf57180d1d4ff01968db088dcf;hpb=db7b260cfaefc5c9065650ac21bfe21c2e401192;p=lttng-tools.git

diff --git a/tests/stress/test_multi_sessions_per_uid_5app_streaming b/tests/stress/test_multi_sessions_per_uid_5app_streaming
index 3d3558224..4203ac30e 100755
--- a/tests/stress/test_multi_sessions_per_uid_5app_streaming
+++ b/tests/stress/test_multi_sessions_per_uid_5app_streaming
@@ -40,15 +40,6 @@ function enable_channel_per_uid()
     ok $? "Enable channel $channel_name per UID for session $sess_name"
 }
 
-function lttng_create_session_uri
-{
-	local name=$1
-
-	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $name -U net://localhost >/dev/null 2>&1
-	ok $? "Create session on net://localhost"
-}
-
 function check_sessiond()
 {
 	if [ -z "$(pgrep --full lt-lttng-sessiond)" ]; then
@@ -79,8 +70,6 @@ function check_relayd()
 
 function start_sessiond()
 {
-	local SESSIOND_BIN="lttng-sessiond"
-
 	validate_kernel_version
 	if [ $? -ne 0 ]; then
 		fail "Start session daemon"
@@ -99,7 +88,6 @@ function start_sessiond()
 function start_relayd
 {
 	local opt=$1
-	local RELAYD_BIN="lttng-relayd"
 
 	if [ -z $(pgrep --full lt-$RELAYD_BIN) ]; then
 		$TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >$LOG_FILE_RELAYD 2>&1 &
@@ -111,7 +99,7 @@ test_stress()
 {
 	for b in $(seq 1 $NR_LOOP); do
 		for a in $(seq 1 $NR_SESSION); do
-			lttng_create_session_uri $SESSION_NAME-$a
+			create_lttng_session_uri $SESSION_NAME-$a net://localhost
 			check_sessiond
 			check_relayd
 			enable_channel_per_uid $SESSION_NAME-$a $CHANNEL_NAME
@@ -154,11 +142,10 @@ function sighandler()
 {
 	cleanup
 	rm $LOG_FILE_SESSIOND $LOG_FILE_RELAYD
-	exit 1
+	full_cleanup
 }
 
-trap sighandler SIGINT
-trap sighandler SIGTERM
+trap sighandler SIGINT SIGTERM
 
 # Make sure we collect a coredump if possible.
 ulimit -c unlimited