projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: tests: don't use pidof to wait for test apps
[lttng-tools.git]
/
tests
/
regression
/
ust
/
periodical-metadata-flush
/
test_periodical_metadata_flush
diff --git
a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
index e836956437cff90e1dbab7447c84a054ef334c5d..e4199652bce1a456333ca0d88cbe869a5b590f96 100755
(executable)
--- a/
tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
+++ b/
tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
@@
-73,14
+73,6
@@
function enable_metadata_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
-}
-
function validate_trace()
{
local out
function validate_trace()
{
local out
@@
-149,11
+141,11
@@
test_after_app_pid() {
validate_trace
out=$?
validate_trace
out=$?
+ killall -SIGKILL -q $TESTAPP_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
- killall -SIGKILL -q $TESTAPP_NAME
- wait_apps
+ wait
return $out
}
return $out
}
@@
-188,11
+180,11
@@
test_before_app_pid() {
validate_trace
out=$?
validate_trace
out=$?
+ killall -SIGKILL -q $TESTAPP_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
- killall -SIGKILL -q $TESTAPP_NAME
- wait_apps
+ wait
return $out
}
return $out
}
@@
-223,11
+215,11
@@
test_after_app_uid() {
validate_trace
out=$?
validate_trace
out=$?
+ killall -SIGKILL -q $TESTAPP_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
- killall -SIGKILL -q $TESTAPP_NAME
- wait_apps
+ wait
return $out
}
return $out
}
@@
-261,11
+253,11
@@
test_before_app_uid() {
validate_trace
out=$?
validate_trace
out=$?
+ killall -SIGKILL -q $TESTAPP_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
- killall -SIGKILL -q $TESTAPP_NAME
- wait_apps
+ wait
return $out
}
return $out
}
This page took
0.023834 seconds
and
4
git commands to generate.