X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Frunall.sh;h=0adbb2e4bb709863b4a4207db7a607602449fb6f;hp=a1db92d70317ae2f53895a0e03069ce546f20041;hb=8acbe07dff3442a327b08e1398fadfde3ace77c3;hpb=6e0ca3c2c2afedf4a944cec63a6a566f7014c93f

diff --git a/tests/runall.sh b/tests/runall.sh
index a1db92d70..0adbb2e4b 100755
--- a/tests/runall.sh
+++ b/tests/runall.sh
@@ -4,8 +4,8 @@
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# as published by the Free Software Foundation; only version 2
+# of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,39 +17,33 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-TEST_DIR=$(dirname $0)
-
-failed=0
-num_test=1
+#### ADD TESTS HERE ####
 
-function run() {
-	printf "%d) Running test $@\n" $num_test
-	echo "=================================="
+tests=( kernel/runall.sh ust/runall.sh tools/runall.sh )
 
-	# Running test
-	./$@
-	if [ $? -ne 0 ]; then
-		let failed=$failed+1
-		printf "\nTest $@ FAILED\n\n"
-	else
-		printf "\nTest $@ PASSED\n\n"
-	fi
+#### END TESTS HERE ####
 
-	let num_test=$num_test+1
-}
+TESTDIR=$(dirname $0)
 
-#### ADD TESTS HERE ####
+source $TESTDIR/utils.sh
 
-run ltt-sessiond/run.sh
-
-#### END TESTS HERE ####
+## lttng-tools unit tests ##
+# No session daemon needed
+for bin in ${tests[@]};
+do
+	if [ ! -e $bin ]; then
+		echo -e "$bin not found, passing"
+		continue
+	fi
 
-echo "--------------------------"
-if [ $failed -eq 0 ]; then
-	echo "All passed!"
-else
-	echo "$failed tests failed"
-fi
-echo "--------------------------"
+	./$bin
+	# Test must return 0 to pass.
+	if [ $? -ne 0 ]; then
+		echo -e '\e[1;31mFAIL\e[0m'
+		echo ""
+		exit 1
+	fi
+done
 
+# All passed
 exit 0