X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Frunall.sh;fp=tests%2Frunall.sh;h=0adbb2e4bb709863b4a4207db7a607602449fb6f;hp=5e1c0f537a8113a337237513e3977710b7a66760;hb=355f483d1713d1e047ad6256bea039cb693ae38e;hpb=0e4cbe7e2c4c6a8343e710a3b050af8c33f95e21

diff --git a/tests/runall.sh b/tests/runall.sh
index 5e1c0f537..0adbb2e4b 100755
--- a/tests/runall.sh
+++ b/tests/runall.sh
@@ -19,11 +19,7 @@
 
 #### ADD TESTS HERE ####
 
-# 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 )
+tests=( kernel/runall.sh ust/runall.sh tools/runall.sh )
 
 #### END TESTS HERE ####
 
@@ -31,35 +27,9 @@ 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[@]};
+## lttng-tools unit tests ##
+# No session daemon needed
+for bin in ${tests[@]};
 do
 	if [ ! -e $bin ]; then
 		echo -e "$bin not found, passing"
@@ -71,11 +41,9 @@ do
 	if [ $? -ne 0 ]; then
 		echo -e '\e[1;31mFAIL\e[0m'
 		echo ""
-		stop_sessiond
 		exit 1
 	fi
 done
 
-echo ""
-stop_sessiond
+# All passed
 exit 0