From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 8 Oct 2020 22:15:34 +0000 (-0400)
Subject: Tests: clear: remove test workspace directory
X-Git-Tag: v2.13.0-rc1~466
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=061cde02380517539628893c5ed7be0de4245f3f;p=lttng-tools.git

Tests: clear: remove test workspace directory

The clear tests only removes its workspace's subdirectory, but
leaves an empty directory behind. Remove the wildcard and remove
the root of the workspace on clean-up.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I551f892af5423c6ed5933beb0c1a13f41a30a26e
---

diff --git a/tests/regression/tools/clear/test_kernel b/tests/regression/tools/clear/test_kernel
index 300a2bbc8..051f3de24 100755
--- a/tests/regression/tools/clear/test_kernel
+++ b/tests/regression/tools/clear/test_kernel
@@ -28,7 +28,7 @@ function clean_path ()
 {
 	local trace_path=$1
 	set -u
-	rm -rf $trace_path/*
+	rm -rf $trace_path
 	set +u
 }
 
diff --git a/tests/regression/tools/clear/test_ust b/tests/regression/tools/clear/test_ust
index 04b713909..3983d1215 100755
--- a/tests/regression/tools/clear/test_ust
+++ b/tests/regression/tools/clear/test_ust
@@ -31,7 +31,7 @@ function clean_path ()
 {
 	local trace_path=$1
 	set -u
-	rm -rf $trace_path/*
+	rm -rf $trace_path
 	set +u
 }