X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=0b126a706d3a4da30cc1576875626b2224af09e1;hb=5ebb1a9f8a0d73add742caaad62eea795274f1fa;hp=d156f17dad99b81685c2c0f36760767c485f618b;hpb=4e8ea4fa44fb7646f023f985d45035d1561720d8;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index d156f17da..0b126a706 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -900,7 +900,14 @@ function create_lttng_session ()
 	local trace_path=$4
 	local opt=$5
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path $opt > $OUTPUT_DEST
+	if [ -z "$trace_path" ]; then
+		# Use lttng-sessiond default output.
+		trace_path=""
+	else
+		trace_path="-o $trace_path"
+	fi
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create "$sess_name" $trace_path $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
 	ret=$?
 	if [ $expected_to_fail -eq "1" ]; then
 		test "$ret" -ne "0"
@@ -1796,7 +1803,7 @@ function regenerate_statedump ()
 		test "$ret" -ne "0"
 		ok $? "Expected fail on regenerate statedump $sess_name"
 	else
-		ok $ret "Metadata regenerate $sess_name"
+		ok $ret "Statedump regenerate $sess_name"
 	fi
 }