projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: use babeltrace2 for all tests
[lttng-tools.git]
/
tests
/
regression
/
ust
/
high-throughput
/
test_high_throughput
diff --git
a/tests/regression/ust/high-throughput/test_high_throughput
b/tests/regression/ust/high-throughput/test_high_throughput
index a6dbdc758c5e8285c7e6e4919ccbf57f51c787e6..873646fa912ab77b7ea8c1fd11e42c3990bc7fdd 100755
(executable)
--- a/
tests/regression/ust/high-throughput/test_high_throughput
+++ b/
tests/regression/ust/high-throughput/test_high_throughput
@@
-20,7
+20,7
@@
if [ ! -x "$CURDIR/$BIN_NAME" ]; then
BAIL_OUT "No UST nevents binary detected."
fi
BAIL_OUT "No UST nevents binary detected."
fi
-TRACE_PATH=$(mktemp -
d
)
+TRACE_PATH=$(mktemp -
-tmpdir -d tmp.test_high_throughput_ust_trace_path.XXXXXX
)
# MUST set TESTDIR before calling those functions
# MUST set TESTDIR before calling those functions
@@
-28,6
+28,8
@@
plan_tests $NUM_TESTS
print_test_banner "$TEST_DESC"
print_test_banner "$TEST_DESC"
+bail_out_if_no_babeltrace
+
start_lttng_sessiond
create_lttng_session_ok $SESSION_NAME $TRACE_PATH
start_lttng_sessiond
create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@
-50,11
+52,11
@@
stop_lttng_sessiond
# Validate test
# Validate test
-TEMP_FILE=$(mktemp)
-TEMP_FILE_2=$(mktemp)
+TEMP_FILE=$(mktemp
--tmpdir tmp.test_high_throughput_tmp_file1.XXXXXX
)
+TEMP_FILE_2=$(mktemp
--tmpdir tmp.test_high_throughput_tmp_file2.XXXXXX
)
-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
cat $TEMP_FILE_2 | cut -f4 -d " " >$TEMP_FILE
This page took
0.023858 seconds
and
4
git commands to generate.