X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Frotate_utils.sh;h=80b2eb75338dc8dc1f95fd73efcf01d570b50ef5;hb=3a9c3e865f8aba96ac2b2ab443d72d1b12fd2a16;hp=9c19e29b69dc2460d4c534b4203b48d322a719e0;hpb=9dc506ae3b7d654f25b8bdf905bc4ddfbe6c33dc;p=lttng-tools.git

diff --git a/tests/regression/tools/rotation/rotate_utils.sh b/tests/regression/tools/rotation/rotate_utils.sh
index 9c19e29b6..80b2eb753 100644
--- a/tests/regression/tools/rotation/rotate_utils.sh
+++ b/tests/regression/tools/rotation/rotate_utils.sh
@@ -1,3 +1,20 @@
+#!/bin/bash
+#
+# Copyright (C) - 2017 Julien Desfossez <jdesfossez@efficios.com>
+#
+# This library is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+
 # Clean everything under directory but keep directory
 function clean_path ()
 {
@@ -26,56 +43,50 @@ function validate_test_chunks ()
 	per_pid=$5
 
 	set_chunk_pattern
+	local path=
+
+	# Validate that only 3 chunks are present
+	nb_chunk=$(ls -A $local_path | wc -l)
+	test $nb_chunk -eq 3
+	ok $? "${local_path} contains 3 chunks only"
+
+	# Check if the first and second chunk folders exist and they contain a ${app_path}/metadata file.
+	for chunk in $(seq 1 2); do
+		path=$(ls $local_path/${chunk_pattern}-${chunk}/${app_path}/metadata)
+		ok $? "Chunk ${chunk} exists based on path $path"
+	done
 
-	# Check if the 3 chunk folders exist and they contain a ${app_path}/metadata file.
-	ls $local_path/${chunk_pattern}-1/${app_path}/metadata >/dev/null
-	ok $? "Chunk 1 exists"
-	ls $local_path/${chunk_pattern}-2/${app_path}/metadata >/dev/null
-	ok $? "Chunk 2 exists"
-	ls $local_path/${chunk_pattern}-3/${domain} >/dev/null
-	ok $? "Chunk 3 exists"
+	# In per-pid the last chunk (3) must be empty.
+	if [ "${per_pid}" -eq "1" ]; then
+		test -z "$(ls -A $local_path/${chunk_pattern}-3/${domain})"
+		ok $? "Chunk 3 is empty per-pid mode"
+	else
+		path=$(ls $local_path/${chunk_pattern}-3/${app_path}/metadata)
+		ok $? "Chunk 3 exists based on path $path"
+	fi
 
 	# Make sure we don't have anything else in the first 2 chunk directories
 	# besides the kernel folder.
-	nr_stale=$(\ls $local_path/${chunk_pattern}-1 | grep -v $domain | wc -l)
-	ok $nr_stale "No stale folders in chunk 1 directory"
-	nr_stale=$(\ls $local_path/${chunk_pattern}-2 | grep -v $domain | wc -l)
-	ok $nr_stale "No stale folders in chunk 2 directory"
+	for chunk in $(seq 1 2); do
+		nr_stale=$(ls -A $local_path/${chunk_pattern}-${chunk} | grep -v $domain | wc -l)
+		ok $nr_stale "No stale folders in chunk ${chunk} directory"
+	done
 
-	# We expect a session of 30 events
+	# We expect a complete session of 30 events
 	validate_trace_count $EVENT_NAME $local_path 30
 
 	# Chunk 1: 10 events
 	validate_trace_count $EVENT_NAME $local_path/${chunk_pattern}-1 10
-	if [ $? -eq 0 ]; then
-		# Only delete if successful
-		rm -rf $local_path/${chunk_pattern}-1
-	fi
 
 	# Chunk 2: 20 events
 	validate_trace_count $EVENT_NAME $local_path/${chunk_pattern}-2 20
-	if [ $? -eq 0 ]; then
-		# Only delete if successful
-		rm -rf $local_path/${chunk_pattern}-2
-	fi
 
 	# Chunk 3: 0 event
-	# Do not check in per-pid, because the folder is really empty, no metadata
-	# or stream files.
-	if test $per_pid = 1; then
-		rm -rf $local_path/${chunk_pattern}-3
-	else
+	# Trace for chunk number 3 can only be read in per-uid mode since in
+	# per-pid mode it is empty (no metadata or stream files).
+	if test $per_pid = 0; then
 		validate_trace_empty $local_path/${chunk_pattern}-3
-		if [ $? -eq 0 ]; then
-			# Only delete if successful
-			rm -rf $local_path/${chunk_pattern}-3
-		fi
 	fi
-
-	# The session folder after all chunks have been removed is empty
-	test -z "$(\ls -A $local_path)"
-	empty=$?
-	ok $empty "Trace folder is now empty"
 }
 
 function rotate_timer_test ()