Tests: PID_RELAYD is never used

[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 89c4c969d4fd7b68a677dcc553745f0791038118..bb788840c3bca0859b1b5b4c591c8bd335273cd6 100755 (executable)
--- a/tests/regression/tools/rotation/test_ust
+++ b/tests/regression/tools/rotation/test_ust
@@ -18,18 +18,16 @@ TEST_DESC="Rotation - User space tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
-NR_ITER=1
 NR_USEC_WAIT=0
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="stream"
 EVENT_NAME="tp:tptest"
-PID_RELAYD=0
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=146
+NUM_TESTS=150
 
 source $TESTDIR/utils/utils.sh
 source $CURDIR/rotate_utils.sh
@@ -38,21 +36,12 @@ if [ ! -x "$TESTAPP_BIN" ]; then
        BAIL_OUT "No UST events binary detected."
 fi
 
-function enable_channel_per_pid()
+function enable_channel_per_pid ()
 {
        sess_name=$1
        channel_name=$2
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-pid -u $channel_name -s $sess_name >/dev/null 2>&1
-       ok $? "Enable channel $channel_name per PID for session $sess_name"
-}
-
-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"
+       enable_ust_lttng_channel_ok $sess_name $channel_name --buffers-pid
 }
 
 # MUST set TESTDIR before calling those functions
@@ -91,11 +80,11 @@ function rotate_ust_test ()
 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
-       rm -rf ${TRACE_PATH}/${HOSTNAME}
+       clean_path $TRACE_PATH
 }
 
 function test_ust_local_uid ()
@@ -105,18 +94,18 @@ function test_ust_local_uid ()
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
        rotate_ust_test "${TRACE_PATH}" "ust/uid/*/*/" 0
-       rm -rf ${TRACE_PATH}
+       clean_path $TRACE_PATH
 }
 
 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"
 
        rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/pid/*/" 1
-       rm -rf ${TRACE_PATH}/${HOSTNAME}
+       clean_path $TRACE_PATH
 }
 
 function test_ust_local_pid ()
@@ -127,7 +116,7 @@ function test_ust_local_pid ()
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
        rotate_ust_test "${TRACE_PATH}" "ust/pid/*/" 1
-       rm -rf ${TRACE_PATH}
+       clean_path $TRACE_PATH
 }
 
 function test_ust_local_timer_uid ()
@@ -141,13 +130,13 @@ function test_ust_local_timer_uid ()
        $TESTAPP_BIN 0 0 /dev/null 2>&1
 
        rotate_timer_test "${TRACE_PATH}" 0
-       rm -rf ${TRACE_PATH}
+       clean_path $TRACE_PATH
 }
 
 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
@@ -155,7 +144,7 @@ function test_ust_streaming_timer_uid ()
        $TESTAPP_BIN 0 0 /dev/null 2>&1
 
        rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 0
-       rm -rf ${TRACE_PATH}/${HOSTNAME}
+       clean_path $TRACE_PATH
 }
 
 function test_ust_local_timer_pid ()
@@ -170,13 +159,13 @@ function test_ust_local_timer_pid ()
        $TESTAPP_BIN 0 0 /dev/null 2>&1
 
        rotate_timer_test "${TRACE_PATH}" 1
-       rm -rf ${TRACE_PATH}
+       clean_path $TRACE_PATH
 }
 
 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
@@ -185,7 +174,7 @@ function test_ust_streaming_timer_pid ()
        $TESTAPP_BIN 0 0 /dev/null 2>&1
 
        rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 1
-       rm -rf ${TRACE_PATH}/${HOSTNAME}
+       clean_path $TRACE_PATH
 }
 
 function test_incompatible_sessions ()
@@ -194,19 +183,19 @@ function test_incompatible_sessions ()
 
        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
-       $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
-       $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
@@ -214,7 +203,7 @@ function test_incompatible_sessions ()
 
        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
@@ -244,4 +233,5 @@ done
 stop_lttng_sessiond
 stop_lttng_relayd
 
-exit $out
+# Remove tmp dir
+rm -rf $TRACE_PATH