Test: add match only event utils function

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

diff --git a/tests/regression/ust/before-after/test_before_after b/tests/regression/ust/before-after/test_before_after
index ed4981ba0f55d3f96cd6c5a3c559b96a0eb8f32b..112f41a577b55b6c1e038efff28ba03a504d1da3 100755 (executable)
--- a/tests/regression/ust/before-after/test_before_after
+++ b/tests/regression/ust/before-after/test_before_after
@@ -25,7 +25,7 @@ TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="per-session"
 EVENT_NAME="tp:tptest"
-NUM_TESTS=17
+NUM_TESTS=16
 
 source $TESTDIR/utils/utils.sh
 
@@ -35,14 +35,6 @@ fi
 
 # MUST set TESTDIR before calling those functions
 
-function wait_app()
-{
-       while [ -n "$(pidof $TESTAPP_NAME)" ]; do
-               sleep 0.5
-       done
-       pass "Application $TESTAPP_NAME ended."
-}
-
 function test_before_apps()
 {
        # BEFORE application is spawned
@@ -56,7 +48,7 @@ function test_before_apps()
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
-       trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
 
        return $?
 }
@@ -65,19 +57,15 @@ function test_after_apps()
 {
        local out
 
+       create_lttng_session $SESSION_NAME $TRACE_PATH
+       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
        ok $? "Application started in background."
 
-       # BEFORE application is spawned
-       create_lttng_session $SESSION_NAME $TRACE_PATH
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
        start_lttng_tracing $SESSION_NAME
 
-       # Since the start is done after the application is started, there is a
-       # bootstrap time needed between the session daemon and the UST tracer.
-       # Waiting for the application to end tells us when to stop everything and
-       # validate that at least one event is seen.
-       wait_app
+       wait ${!}
 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME