projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: invoke full_cleanup from script trap handlers, use modprobe -r
[lttng-tools.git]
/
tests
/
regression
/
tools
/
notification
/
test_notification_multi_app
diff --git
a/tests/regression/tools/notification/test_notification_multi_app
b/tests/regression/tools/notification/test_notification_multi_app
index 0a05ea6a0a8e3114fd758a8d0cb7e6e18f160e8b..51d94e4fa9a4761ed002e3cb87995e4ffd886ddd 100755
(executable)
--- a/
tests/regression/tools/notification/test_notification_multi_app
+++ b/
tests/regression/tools/notification/test_notification_multi_app
@@
-64,7
+64,7
@@
function kernel_event_generator
state_file=$1
kernel_event_generator_suspended=0
trap kernel_event_generator_toogle_state SIGUSR1
state_file=$1
kernel_event_generator_suspended=0
trap kernel_event_generator_toogle_state SIGUSR1
- trap "exit" SIGTERM SIGINT
+
while (true); do
if [[ $kernel_event_generator_suspended -eq "1" ]]; then
touch $state_file
while (true); do
if [[ $kernel_event_generator_suspended -eq "1" ]]; then
touch $state_file
@@
-265,7
+265,7
@@
function test_multi_app ()
resume_consumerd "${pipe}"
done
# Stop tracing forcing full buffer consumption
resume_consumerd "${pipe}"
done
# Stop tracing forcing full buffer consumption
- stop_lttng_tracing $SESSION_NAME
+ stop_lttng_tracing
_ok
$SESSION_NAME
# Check for notifications reception
wait_for_message $output_dir "${low_output_file_pattern}" "notification: low $i"
# Check for notifications reception
wait_for_message $output_dir "${low_output_file_pattern}" "notification: low $i"
@@
-315,7
+315,7
@@
function test_multi_app_ust ()
test_multi_app ust $generator_pid
test_multi_app ust $generator_pid
- kill -
9
$generator_pid 2> /dev/null
+ kill -
s SIGTERM
$generator_pid 2> /dev/null
wait $generator_pid 2> /dev/null
rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
}
wait $generator_pid 2> /dev/null
rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
}
@@
-331,7
+331,7
@@
function test_multi_app_kernel ()
test_multi_app kernel $generator_pid
test_multi_app kernel $generator_pid
- kill -
9 $generator_pid 2>
/dev/null
+ kill -
s SIGTERM $generator_pid 2>
/dev/null
wait $generator_pid 2> /dev/null
rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
wait $generator_pid 2> /dev/null
rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
@@
-348,7
+348,7
@@
function test_on_register_evaluation_ust ()
test_on_register_evaluation ust $generator_pid
test_on_register_evaluation ust $generator_pid
- kill -
9
$generator_pid 2> /dev/null
+ kill -
s SIGTERM
$generator_pid 2> /dev/null
wait $generator_pid 2> /dev/null
rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
wait $generator_pid 2> /dev/null
rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
@@
-366,7
+366,7
@@
function test_on_register_evaluation_kernel()
test_on_register_evaluation kernel $generator_pid
test_on_register_evaluation kernel $generator_pid
- kill -
9
$generator_pid 2> /dev/null
+ kill -
s SIGTERM
$generator_pid 2> /dev/null
wait $generator_pid 2> /dev/null
rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
wait $generator_pid 2> /dev/null
rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
@@
-458,7
+458,7
@@
function test_on_register_evaluation ()
destroy_lttng_session_ok $SESSION_NAME
stop_lttng_sessiond
destroy_lttng_session_ok $SESSION_NAME
stop_lttng_sessiond
- kill -
9 $generator_pid
+ kill -
s SIGTERM $generator_pid 2> /dev/null
wait $generator_pid 2> /dev/null
for pipe in "${consumerd_pipe[@]}"; do
wait $generator_pid 2> /dev/null
for pipe in "${consumerd_pipe[@]}"; do
This page took
0.024246 seconds
and
4
git commands to generate.