X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Frotate_utils.sh;h=9c19e29b69dc2460d4c534b4203b48d322a719e0;hb=9dc506ae3b7d654f25b8bdf905bc4ddfbe6c33dc;hp=37ada94864338cccf4556b1c49eb644ddef65ef0;hpb=fc58be13f62e691645dd75d56ce26d2e121b13e0;p=lttng-tools.git

diff --git a/tests/regression/tools/rotation/rotate_utils.sh b/tests/regression/tools/rotation/rotate_utils.sh
index 37ada9486..9c19e29b6 100644
--- a/tests/regression/tools/rotation/rotate_utils.sh
+++ b/tests/regression/tools/rotation/rotate_utils.sh
@@ -1,3 +1,14 @@
+# Clean everything under directory but keep directory
+function clean_path ()
+{
+	local path=$1
+	# Use -u from bash top prevent empty expansion of variable yielding a
+	# list of current directory from find.
+	set -u
+	find $path -mindepth 1 -maxdepth 1 -exec rm -rf '{}' \;
+	set +u
+}
+
 function set_chunk_pattern ()
 {
 	# Need to call this function after $today has been set.
@@ -65,12 +76,6 @@ function validate_test_chunks ()
 	test -z "$(\ls -A $local_path)"
 	empty=$?
 	ok $empty "Trace folder is now empty"
-	if [ $empty -eq 0 ]; then
-	# Only delete if successful
-		rm -rf $local_path/
-	else
-		find $local_path
-	fi
 }
 
 function rotate_timer_test ()
@@ -122,8 +127,6 @@ function rotate_timer_test ()
 		while [ $i -le $expected_chunks ]; do
 			validate_trace_empty $local_path/${chunk_pattern}-$i
 			i=$(($i+1))
-	done
-fi
-
-	rm -rf $local_path
+		done
+	fi
 }