X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Ftest_lttng_ust;h=177b1f76ac98ed2cff325ec0127baa795340ec43;hp=70af04314393327d019c5c0720bb18393ecaa34b;hb=c4926bb5e18ba7916ff2a5d2c70ed6b099643e73;hpb=1b368955ffa0497c25b3d769a7259409cbb9233c

diff --git a/tests/regression/tools/live/test_lttng_ust b/tests/regression/tools/live/test_lttng_ust
index 70af04314..177b1f76a 100755
--- a/tests/regression/tools/live/test_lttng_ust
+++ b/tests/regression/tools/live/test_lttng_ust
@@ -38,7 +38,7 @@ TRACE_PATH=$(mktemp -d)
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=10
+NUM_TESTS=11
 
 source $TESTDIR/utils/utils.sh
 
@@ -47,6 +47,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,7 +62,7 @@ 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
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 	start_lttng_tracing $SESSION_NAME
 }
 
@@ -70,16 +78,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 $NR_ITER $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
+pkill $RELAYD_BIN
+
 stop_lttng_sessiond