projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: test flaky sleep and wait patterns
[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..a788f869418ba70cb95819d5c09a9c2e440693a5 100755
(executable)
--- a/
tests/regression/ust/buffers-pid/test_buffers_pid
+++ b/
tests/regression/ust/buffers-pid/test_buffers_pid
@@
-26,7
+26,7
@@
TESTAPP_PATH="$TESTDIR/utils/testapp"
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
EVENT_NAME="tp:tptest"
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
EVENT_NAME="tp:tptest"
-NUM_TESTS=5
8
+NUM_TESTS=5
9
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
@@
-45,14
+45,6
@@
function enable_channel_per_pid()
ok $? "Enable channel $channel_name per PID for session $sess_name"
}
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
test_after_multiple_apps() {
local out
local i
@@
-66,10
+58,9
@@
test_after_multiple_apps() {
start_lttng_tracing $SESSION_NAME
for i in `seq 1 5`; do
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
ok $? "Start application $i for tracing"
done
- wait_apps
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
@@
-96,8
+87,9
@@
test_before_multiple_apps() {
enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
start_lttng_tracing $SESSION_NAME
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
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
@@
-113,8
+105,6
@@
test_before_multiple_apps() {
out=0
fi
out=0
fi
- wait_apps
-
return $out
}
return $out
}
This page took
0.025728 seconds
and
4
git commands to generate.