Add UST test for n events using validation

[lttng-tools.git] / tests / lttng / run-ust-global-tests.sh

diff --git a/tests/lttng/run-ust-global-tests.sh b/tests/lttng/run-ust-global-tests.sh
index bfcb974bf22c67566dd6d6ed7d1e712f39e167ba..135c8a2b4311f88c35f09e428ab1557a16eaa86c 100755 (executable)
--- a/tests/lttng/run-ust-global-tests.sh
+++ b/tests/lttng/run-ust-global-tests.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 SESSIOND_BIN="lttng-sessiond"
+TESTDIR=$(dirname $0)/..
+
+source $TESTDIR/utils.sh
 
 tmpdir=`mktemp -d`
 tests=( ust_global_event_basic ust_global_all_events_basic )
@@ -16,27 +19,16 @@ function start_tests ()
             exit_code=1
             break
         fi
-               # Cleaning up
-               rm -rf $tmpdir
     done
+
+       # Cleaning up
+       rm -rf $tmpdir
 }
 
 echo -e "\n-------------------------------------------"
-echo -e "UST tracer - GLOBAL DOMAIN (LTTNG_DOMAIN_UST)"
+echo -e "UST tracer - Global domain (LTTNG_DOMAIN_UST)"
 echo -e "---------------------------------------------"
 
-if [ -z $(pidof $SESSIOND_BIN) ]; then
-       echo -n "Starting session daemon... "
-       ../lttng-sessiond/$SESSIOND_BIN --daemonize --quiet
-       if [ $? -eq 1 ]; then
-               echo -e '\e[1;31mFAILED\e[0m'
-               rm -rf $tmpdir
-               exit 1
-       else
-               echo -e "\e[1;32mOK\e[0m"
-       fi
-fi
-
 PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
 
 # Simply wait for the session daemon bootstrap
@@ -44,12 +36,4 @@ sleep 1
 
 start_tests
 
-echo -e -n "\nKilling session daemon... "
-kill $PID_SESSIOND >/dev/null 2>&1
-if [ $? -eq 1 ]; then
-    echo -e '\e[1;31mFAILED\e[0m'
-else
-    echo -e "\e[1;32mOK\e[0m"
-fi
-
 exit $exit_code