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 enable_ust_lttng_event
[lttng-tools.git]
/
tests
/
regression
/
ust
/
buffers-pid
/
test_buffers_pid
diff --git
a/tests/regression/ust/buffers-pid/test_buffers_pid
b/tests/regression/ust/buffers-pid/test_buffers_pid
index 2d227bf5f69fe98baf32a7ad70e59797b698de12..dd5b367b13645ff5180fa48f0dfada654dcf3c0e 100755
(executable)
--- a/
tests/regression/ust/buffers-pid/test_buffers_pid
+++ b/
tests/regression/ust/buffers-pid/test_buffers_pid
@@
-26,7
+26,7
@@
TESTAPP_PATH="$TESTDIR/utils/testapp"
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
EVENT_NAME="tp:tptest"
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
EVENT_NAME="tp:tptest"
-NUM_TESTS=5
8
+NUM_TESTS=5
9
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
@@
-45,14
+45,6
@@
function enable_channel_per_pid()
ok $? "Enable channel $channel_name per PID for session $sess_name"
}
ok $? "Enable channel $channel_name per PID for session $sess_name"
}
-function wait_apps
-{
- diag "Waiting for applications to end..."
- while [ -n "$(pidof $TESTAPP_NAME)" ]; do
- sleep 1
- done
-}
-
test_after_multiple_apps() {
local out
local i
test_after_multiple_apps() {
local out
local i
@@
-60,21
+52,21
@@
test_after_multiple_apps() {
diag "Start multiple applications AFTER tracing is started"
# BEFORE application is spawned
diag "Start multiple applications AFTER tracing is started"
# BEFORE application is spawned
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_channel_per_pid $SESSION_NAME "channel0"
enable_channel_per_pid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
+ enable_ust_lttng_event
_ok
$SESSION_NAME $EVENT_NAME "channel0"
start_lttng_tracing $SESSION_NAME
for i in `seq 1 5`; do
start_lttng_tracing $SESSION_NAME
for i in `seq 1 5`; do
- $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
& >/dev/null 2>&1
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
>/dev/null 2>&1 &
ok $? "Start application $i for tracing"
done
ok $? "Start application $i for tracing"
done
- wait
_apps
+ wait
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
- trace_match
es
$EVENT_NAME $[NR_ITER * 5] $TRACE_PATH
+ trace_match
_only
$EVENT_NAME $[NR_ITER * 5] $TRACE_PATH
return $?
}
return $?
}
@@
-82,26
+74,38
@@
test_after_multiple_apps() {
test_before_multiple_apps() {
local out
local i
test_before_multiple_apps() {
local out
local i
+ local file_sync_after_first=$(mktemp -u)
+ local file_sync_before_last=$(mktemp -u)
diag "Start multiple applications BEFORE tracing is started"
for i in `seq 1 5`; do
diag "Start multiple applications BEFORE tracing is started"
for i in `seq 1 5`; do
- $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
& >/dev/null 2>&1
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
${file_sync_after_first}_${i} ${file_sync_before_last}_${i} >/dev/null 2>&1 &
ok $? "Start application $i for tracing"
done
# BEFORE application is spawned
ok $? "Start application $i for tracing"
done
# BEFORE application is spawned
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_channel_per_pid $SESSION_NAME "channel0"
enable_channel_per_pid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
+ enable_ust_lttng_event
_ok
$SESSION_NAME $EVENT_NAME "channel0"
start_lttng_tracing $SESSION_NAME
start_lttng_tracing $SESSION_NAME
- # At least hit one event
- sleep 2
+ for i in `seq 1 5`; do
+ touch ${file_sync_before_last}_${i}
+ done
+
+ diag "Waiting for applications to end"
+ wait
+ pass "Waiting done"
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
+ for i in `seq 1 5`; do
+ rm -f ${file_sync_after_first}_${i}
+ rm -f ${file_sync_before_last}_${i}
+ done
+
out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l)
if [ $out -eq 0 ]; then
fail "Trace validation"
out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l)
if [ $out -eq 0 ]; then
fail "Trace validation"
@@
-113,8
+117,6
@@
test_before_multiple_apps() {
out=0
fi
out=0
fi
- wait_apps
-
return $out
}
return $out
}
@@
-124,42
+126,51
@@
test_after_app() {
diag "Start application AFTER tracing is started"
# BEFORE application is spawned
diag "Start application AFTER tracing is started"
# BEFORE application is spawned
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_channel_per_pid $SESSION_NAME "channel0"
enable_channel_per_pid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
+ enable_ust_lttng_event
_ok
$SESSION_NAME $EVENT_NAME "channel0"
start_lttng_tracing $SESSION_NAME
start_lttng_tracing $SESSION_NAME
- $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
&
ok $? "Start application to trace"
ok $? "Start application to trace"
+ wait
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
- trace_match
es
$EVENT_NAME $NR_ITER $TRACE_PATH
+ trace_match
_only
$EVENT_NAME $NR_ITER $TRACE_PATH
return $?
}
test_before_app() {
local out
return $?
}
test_before_app() {
local out
+ local file_sync_after_first=$(mktemp -u)
+ local file_sync_before_last=$(mktemp -u)
diag "Start application BEFORE tracing is started"
diag "Start application BEFORE tracing is started"
- $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
- ok $? "Start application to trace"
# BEFORE application is spawned
# BEFORE application is spawned
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_channel_per_pid $SESSION_NAME "channel0"
enable_channel_per_pid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
+ enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
+
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} &
+ ok $? "Start application to trace"
+
start_lttng_tracing $SESSION_NAME
start_lttng_tracing $SESSION_NAME
- # At least hit one event
- sleep 2
+ touch ${file_sync_before_last}
+
+ wait
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
+ rm -f ${file_sync_after_first}
+ rm -f ${file_sync_before_last}
+
out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l)
if [ $out -eq 0 ]; then
fail "Trace validation"
out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l)
if [ $out -eq 0 ]; then
fail "Trace validation"
@@
-171,8
+182,6
@@
test_before_app() {
out=0
fi
out=0
fi
- wait_apps
-
return $out
}
return $out
}
@@
-182,7
+191,7
@@
test_multiple_channels() {
diag "Start with multiple channels"
# BEFORE application is spawned
diag "Start with multiple channels"
# BEFORE application is spawned
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_channel_per_pid $SESSION_NAME "channel0"
enable_channel_per_pid $SESSION_NAME "channel1"
enable_channel_per_pid $SESSION_NAME "channel2"
enable_channel_per_pid $SESSION_NAME "channel0"
enable_channel_per_pid $SESSION_NAME "channel1"
enable_channel_per_pid $SESSION_NAME "channel2"
@@
-201,11
+210,12
@@
test_multiple_channels() {
ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel4"
start_lttng_tracing $SESSION_NAME
ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel4"
start_lttng_tracing $SESSION_NAME
- $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
&
ok $? "Start application to trace"
ok $? "Start application to trace"
+ wait
stop_lttng_tracing $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
- trace_match
es
$EVENT_NAME $[NR_ITER * 5] $TRACE_PATH
+ trace_match
_only
$EVENT_NAME $[NR_ITER * 5] $TRACE_PATH
out=$?
destroy_lttng_session $SESSION_NAME
out=$?
destroy_lttng_session $SESSION_NAME
This page took
0.027424 seconds
and
5
git commands to generate.