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 functions from utils.sh in rotation tests
[lttng-tools.git]
/
tests
/
regression
/
tools
/
rotation
/
test_ust
diff --git
a/tests/regression/tools/rotation/test_ust
b/tests/regression/tools/rotation/test_ust
index fcad28e698562572ff521a6d4ed70baad70eb05c..25654714f77af4243d16b9cff6d9a272199080bd 100755
(executable)
--- a/
tests/regression/tools/rotation/test_ust
+++ b/
tests/regression/tools/rotation/test_ust
@@
-29,7
+29,7
@@
PID_RELAYD=0
TRACE_PATH=$(mktemp -d)
TRACE_PATH=$(mktemp -d)
-NUM_TESTS=1
46
+NUM_TESTS=1
50
source $TESTDIR/utils/utils.sh
source $CURDIR/rotate_utils.sh
source $TESTDIR/utils/utils.sh
source $CURDIR/rotate_utils.sh
@@
-38,7
+38,7
@@
if [ ! -x "$TESTAPP_BIN" ]; then
BAIL_OUT "No UST events binary detected."
fi
BAIL_OUT "No UST events binary detected."
fi
-function enable_channel_per_pid()
+function enable_channel_per_pid
()
{
sess_name=$1
channel_name=$2
{
sess_name=$1
channel_name=$2
@@
-46,14
+46,6
@@
function enable_channel_per_pid()
enable_ust_lttng_channel_ok $sess_name $channel_name --buffers-pid
}
enable_ust_lttng_channel_ok $sess_name $channel_name --buffers-pid
}
-function lttng_create_session_uri
-{
- # Create session with default path
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
-
- ok $? "Create session $SESSION_NAME"
-}
-
# MUST set TESTDIR before calling those functions
function rotate_ust_test ()
# MUST set TESTDIR before calling those functions
function rotate_ust_test ()
@@
-90,7
+82,7
@@
function rotate_ust_test ()
function test_ust_streaming_uid ()
{
diag "Test UST streaming with session rotation per UID"
function test_ust_streaming_uid ()
{
diag "Test UST streaming with session rotation per UID"
- lttng_create_session_uri
+ create_lttng_session_uri $SESSION_NAME net://localhost
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/uid/*/*/" 0
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/uid/*/*/" 0
@@
-110,7
+102,7
@@
function test_ust_local_uid ()
function test_ust_streaming_pid ()
{
diag "Test UST streaming with session rotation per PID"
function test_ust_streaming_pid ()
{
diag "Test UST streaming with session rotation per PID"
- lttng_create_session_uri
+ create_lttng_session_uri $SESSION_NAME net://localhost
enable_channel_per_pid $SESSION_NAME "channel0"
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
enable_channel_per_pid $SESSION_NAME "channel0"
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
@@
-146,7
+138,7
@@
function test_ust_local_timer_uid ()
function test_ust_streaming_timer_uid ()
{
diag "Test ust remote with session rotation timer per-uid"
function test_ust_streaming_timer_uid ()
{
diag "Test ust remote with session rotation timer per-uid"
- lttng_create_session_uri
+ create_lttng_session_uri $SESSION_NAME net://localhost
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
start_lttng_tracing_ok $SESSION_NAME
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
start_lttng_tracing_ok $SESSION_NAME
@@
-175,7
+167,7
@@
function test_ust_local_timer_pid ()
function test_ust_streaming_timer_pid ()
{
diag "Test ust remote with session rotation timer per-pid"
function test_ust_streaming_timer_pid ()
{
diag "Test ust remote with session rotation timer per-pid"
- lttng_create_session_uri
+ create_lttng_session_uri $SESSION_NAME net://localhost
enable_channel_per_pid $SESSION_NAME "channel0"
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
enable_channel_per_pid $SESSION_NAME "channel0"
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
@@
-193,19
+185,19
@@
function test_incompatible_sessions ()
diag "Live session with rotate timer"
# Should not be able to enable a rotation timer with a live session
diag "Live session with rotate timer"
# Should not be able to enable a rotation timer with a live session
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --live >/dev/null 2>&1
+ create_lttng_session_uri $SESSION_NAME net://localhost --live
lttng_enable_rotation_timer_fail $SESSION_NAME 500ms
destroy_lttng_session_ok $SESSION_NAME
diag "Snapshot session with rotate timer"
# Should not be able to enable a rotation timer with a snapshot session
lttng_enable_rotation_timer_fail $SESSION_NAME 500ms
destroy_lttng_session_ok $SESSION_NAME
diag "Snapshot session with rotate timer"
# Should not be able to enable a rotation timer with a snapshot session
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --snapshot >/dev/null 2>&1
+ create_lttng_session_ok $SESSION_NAME $TRACE_PATH --snapshot
lttng_enable_rotation_timer_fail $SESSION_NAME 500ms
destroy_lttng_session_ok $SESSION_NAME
diag "Live session with rotate"
# Should not be able to rotate a live session
lttng_enable_rotation_timer_fail $SESSION_NAME 500ms
destroy_lttng_session_ok $SESSION_NAME
diag "Live session with rotate"
# Should not be able to rotate a live session
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --live >/dev/null 2>&1
+ create_lttng_session_uri $SESSION_NAME net://localhost --live
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
start_lttng_tracing_ok $SESSION_NAME
rotate_session_fail $SESSION_NAME
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
start_lttng_tracing_ok $SESSION_NAME
rotate_session_fail $SESSION_NAME
@@
-213,7
+205,7
@@
function test_incompatible_sessions ()
diag "Snapshot session with rotate"
# Should not be able to rotate a snapshot session
diag "Snapshot session with rotate"
# Should not be able to rotate a snapshot session
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --snapshot >/dev/null 2>&1
+ create_lttng_session_ok $SESSION_NAME $TRACE_PATH --snapshot
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
start_lttng_tracing_ok $SESSION_NAME
rotate_session_fail $SESSION_NAME
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
start_lttng_tracing_ok $SESSION_NAME
rotate_session_fail $SESSION_NAME
This page took
0.024401 seconds
and
4
git commands to generate.