Refactor: test: wrapper for enable_ust_lttng_event

[lttng-tools.git] / tests / regression / ust / overlap / test_overlap

diff --git a/tests/regression/ust/overlap/test_overlap b/tests/regression/ust/overlap/test_overlap
index e82307251baf033466970ca1c4d672ac430124f7..ab853f31ae7b4927ccfa488bcab1ff9c6283d4ab 100755 (executable)
--- a/tests/regression/ust/overlap/test_overlap
+++ b/tests/regression/ust/overlap/test_overlap
@@ -34,8 +34,6 @@ NUM_TESTS=259
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 if [ ! -x "$CURDIR/demo/demo" ]; then
        BAIL_OUT "No UST nevents binary detected."
 fi
@@ -47,8 +45,9 @@ run_demo_app()
        cd $CURDIR/demo
 
        # Start test
+       diag "Running application"
        ./demo-trace >/dev/null 2>&1
-       ok $? "Start application"
+       ok $? "Application done"
 
        cd -
 }
@@ -85,8 +84,8 @@ test_enable_simple_wildcard()
 
        diag "Simple wildcard overlap"
 
-       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
-       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
+       enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
+       enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
 
        start_lttng_tracing $SESSION_NAME
 
@@ -418,9 +417,9 @@ test_enable_bad_wildcard()
 
        diag "Enable bad wildcard"
 
-       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
-       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
-       enable_ust_lttng_event $SESSION_NAME "$event_wild3"
+       enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
+       enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
+       enable_ust_lttng_event_ok $SESSION_NAME "$event_wild3"
 
        start_lttng_tracing $SESSION_NAME
 
@@ -440,8 +439,8 @@ test_enable_simple_wildcard_2()
 
        diag "Simple wildcard 2"
 
-       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
-       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
+       enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
+       enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
 
        start_lttng_tracing $SESSION_NAME
 
@@ -569,8 +568,8 @@ test_disable_simple_wildcard()
 
        diag "Disable simple wildcard"
 
-       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
-       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
+       enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
+       enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
 
        disable_ust_lttng_event $SESSION_NAME "$event_wild1"
        disable_ust_lttng_event $SESSION_NAME "$event_wild2"
@@ -594,8 +593,8 @@ test_disable_wildcard_overlap()
 
        diag "Disable wildcard overlap"
 
-       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
-       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
+       enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
+       enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
 
        disable_ust_lttng_event $SESSION_NAME "$event_wild1"
 
@@ -615,6 +614,8 @@ test_disable_wildcard_overlap()
 
 plan_tests $NUM_TESTS
 
+print_test_banner "$TEST_DESC"
+
 TESTS=(
        "test_enable_wildcard_filter"
        "test_enable_wildcard_filter_2"
@@ -650,7 +651,7 @@ while [ "$i" -lt "$TEST_COUNT" ]; do
 
        TRACE_PATH=$(mktemp -d)
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
        # Execute test
        ${TESTS[$i]}