Tests: missing parenthesis in userspace rotation test

[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..924b04e5c6446ae810a5fd82b17d841f49f1fa4f 100755 (executable)
--- a/tests/regression/tools/rotation/test_ust
+++ b/tests/regression/tools/rotation/test_ust
@@ -38,16 +38,15 @@ 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"
+       enable_ust_lttng_channel_ok $sess_name $channel_name --buffers-pid
 }
 
-function lttng_create_session_uri
+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
@@ -95,7 +94,7 @@ function test_ust_streaming_uid ()
        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,7 +104,7 @@ 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 ()
@@ -116,7 +115,7 @@ function test_ust_streaming_pid ()
        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 +126,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,7 +140,7 @@ 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 ()
@@ -155,7 +154,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,7 +169,7 @@ 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 ()
@@ -185,7 +184,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 ()
@@ -244,4 +243,5 @@ done
 stop_lttng_sessiond
 stop_lttng_relayd
 
-exit $out
+# Remove tmp dir
+rm -rf $TRACE_PATH