projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: use `modprobe --remove` rather than `rmmod`
[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 51d94e4fa9a4761ed002e3cb87995e4ffd886ddd..693471feb393ff2f0eefac4027c3f530fde058fc 100755
(executable)
--- a/
tests/regression/tools/notification/test_notification_multi_app
+++ b/
tests/regression/tools/notification/test_notification_multi_app
@@
-54,7
+54,7
@@
print_test_banner "$TEST_DESC"
app_pids=()
app_pids=()
-function kernel_event_generator_to
o
gle_state
+function kernel_event_generator_to
g
gle_state
{
kernel_event_generator_suspended=$((kernel_event_generator_suspended==0))
{
kernel_event_generator_suspended=$((kernel_event_generator_suspended==0))
@@
-63,7
+63,7
@@
function kernel_event_generator
{
state_file=$1
kernel_event_generator_suspended=0
{
state_file=$1
kernel_event_generator_suspended=0
- trap kernel_event_generator_to
o
gle_state SIGUSR1
+ trap kernel_event_generator_to
g
gle_state SIGUSR1
while (true); do
if [[ $kernel_event_generator_suspended -eq "1" ]]; then
while (true); do
if [[ $kernel_event_generator_suspended -eq "1" ]]; then
@@
-78,7
+78,7
@@
function kernel_event_generator
done
}
done
}
-function ust_event_generator_to
o
gle_state
+function ust_event_generator_to
g
gle_state
{
ust_event_generator_suspended=$((ust_event_generator_suspended==0))
{
ust_event_generator_suspended=$((ust_event_generator_suspended==0))
@@
-87,7
+87,7
@@
function ust_event_generator
{
state_file=$1
ust_event_generator_suspended=0
{
state_file=$1
ust_event_generator_suspended=0
- trap ust_event_generator_to
o
gle_state SIGUSR1
+ trap ust_event_generator_to
g
gle_state SIGUSR1
trap "exit" SIGTERM SIGINT
while (true); do
if [[ $ust_event_generator_suspended -eq "1" ]]; then
trap "exit" SIGTERM SIGINT
while (true); do
if [[ $ust_event_generator_suspended -eq "1" ]]; then
@@
-297,7
+297,6
@@
function test_multi_app ()
print_errors $output_dir "${high_output_file_pattern}"
fi
print_errors $output_dir "${high_output_file_pattern}"
fi
- rm -rf $output_dir
destroy_lttng_session_ok $SESSION_NAME
stop_lttng_sessiond
destroy_lttng_session_ok $SESSION_NAME
stop_lttng_sessiond
@@
-305,6
+304,8
@@
function test_multi_app ()
for pipe in "${consumerd_pipe[@]}"; do
rm -rf "${pipe}"
done
for pipe in "${consumerd_pipe[@]}"; do
rm -rf "${pipe}"
done
+
+ rm -rf $output_dir
}
function test_multi_app_ust ()
}
function test_multi_app_ust ()
@@
-335,7
+336,7
@@
function test_multi_app_kernel ()
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
-
rmmod
lttng-test
+
modprobe --remove
lttng-test
}
function test_on_register_evaluation_ust ()
}
function test_on_register_evaluation_ust ()
@@
-370,7
+371,7
@@
function test_on_register_evaluation_kernel()
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
-
rmmod
lttng-test
+
modprobe --remove
lttng-test
}
function test_on_register_evaluation ()
}
function test_on_register_evaluation ()
@@
-453,7
+454,6
@@
function test_on_register_evaluation ()
print_errors "${high_output_file_pattern}"
fi
print_errors "${high_output_file_pattern}"
fi
- rm -rf $output_dir
destroy_lttng_session_ok $SESSION_NAME
stop_lttng_sessiond
destroy_lttng_session_ok $SESSION_NAME
stop_lttng_sessiond
@@
-465,6
+465,7
@@
function test_on_register_evaluation ()
rm -rf "${pipe}"
done
rm -rf "${pipe}"
done
+ rm -rf "$output_dir"
}
}
@@
-474,6
+475,7
@@
TESTS=(
)
if [ "$(id -u)" == "0" ]; then
)
if [ "$(id -u)" == "0" ]; then
+ validate_lttng_modules_present
TESTS+=(
test_multi_app_kernel
test_on_register_evaluation_kernel
TESTS+=(
test_multi_app_kernel
test_on_register_evaluation_kernel
This page took
0.025539 seconds
and
4
git commands to generate.