Tests: Clean-up: Remove duplicate babeltrace calls

Change-Id: Iec2471dcc97c8a2d73df6afe1b93db95b6316c4f
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/regression/tools/streaming/test_high_throughput_limits b/tests/regression/tools/streaming/test_high_throughput_limits
index 91ab2fe7b25e945d77eb4f6ba725a03eeea55aa4..cf3a40ddc8d1a33766e64ec00511b65edf9b8119 100755 (executable)
--- 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 9f59836c2351a6a46feee85a56d952d0d62be81c..750445a48ffd74c1e69d3b41d6745c83c7d13d4e 100755 (executable)
--- 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