From 8166571605074ec793777b210d212ca208554708 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Wed, 27 May 2020 18:49:25 -0400 Subject: [PATCH] Fix: tests: output_dir contains the consumerd pipe MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Prevents failure on teardown. Otherwise, testpoint fails when removing the consumerd pipe. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau Change-Id: I9cbfa211e2545350c28e3b10a34fb00aac0493cb --- .../tools/notification/test_notification_multi_app | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app index cfecd26c3..dae482ce3 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 () @@ -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" } -- 2.34.1