X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fstreaming%2Ftest_high_throughput_limits;h=359cc101a5dcf3036101ee72d6c8850a796c43a1;hb=b7a2f86d3d9b2554f80dcf684d9bd90bbf7a3213;hp=352cf9aa6561ae16c45037516dd7d6356e19f47f;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/streaming/test_high_throughput_limits b/tests/regression/tools/streaming/test_high_throughput_limits
index 352cf9aa6..359cc101a 100755
--- a/tests/regression/tools/streaming/test_high_throughput_limits
+++ b/tests/regression/tools/streaming/test_high_throughput_limits
@@ -20,7 +20,7 @@ SESSIOND_CTRL_PORT=5342
 SESSIOND_DATA_PORT=5343
 DEFAULT_IF="lo"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d -t tmp.test_streaming_high_throughput_limits_trace_path.XXXXXX)
 
 NUM_TESTS=104
 
@@ -126,12 +126,11 @@ function test_high_throughput
 
 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)
 
-	TEMP_FILE=$(mktemp)
-	TEMP_FILE_2=$(mktemp)
-
-	traced=$(babeltrace $TRACE_PATH 2>/dev/null | wc -l)
-	babeltrace $TRACE_PATH >/dev/null 2>$TEMP_FILE_2
+	traced=$("$BABELTRACE_BIN" $TRACE_PATH 2>/dev/null | wc -l)
+	"$BABELTRACE_BIN" $TRACE_PATH >/dev/null 2>$TEMP_FILE_2
 
 	cat $TEMP_FILE_2 | cut -f4 -d " " >$TEMP_FILE
 
@@ -171,6 +170,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 if [ "$(id -u)" == "0" ]; then
 	isroot=1
 else