X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Frunall.sh;h=5e1c0f537a8113a337237513e3977710b7a66760;hb=fa072eae902cbc001ec8406d52a3a6903eb77441;hp=b0ae4fd4cf7b07eb3056dc794cbb16fb15b602e3;hpb=897b8e238be8ce71c0d484c31155fc8390cda6f0;p=lttng-tools.git

diff --git a/tests/runall.sh b/tests/runall.sh
index b0ae4fd4c..5e1c0f537 100755
--- a/tests/runall.sh
+++ b/tests/runall.sh
@@ -19,20 +19,63 @@
 
 #### ADD TESTS HERE ####
 
-test_suite=( test_sessions test_kernel_data_trace )
+# A spawned session daemon is needed for those tests
+test_with_sessiond=( lttng/runall.sh ust-nevents/run ust-nprocesses/run )
+
+# No session daemon needed
+test_no_sessiond=( test_sessions test_kernel_data_trace test_ust_data_trace )
 
 #### END TESTS HERE ####
 
-for bin in ${test_suite[@]};
+TESTDIR=$(dirname $0)
+
+source $TESTDIR/utils.sh
+
+## NO Session daemon ##
+for bin in ${test_no_sessiond[@]};
+do
+	if [ ! -e $bin ]; then
+		echo -e "$bin not found, passing"
+		continue
+	fi
+
+	./$bin
+	# Test must return 0 to pass.
+	if [ $? -ne 0 ]; then
+		echo -e '\e[1;31mFAIL\e[0m'
+		echo ""
+		exit 1
+	fi
+done
+
+# With session daemon
+start_sessiond
+out=$?
+if [ $out -eq 2 ]; then
+	# Kernel version is not compatible.
+	exit 0
+elif [ $out -ne 0 ]; then
+	echo "NOT bad $?"
+	exit 1
+fi
+
+for bin in ${test_with_sessiond[@]};
 do
+	if [ ! -e $bin ]; then
+		echo -e "$bin not found, passing"
+		continue
+	fi
+
 	./$bin
 	# Test must return 0 to pass.
 	if [ $? -ne 0 ]; then
 		echo -e '\e[1;31mFAIL\e[0m'
 		echo ""
+		stop_sessiond
 		exit 1
 	fi
 done
 
 echo ""
+stop_sessiond
 exit 0