X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Ftest_notification_multi_app;h=9468d0a0db19c8aeb66486cc2a3352a850eb3c8a;hb=90fcb2ecb33b8fac681d232335d4c74ac91cfe59;hp=cfecd26c3dc80912c1a90a6f83f62c6107c003f5;hpb=cb7237295335b181ac1959001e9e71aab7a19fdc;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app
index cfecd26c3..9468d0a0d 100755
--- a/tests/regression/tools/notification/test_notification_multi_app
+++ b/tests/regression/tools/notification/test_notification_multi_app
@@ -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 ()
@@ -324,7 +325,7 @@ function test_multi_app_kernel ()
 	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 ()
@@ -359,7 +360,7 @@ function test_on_register_evaluation_kernel()
 	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 ()
@@ -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"
 }