From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 11 Jun 2019 20:03:22 +0000 (-0400)
Subject: Tests: don't expect a UST directory after inactive per-PID rotation
X-Git-Tag: v2.11.0-rc3~120
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=55db42089337fc57bdec24f1912b8813429942fc;p=lttng-tools.git

Tests: don't expect a UST directory after inactive per-PID rotation

The trace archive resulting from the rotation of a session containing
per-PID channels does not result in the creation of te domain
subfolders.

The trace archive is empty if none of the traced domain were active
during the trace chunk's capture.

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

diff --git a/tests/regression/tools/rotation/rotate_utils.sh b/tests/regression/tools/rotation/rotate_utils.sh
index 8179f7d15..2ef419339 100644
--- a/tests/regression/tools/rotation/rotate_utils.sh
+++ b/tests/regression/tools/rotation/rotate_utils.sh
@@ -133,11 +133,11 @@ function rotate_timer_test ()
 	# In a per-pid setup, only the first chunk is a valid trace, the other
 	# chunks should be empty folders
 	if test $per_pid = 1; then
-		validate_trace_empty $local_path/${chunk_pattern}-1
-		nr=$(ls $local_path/${chunk_pattern}-2/ust | wc -l)
+		validate_trace_empty $local_path/${chunk_pattern}-0
+		nr=$(ls $local_path/${chunk_pattern}-1/ | wc -l)
 		test $nr = 0
 		ok $? "Chunk 2 is empty"
-		nr=$(ls $local_path/${chunk_pattern}-3/ust | wc -l)
+		nr=$(ls $local_path/${chunk_pattern}-2/ | wc -l)
 		test $nr = 0
 		ok $? "Chunk 3 is empty"
 	else