From 153ec569ff523aa4489efc1dd04a4ad4434e6715 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Wed, 31 Jul 2024 14:55:07 -0400 Subject: [PATCH] Tests: Clean-up: Remove duplicate babeltrace calls MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Iec2471dcc97c8a2d73df6afe1b93db95b6316c4f Signed-off-by: Kienan Stewart Signed-off-by: Jérémie Galarneau --- tests/regression/tools/streaming/test_high_throughput_limits | 4 +--- tests/regression/ust/high-throughput/test_high_throughput | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/regression/tools/streaming/test_high_throughput_limits b/tests/regression/tools/streaming/test_high_throughput_limits index 91ab2fe7b..cf3a40ddc 100755 --- a/tests/regression/tools/streaming/test_high_throughput_limits +++ b/tests/regression/tools/streaming/test_high_throughput_limits @@ -128,9 +128,7 @@ function validate_event_count TEMP_FILE=$(mktemp -t tmp.streaming_high_throughput_limit_file1.XXXXXX) TEMP_FILE_2=$(mktemp -t tmp.streaming_high_throughput_limit_file2.XXXXXX) - traced=$("$BABELTRACE_BIN" "$TRACE_PATH" 2>/dev/null | wc -l) - "$BABELTRACE_BIN" "$TRACE_PATH" >/dev/null 2>"$TEMP_FILE_2" - + traced=$("$BABELTRACE_BIN" "$TRACE_PATH" 2>"${TEMP_FILE_2}" | wc -l) cat "$TEMP_FILE_2" | cut -f4 -d " " >"$TEMP_FILE" dropped=0 diff --git a/tests/regression/ust/high-throughput/test_high_throughput b/tests/regression/ust/high-throughput/test_high_throughput index 9f59836c2..750445a48 100755 --- a/tests/regression/ust/high-throughput/test_high_throughput +++ b/tests/regression/ust/high-throughput/test_high_throughput @@ -55,9 +55,7 @@ stop_lttng_sessiond TEMP_FILE=$(mktemp -t tmp.test_high_throughput_tmp_file1.XXXXXX) TEMP_FILE_2=$(mktemp -t tmp.test_high_throughput_tmp_file2.XXXXXX) -traced=$("$BABELTRACE_BIN" $TRACE_PATH 2>/dev/null | wc -l) -"$BABELTRACE_BIN" $TRACE_PATH >/dev/null 2>$TEMP_FILE_2 - +traced=$("$BABELTRACE_BIN" $TRACE_PATH 2>"${TEMP_FILE_2}" | wc -l) cat $TEMP_FILE_2 | cut -f4 -d " " >$TEMP_FILE dropped=0 -- 2.34.1