From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Wed, 27 May 2020 22:49:25 +0000 (-0400)
Subject: Fix: tests: output_dir contains the consumerd pipe
X-Git-Tag: v2.11.5~22
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=46824804609dbbda322577bf939b7fa029fc0bcd;p=lttng-tools.git

Fix: tests: output_dir contains the consumerd pipe

Prevents failure on teardown. Otherwise, testpoint fails when removing
the consumerd pipe.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I9cbfa211e2545350c28e3b10a34fb00aac0493cb
---

diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app
index c1a5158cc..0c578d223 100755
--- a/tests/regression/tools/notification/test_notification_multi_app
+++ b/tests/regression/tools/notification/test_notification_multi_app
@@ -297,7 +297,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
@@ -305,6 +304,8 @@ function test_multi_app ()
 	for pipe in "${consumerd_pipe[@]}"; do
 		rm -rf "${pipe}"
 	done
+
+	rm -rf $output_dir
 }
 
 function test_multi_app_ust ()
@@ -453,7 +454,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
@@ -465,6 +465,7 @@ function test_on_register_evaluation ()
 		rm -rf "${pipe}"
 	done
 
+	rm -rf "$output_dir"
 }