Tests: Rename helper functions to have consistent names

[lttng-tools.git] / tests / ust / multi-session / run

diff --git a/tests/ust/multi-session/run b/tests/ust/multi-session/run
index f6dab7c65a3b5142c1028a56c99a29f3d908e777..7242fd90ea4c59b495cce063cf79850d46edb39d 100755 (executable)
--- a/tests/ust/multi-session/run
+++ b/tests/ust/multi-session/run
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+TEST_DESC="UST tracer - Multi-session"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
@@ -23,9 +24,7 @@ EVENT_NAME="ust_gen_nevents:tptest"
 
 source $TESTDIR/utils.sh
 
-echo -e "\n--------------------------"
-echo -e "UST tracer - Multi-session"
-echo -e "--------------------------"
+print_test_banner "$TEST_DESC"
 
 if [ ! -x "$CURDIR/gen-nevents" ]; then
        echo -e "No UST nevents binary detected. Passing."
@@ -41,12 +40,12 @@ test_multi_session() {
        for i in `seq 0 3`; do
                create_lttng_session "$SESSION_NAME-$i" "$TRACE_PATH/$i"
                enable_ust_lttng_event "$SESSION_NAME-$i" "$EVENT_NAME$i"
-               start_tracing "$SESSION_NAME-$i"
+               start_lttng_tracing "$SESSION_NAME-$i"
        done
 
        echo -n "Starting application generating $NR_ITER events... "
        ./$CURDIR/gen-nevents $NR_ITER &
-       echo -e "\e[1;32mOK\e[0m"
+       print_ok
 
        # At least hit one event
        echo -n "Waiting for events to record "
@@ -54,19 +53,19 @@ test_multi_session() {
                echo -n "."
                sleep 0.1
        done
-       echo -e "\e[1;32m OK\e[0m"
+       print_ok
 
        for i in `seq 0 3`; do
-               stop_tracing "$SESSION_NAME-$i"
+               stop_lttng_tracing "$SESSION_NAME-$i"
                destroy_lttng_session "$SESSION_NAME-$i"
                out=$(babeltrace "$TRACE_PATH/$i" | grep "$EVENT_NAMEi$i" | wc -l)
                if [ $out -ne $NR_ITER ]; then
                        echo -n "No event found. Suppose to have at least one... "
-                       echo -e "\e[1;31mFAILED\e[0m"
+                       print_fail
                        out=1
                else
                        echo -n "Found $out event(s) for $SESSION_NAME-$i. Coherent... "
-                       echo -e "\e[1;32mOK\e[0m"
+                       print_ok
                        out=0
                fi
        done
@@ -76,17 +75,17 @@ test_multi_session() {
 
 # MUST set TESTDIR before calling those functions
 
-start_sessiond
+start_lttng_sessiond
 
 TRACE_PATH=$(mktemp -d)
 
 test_multi_session
 out=$?
 if [ $out -ne 0 ]; then
-       stop_sessiond
+       stop_lttng_sessiond
        exit $out
 fi
 
-stop_sessiond
+stop_lttng_sessiond
 
 rm -rf "$TRACE_PATH"