Test: Add the new log4j agent

[lttng-tools.git] / tests / regression / ust / buffers-pid / test_buffers_pid

diff --git a/tests/regression/ust/buffers-pid/test_buffers_pid b/tests/regression/ust/buffers-pid/test_buffers_pid
index 2d227bf5f69fe98baf32a7ad70e59797b698de12..c7ee2d86c784f02fa0b1e3a8ac366c762c99bf88 100755 (executable)
--- a/tests/regression/ust/buffers-pid/test_buffers_pid
+++ b/tests/regression/ust/buffers-pid/test_buffers_pid
@@ -66,15 +66,14 @@ test_after_multiple_apps() {
        start_lttng_tracing $SESSION_NAME
 
        for i in `seq 1 5`; do
-               $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT & >/dev/null 2>&1
+               $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
                ok $? "Start application $i for tracing"
        done
-       wait_apps
 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
-       trace_matches $EVENT_NAME $[NR_ITER * 5] $TRACE_PATH
+       trace_match_only $EVENT_NAME $[NR_ITER * 5] $TRACE_PATH
 
        return $?
 }
@@ -135,7 +134,7 @@ test_after_app() {
        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 $?
 }
@@ -145,17 +144,18 @@ test_before_app() {
 
        diag "Start application BEFORE tracing is started"
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
-       ok $? "Start application to trace"
 
        # BEFORE application is spawned
        create_lttng_session $SESSION_NAME $TRACE_PATH
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
+
+       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
+       ok $? "Start application to trace"
+
        start_lttng_tracing $SESSION_NAME
 
-       # At least hit one event
-       sleep 2
+       wait ${!}
 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
@@ -171,8 +171,6 @@ test_before_app() {
                out=0
        fi
 
-       wait_apps
-
        return $out
 }
 
@@ -205,7 +203,7 @@ test_multiple_channels() {
        ok $? "Start application to trace"
 
        stop_lttng_tracing $SESSION_NAME
-       trace_matches $EVENT_NAME $[NR_ITER * 5] $TRACE_PATH
+       trace_match_only $EVENT_NAME $[NR_ITER * 5] $TRACE_PATH
        out=$?
 
        destroy_lttng_session $SESSION_NAME