X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils.sh;h=9f2f629b49d6ec92a7b244e8e3a2c348e64ad8a2;hb=d6ce1df2ef346f3d136e9ad62a53621d5306076d;hp=8a0640bd0e2f391f61654a530180005c83dc7c01;hpb=d4018451a4eb6c042b5ab5bb20c6ef0f812dc887;p=lttng-tools.git

diff --git a/tests/utils.sh b/tests/utils.sh
index 8a0640bd0..9f2f629b4 100644
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -24,8 +24,6 @@ KERNEL_MAJOR_VERSION=2
 KERNEL_MINOR_VERSION=6
 KERNEL_PATCHLEVEL_VERSION=27
 
-alias realpath='readlink -f'
-
 function validate_kernel_version ()
 {
 	kern_version=($(uname -r | awk -F. '{ printf("%d.%d.%d\n",$1,$2,$3); }' | tr '.' '\n'))
@@ -51,7 +49,7 @@ function spawn_sessiond ()
 		return 2
 	fi
 
-	DIR=$(realpath $TESTDIR)
+	DIR=$(readlink -f $TESTDIR)
 
 	if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
 		$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
@@ -103,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
 }
@@ -112,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"