From: Mathieu Desnoyers Date: Fri, 20 Sep 2019 21:26:08 +0000 (-0400) Subject: Test: rotate_utils.sh: consider chunk archive with ust/ as empty X-Git-Tag: v2.12.0-rc1~156 X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=f590975c081ea72fc64ab370c5a14f5b9f03a436 Test: rotate_utils.sh: consider chunk archive with ust/ as empty Now the session daemon needs to create the ust/ subdir to pass it to the consumer daemon even if there are no active traced applications in per-pid tracing. Therefore, we need to consider a chunk with a ust/ empty directory as empty. Empty local traces have this empty subdir, but remote traces do not. Signed-off-by: Mathieu Desnoyers Change-Id: Ic0cda7baf6eafa5b0c7b4f0b79e03bc8ea523d93 Signed-off-by: Jérémie Galarneau --- diff --git a/tests/regression/tools/rotation/rotate_utils.sh b/tests/regression/tools/rotation/rotate_utils.sh index cb2fc53b9..42009f85b 100644 --- a/tests/regression/tools/rotation/rotate_utils.sh +++ b/tests/regression/tools/rotation/rotate_utils.sh @@ -133,11 +133,13 @@ function rotate_timer_test () # chunks should be empty folders if test $per_pid = 1; then validate_trace_empty $local_path/${chunk_pattern}-0 - nr=$(ls $local_path/${chunk_pattern}-1/ | wc -l) - test $nr = 0 + nr=$(find $local_path/${chunk_pattern}-1/ | wc -l) + # contains self and may contain ust/ subdir (local) or not (remote). + test $nr -le 2 ok $? "Chunk 2 is empty" - nr=$(ls $local_path/${chunk_pattern}-2/ | wc -l) - test $nr = 0 + nr=$(find $local_path/${chunk_pattern}-2/ | wc -l) + # contains self and may contain ust/ subdir (local) or not (remote). + test $nr -le 2 ok $? "Chunk 3 is empty" else while [ $i -le $expected_chunks ]; do