Fix UST tests if lttng-ust is not available

[lttng-tools.git] / tests / runall.sh

diff --git a/tests/runall.sh b/tests/runall.sh
index b0ae4fd4cf7b07eb3056dc794cbb16fb15b602e3..08b3904838d1408e54a7c2474cc952be27349e9d 100755 (executable)
--- a/tests/runall.sh
+++ b/tests/runall.sh
@@ -19,20 +19,37 @@
 
 #### ADD TESTS HERE ####
 
-test_suite=( test_sessions test_kernel_data_trace )
+test_suite=( test_sessions test_kernel_data_trace test_ust_data_trace
+                       lttng/runall.sh ust-nevents/run ust-nprocesses/run )
 
 #### END TESTS HERE ####
 
+TESTDIR=$(dirname $0)
+
+source $TESTDIR/utils.sh
+
+start_sessiond
+if [ $? -ne 0 ]; then
+       exit 1
+fi
+
 for bin in ${test_suite[@]};
 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