projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor: test: wrapper for start_lttng_tracing
[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 55060732873ae0022292aabf820bef30439abbdd..c236e5aaf00ce127ef1c5535752bb643cfa37a82 100755
(executable)
--- a/
tests/regression/ust/high-throughput/test_high_throughput
+++ b/
tests/regression/ust/high-throughput/test_high_throughput
@@
-18,41
+18,40
@@
TEST_DESC="UST tracer - Testing high events throughput"
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
-NR_
ITER
=20
+NR_
APP
=20
BIN_NAME="gen-events"
SESSION_NAME="high-throughput"
EVENT_NAME="tp:tptest"
BIN_NAME="gen-events"
SESSION_NAME="high-throughput"
EVENT_NAME="tp:tptest"
+NUM_TESTS=9
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
-print_test_banner "$TEST_DESC"
-
if [ ! -x "$CURDIR/$BIN_NAME" ]; then
if [ ! -x "$CURDIR/$BIN_NAME" ]; then
- echo -e "No UST nevents binary detected. Passing."
- exit 0
+ BAIL_OUT "No UST nevents binary detected."
fi
TRACE_PATH=$(mktemp -d)
# MUST set TESTDIR before calling those functions
fi
TRACE_PATH=$(mktemp -d)
# MUST set TESTDIR before calling those functions
+plan_tests $NUM_TESTS
+
+print_test_banner "$TEST_DESC"
+
start_lttng_sessiond
start_lttng_sessiond
-create_lttng_session $SESSION_NAME $TRACE_PATH
+create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
-enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-start_lttng_tracing $SESSION_NAME
+enable_ust_lttng_event
_ok
$SESSION_NAME $EVENT_NAME
+start_lttng_tracing
_ok
$SESSION_NAME
-for i in `seq 1 $NR_
ITER
`; do
- ./$CURDIR/$BIN_NAME
& >/dev/null 2>&1
+for i in `seq 1 $NR_
APP
`; do
+ ./$CURDIR/$BIN_NAME
>/dev/null 2>&1 &
done
done
-echo "Waiting for applications to end"
-while [ -n "$(pidof $BIN_NAME)" ]; do
- echo -n "."
- sleep 0.5
-done
-echo ""
+diag "Waiting for applications to end"
+wait
+pass "Wait for applications to end"
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
@@
-76,19
+75,15
@@
do
done < $TEMP_FILE
let total=$dropped+$traced
done < $TEMP_FILE
let total=$dropped+$traced
-let wanted=$NR_
ITER
*1000000
+let wanted=$NR_
APP
*1000000
if [ $wanted -ne $total ]; then
if [ $wanted -ne $total ]; then
- echo -n "Expected $wanted. Dropped $dropped. Recorded $traced. Total $total... "
- print_fail
- out=1
+ fail "Trace validation"
+ diag "Expected $wanted. Dropped $dropped. Recorded $traced. Total $total"
else
else
- echo -n "Expected $wanted. Dropped $dropped. Recorded $traced. Total $total... "
- print_ok
- out=0
+ pass "Trace validation"
+ diag "Expected $wanted. Dropped $dropped. Recorded $traced. Total $total"
fi
rm -rf $TRACE_PATH
rm $TEMP_FILE $TEMP_FILE_2
fi
rm -rf $TRACE_PATH
rm $TEMP_FILE $TEMP_FILE_2
-
-exit $out
This page took
0.028485 seconds
and
4
git commands to generate.