X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Frotate_utils.sh;h=146f7e25cc529fa0023b6ecfbac5f485418f3fcb;hb=51a7b11ec8712e8888af09cc3d3df3bb848f70e9;hp=2803517f21d0a3d0f08a18c93e70d8037b072562;hpb=bf1e8411c30b21bc8dd6184c9890e9885bb7d503;p=lttng-tools.git

diff --git a/tests/regression/tools/rotation/rotate_utils.sh b/tests/regression/tools/rotation/rotate_utils.sh
index 2803517f2..146f7e25c 100644
--- a/tests/regression/tools/rotation/rotate_utils.sh
+++ b/tests/regression/tools/rotation/rotate_utils.sh
@@ -145,19 +145,27 @@ function rotate_timer_test ()
 	shopt -u extglob
 }
 
-function wait_for_archives ()
+function trace_until_n_archives ()
 {
-	local trace_path=$1
-	local target_archive_count=$2
+	local produce_events=$1
+	local trace_path=$2
+	local target_archive_count=$3
+	local trace_size_cutoff=$4
 	local archive_count=0
+	local trace_size=0
 
 	diag "Waiting for $target_archive_count size-based rotations to occur"
-	while [[ archive_count -lt $target_archive_count ]]
+	while [[ archive_count -lt $target_archive_count && $trace_size -lt $trace_size_cutoff ]]
 	do
-		archive_count=$(find "$TRACE_PATH" -mindepth 2 -maxdepth 2 -type d -path "*archives*" | wc -l)
-		$TESTAPP_BIN -i 2000 -w 0 > /dev/null 2>&1
+		archive_count=$(find "$trace_path" -mindepth 2 -maxdepth 2 -type d -path "*archives*" | wc -l)
+		trace_size=$(du -b "$trace_path" | tail -n1 | cut -f1)
+		$produce_events 2000
 	done
 
+	if [[ $trace_size -ge $trace_size_cutoff ]]; then
+		diag "Exceeded size cutoff of $trace_size_cutoff bytes while waiting for $target_archive_count rotations"
+	fi
+
 	[[ $archive_count -eq $target_archive_count ]]
 	ok $? "Found $target_archive_count trace archives resulting from trace archive rotations"
 }