Fix: mark generated python bindings files as nodist

[lttng-tools.git] / tests / ust / before-after / run

diff --git a/tests/ust/before-after/run b/tests/ust/before-after/run
index 9b165282171a7bbb92fab9888a673170d6ff8873..46b97f4433159ac7b8f449310f9edf82ec6c1aec 100755 (executable)
--- a/tests/ust/before-after/run
+++ b/tests/ust/before-after/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 - Start tracing before and after execution"
 
 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 - Star tracing before and after execution"
-echo -e "----------------------------------------------------"
+print_test_banner "$TEST_DESC"
 
 if [ ! -x "$CURDIR/gen-nevents" ]; then
        echo -e "No UST nevents binary detected. Passing."
@@ -40,12 +39,13 @@ test_before_apps() {
        # BEFORE application is spawned
        create_lttng_session $SESSION_NAME $TRACE_PATH
        enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-       start_tracing $SESSION_NAME
+       start_lttng_tracing $SESSION_NAME
        # Start test
        echo -n "Starting application... "
        ./$CURDIR/gen-nevents $NR_ITER
-       echo -e "Ended \e[1;32mOK\e[0m"
-       stop_tracing $SESSION_NAME
+       echo -n "Ended "
+       print_ok
+       stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
@@ -58,27 +58,27 @@ test_after_apps() {
 
        echo -n "Starting application... "
        ./$CURDIR/gen-nevents 100 &
-       echo -e "\e[1;32mOK\e[0m"
+       print_ok
 
        # BEFORE application is spawned
        create_lttng_session $SESSION_NAME $TRACE_PATH
        enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-       start_tracing $SESSION_NAME
+       start_lttng_tracing $SESSION_NAME
 
        # At least hit one event
        sleep 2
 
-       stop_tracing $SESSION_NAME
+       stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l)
        if [ $out -eq 0 ]; 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). Coherent... "
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
                out=0
        fi
 
@@ -87,7 +87,7 @@ test_after_apps() {
 
 # MUST set TESTDIR before calling those functions
 
-start_sessiond
+start_lttng_sessiond
 
 echo ""
 echo "=== Start application BEFORE tracing was started ==="
@@ -97,7 +97,7 @@ TRACE_PATH=$(mktemp -d)
 test_before_apps
 out=$?
 if [ $out -ne 0 ]; then
-       stop_sessiond
+       stop_lttng_sessiond
        exit $out
 fi
 
@@ -111,10 +111,10 @@ TRACE_PATH=$(mktemp -d)
 test_after_apps
 out=$?
 if [ $out -ne 0 ]; then
-       stop_sessiond
+       stop_lttng_sessiond
        exit $out
 fi
 
-stop_sessiond
+stop_lttng_sessiond
 
 rm -rf $TRACE_PATH