Fix: tests: output_dir contains the consumerd pipe

[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 118b781cf0380a164aacefa991a6913edaa04871..dae482ce3e5d19b4605d4d84fbbd9b9f05d0bd9d 100755 (executable)
--- a/tests/regression/tools/notification/test_notification_multi_app
+++ b/tests/regression/tools/notification/test_notification_multi_app
@@ -43,7 +43,7 @@ print_test_banner "$TEST_DESC"
 
 app_pids=()
 
-function kernel_event_generator_toogle_state
+function kernel_event_generator_toggle_state
 {
        kernel_event_generator_suspended=$((kernel_event_generator_suspended==0))
 
@@ -52,7 +52,7 @@ function kernel_event_generator
 {
        state_file=$1
        kernel_event_generator_suspended=0
-       trap kernel_event_generator_toogle_state SIGUSR1
+       trap kernel_event_generator_toggle_state SIGUSR1
 
        while (true); do
                if [[ $kernel_event_generator_suspended -eq "1" ]]; then
@@ -67,7 +67,7 @@ function kernel_event_generator
        done
 }
 
-function ust_event_generator_toogle_state
+function ust_event_generator_toggle_state
 {
        ust_event_generator_suspended=$((ust_event_generator_suspended==0))
 
@@ -76,7 +76,7 @@ function ust_event_generator
 {
        state_file=$1
        ust_event_generator_suspended=0
-       trap ust_event_generator_toogle_state SIGUSR1
+       trap ust_event_generator_toggle_state SIGUSR1
        trap "exit" SIGTERM SIGINT
        while (true); do
                if [[ $ust_event_generator_suspended -eq "1" ]]; then
@@ -286,7 +286,6 @@ function test_multi_app ()
                print_errors $output_dir "${high_output_file_pattern}"
        fi
 
-       rm -rf $output_dir
 
        destroy_lttng_session_ok $SESSION_NAME
        stop_lttng_sessiond
@@ -294,6 +293,8 @@ function test_multi_app ()
        for pipe in "${consumerd_pipe[@]}"; do
                rm -rf "${pipe}"
        done
+
+       rm -rf $output_dir
 }
 
 function test_multi_app_ust ()
@@ -442,7 +443,6 @@ function test_on_register_evaluation ()
                print_errors "${high_output_file_pattern}"
        fi
 
-       rm -rf $output_dir
 
        destroy_lttng_session_ok $SESSION_NAME
        stop_lttng_sessiond
@@ -454,6 +454,7 @@ function test_on_register_evaluation ()
                rm -rf "${pipe}"
        done
 
+       rm -rf "$output_dir"
 }