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 stop_lttng_tracing
[lttng-tools.git]
/
tests
/
regression
/
tools
/
streaming
/
test_kernel
diff --git
a/tests/regression/tools/streaming/test_kernel
b/tests/regression/tools/streaming/test_kernel
index 42df7b0d50c00fbe8f0effc4a0d4b1cff737ad7f..68b7247b60feef9247e41472045340b85fbb09f7 100755
(executable)
--- a/
tests/regression/tools/streaming/test_kernel
+++ b/
tests/regression/tools/streaming/test_kernel
@@
-24,12
+24,10
@@
SESSION_NAME=""
TRACE_PATH=$(mktemp -d)
TRACE_PATH=$(mktemp -d)
-NUM_TESTS=1
1
+NUM_TESTS=1
0
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
-print_test_banner "$TEST_DESC"
-
# LTTng kernel modules check
out=`ls /lib/modules/$(uname -r)/extra | grep lttng`
if [ -z "$out" ]; then
# LTTng kernel modules check
out=`ls /lib/modules/$(uname -r)/extra | grep lttng`
if [ -z "$out" ]; then
@@
-49,18
+47,11
@@
function test_kernel_before_start ()
diag "Test kernel streaming with event enable BEFORE start"
lttng_create_session_uri
lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
diag "Test kernel streaming with event enable BEFORE start"
lttng_create_session_uri
lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
- start_lttng_tracing $SESSION_NAME
+ start_lttng_tracing
_ok
$SESSION_NAME
# Give a second
sleep 1
# Give a second
sleep 1
- stop_lttng_tracing $SESSION_NAME
+ stop_lttng_tracing
_ok
$SESSION_NAME
destroy_lttng_session $SESSION_NAME
destroy_lttng_session $SESSION_NAME
-
- # We can not predict _yet_ when the trace is available so we have to do a
- # arbitratry sleep to validate the trace.
- diag "Wait 3 seconds for the trace to be written on disk"
- for i in `seq 1 3`; do
- sleep 1
- done
}
# Deactivated since this feature is not yet available where we can enable
}
# Deactivated since this feature is not yet available where we can enable
@@
-69,16
+60,18
@@
function test_kernel_after_start ()
{
diag "Test kernel streaming with event enable AFTER start"
lttng_create_session_uri
{
diag "Test kernel streaming with event enable AFTER start"
lttng_create_session_uri
- start_lttng_tracing $SESSION_NAME
+ start_lttng_tracing
_ok
$SESSION_NAME
lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
# Give a second
sleep 1
lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
# Give a second
sleep 1
- stop_lttng_tracing $SESSION_NAME
+ stop_lttng_tracing
_ok
$SESSION_NAME
destroy_lttng_session $SESSION_NAME
}
plan_tests $NUM_TESTS
destroy_lttng_session $SESSION_NAME
}
plan_tests $NUM_TESTS
+print_test_banner "$TEST_DESC"
+
if [ "$(id -u)" == "0" ]; then
isroot=1
else
if [ "$(id -u)" == "0" ]; then
isroot=1
else
@@
-87,8
+80,8
@@
fi
skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_TESTS ||
{
skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_TESTS ||
{
- start_lttng_sessiond
start_lttng_relayd "-o $TRACE_PATH"
start_lttng_relayd "-o $TRACE_PATH"
+ start_lttng_sessiond
tests=( test_kernel_before_start )
tests=( test_kernel_before_start )
This page took
0.0523 seconds
and
5
git commands to generate.