Gen-ust-events: use options instead of arguments

[lttng-tools.git] / tests / regression / tools / live / test_lttng_ust

diff --git a/tests/regression/tools/live/test_lttng_ust b/tests/regression/tools/live/test_lttng_ust
index 70af04314393327d019c5c0720bb18393ecaa34b..9fadeeecf43d2d1fc441356c7c24c25364cd35ea 100755 (executable)
--- a/tests/regression/tools/live/test_lttng_ust
+++ b/tests/regression/tools/live/test_lttng_ust
@@ -20,10 +20,6 @@ TEST_DESC="Live - User space tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
-SESSIOND_BIN="lttng-sessiond"
-RELAYD_BIN="lttng-relayd"
-LTTNG_BIN="lttng"
-BABELTRACE_BIN="babeltrace"
 NR_ITER=1
 NR_USEC_WAIT=1
 DELAY_USEC=2000000
@@ -38,7 +34,7 @@ TRACE_PATH=$(mktemp -d)
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=10
+NUM_TESTS=12
 
 source $TESTDIR/utils/utils.sh
 
@@ -47,6 +43,14 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+function test_custom_url()
+{
+       # Create session with custom URL
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --live $DELAY_USEC \
+               -C tcp://localhost:1819 -D tcp://localhost:9187 >/dev/null 2>&1
+       ok $? "Create session in live mode with delay $DELAY_USEC and custom URLs"
+}
+
 function setup_live_tracing()
 {
        # Create session with default path
@@ -54,14 +58,14 @@ function setup_live_tracing()
                -U net://localhost >/dev/null 2>&1
        ok $? "Create session in live mode with delay $DELAY_USEC"
 
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 }
 
 function clean_live_tracing()
 {
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 }
 
 start_lttng_sessiond
@@ -70,16 +74,15 @@ start_lttng_relayd "-o $TRACE_PATH"
 setup_live_tracing
 
 # Run app in background
-$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1 &
-# Wait for app to complete
-while [ -n "$(pidof $TESTAPP_NAME)" ]; do
-       sleep 0.5
-done
+$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT >/dev/null 2>&1
 
 clean_live_tracing
 
-trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
 rm -rf $TRACE_PATH
+stop_lttng_relayd
+
+test_custom_url
 
 stop_lttng_relayd
 stop_lttng_sessiond