X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils.sh;h=24defc7f8d67c7172ef37c73cb4e60f673845623;hp=2d8b46a834b72f6e393cdb89406602f098ff5ad2;hb=b3e122872d4f6464ebcbc341b4fa4108c8a9d4a5;hpb=2e6a03f64e7643a9bcca11ed2301e4ac2ac6ef7b

diff --git a/tests/utils.sh b/tests/utils.sh
index 2d8b46a83..24defc7f8 100644
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -45,7 +45,7 @@ function spawn_sessiond ()
 	echo -n "Starting session daemon... "
 	validate_kernel_version
 	if [ $? -ne 0 ]; then
-		echo -e "\n*** Kernel to old for session daemon tests ***\n"
+		echo -e "\n*** Kernel too old for session daemon tests ***\n"
 		return 2
 	fi
 
@@ -101,6 +101,11 @@ function stop_sessiond ()
 		echo -e "\e[1;31mFAILED\e[0m"
 		return 1
 	else
+		out=1
+		while [ -n "$out" ]; do
+			out=$(pidof lt-$SESSIOND_BIN)
+			sleep 0.5
+		done
 		echo -e "\e[1;32mOK\e[0m"
 	fi
 }
@@ -110,7 +115,7 @@ function create_lttng_session ()
 	sess_name=$1
 	trace_path=$2
 
-	echo -n "Creating lttng session $sess_name in $trace_path"
+	echo -n "Creating lttng session $sess_name in $trace_path "
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path >/dev/null 2>&1
 	if [ $? -eq 1 ]; then
 		echo -e "\e[1;31mFAILED\e[0m"