Deprecate enable/disable-consumer

[lttng-tools.git] / tests / tools / streaming / uri_switch

diff --git a/tests/tools/streaming/uri_switch b/tests/tools/streaming/uri_switch
index d6fc9385b69642d8a09abd2245df635d1d63110f..4eb4359835017e1a3506ffbc0ea7a6fe1404bfc0 100755 (executable)
--- a/tests/tools/streaming/uri_switch
+++ b/tests/tools/streaming/uri_switch
@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+TEST_DESC="Streaming - URI switching"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
@@ -27,10 +28,7 @@ TRACE_PATH=$(mktemp -d)
 
 source $TESTDIR/utils.sh
 
-echo -e "\n"
-echo -e "---------------------------"
-echo -e " Streaming - URI switching "
-echo -e "---------------------------"
+print_test_banner "$TEST_DESC"
 
 if [ ! -x "$CURDIR/$BIN_NAME" ]; then
        echo -e "No UST nevents binary detected. Skipping."
@@ -96,18 +94,16 @@ function test_uri_switch_localhost_folder
        done
 
        enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-       start_tracing $SESSION_NAME
+       start_lttng_tracing $SESSION_NAME
        run_apps
        wait_apps
-       stop_tracing $SESSION_NAME
+       stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
        validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$RAND
 
        if [ $? -eq 0 ]; then
        # Only delete if successful
            rm -rf $TRACE_PATH
-       else
-           break
        fi
 }
 
@@ -139,10 +135,10 @@ function test_uri_switch_file_network
                lttng_create_session $FILE_URI
                lttng_enable_consumer "$NETWORK_URI/$NET_PATH"
                enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-               start_tracing $SESSION_NAME
+               start_lttng_tracing $SESSION_NAME
                run_apps
                wait_apps
-               stop_tracing $SESSION_NAME
+               stop_lttng_tracing $SESSION_NAME
                destroy_lttng_session $SESSION_NAME
                validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$NET_PATH
 
@@ -183,39 +179,39 @@ IPVER=$1
            lttng_create_session $NETWORK_URI
            lttng_enable_consumer "$FILE_URI/$FILE_PATH"
            enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-           start_tracing $SESSION_NAME
+           start_lttng_tracing $SESSION_NAME
            run_apps
            wait_apps
-           stop_tracing $SESSION_NAME
+           stop_lttng_tracing $SESSION_NAME
            destroy_lttng_session $SESSION_NAME
            validate_trace $EVENT_NAME $TMP_PATH/$FILE_PATH
 
            if [ $? -eq 0 ]; then
-               # Only delete if successful
-               rm -rf $TMP_PATH
+                       # Only delete if successful
+                       rm -rf $TMP_PATH
            else
-               break
+                       break
            fi
        done
 }
 
 
-start_sessiond
+start_lttng_sessiond
 
 echo ""
 echo "=== Testing with IPv4"
-lttng_start_relayd "-o $TRACE_PATH"
+start_lttng_relayd "-o $TRACE_PATH"
 test_uri_switch_localhost_folder "IPv4"
 test_uri_switch_file_network "IPv4"
 test_uri_switch_network_file "IPv4"
-lttng_stop_relayd
+stop_lttng_relayd
 
 echo ""
 echo "=== Testing with IPv6"
-lttng_start_relayd "-o $TRACE_PATH -C tcp6://localhost:5342 -D tcp6://localhost:5343"
+start_lttng_relayd "-o $TRACE_PATH -C tcp6://localhost:5342 -D tcp6://localhost:5343"
 test_uri_switch_localhost_folder "IPv6"
 test_uri_switch_file_network "IPv6"
 test_uri_switch_network_file "IPv6"
-lttng_stop_relayd
+stop_lttng_relayd
 
-stop_sessiond
+stop_lttng_sessiond