TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
EVENT_NAME="tp:tptest"
-NUM_TESTS=58
+NUM_TESTS=59
source $TESTDIR/utils/utils.sh
ok $? "Enable channel $channel_name per PID for session $sess_name"
}
-function wait_apps
-{
- diag "Waiting for applications to end..."
- while [ -n "$(pidof $TESTAPP_NAME)" ]; do
- sleep 1
- done
-}
-
test_after_multiple_apps() {
local out
local i
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 $?
}
enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
start_lttng_tracing $SESSION_NAME
- # At least hit one event
- sleep 2
+ diag "Waiting for applications to end"
+ wait
+ pass "Waiting done"
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
out=0
fi
- wait_apps
-
return $out
}
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 $?
}
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
out=0
fi
- wait_apps
-
return $out
}
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