X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fstreaming%2Ftest_ust;h=480717515b49d3add63d213adee981ecfd06a053;hb=c76133340787e9dd20ce56fdb9a5a6f4cbfe0067;hp=95c833dfff1bfe9aa1ccde81ddd60656eb00e602;hpb=d346ccad757068a5df142710ab5895f6ee93082b;p=lttng-tools.git

diff --git a/tests/regression/tools/streaming/test_ust b/tests/regression/tools/streaming/test_ust
index 95c833dff..480717515 100755
--- a/tests/regression/tools/streaming/test_ust
+++ b/tests/regression/tools/streaming/test_ust
@@ -18,21 +18,23 @@ TEST_DESC="Streaming - User space tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
-BIN_NAME="gen-ust-events"
+NR_ITER=5
+NR_USEC_WAIT=1000000
+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=20
+NUM_TESTS=16
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
-if [ ! -x "$CURDIR/$BIN_NAME" ]; then
-	BAIL_OUT "No UST nevents binary detected."
+if [ ! -x "$TESTAPP_BIN" ]; then
+	BAIL_OUT "No UST events binary detected."
 fi
 
 function lttng_create_session_uri
@@ -42,14 +44,6 @@ function lttng_create_session_uri
 	ok $? "Create session with default path"
 }
 
-function wait_apps
-{
-
-	while [ -n "$(pidof $BIN_NAME)" ]; do
-		sleep 0.5
-	done
-	pass "Wait for applications to end"
-}
 
 # MUST set TESTDIR before calling those functions
 
@@ -60,11 +54,13 @@ function test_ust_before_start ()
 	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
 
 	# Run 5 times with a 1 second delay
-	./$CURDIR/$BIN_NAME 5 1000000 >/dev/null 2>&1 &
+	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1 &
 
-	start_lttng_tracing $SESSION_NAME
+	#FIXME: racy missing synchro
 
-	wait_apps
+	start_lttng_tracing $SESSION_NAME
+	# Wait for the applications started in background
+	wait
 
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
@@ -78,18 +74,23 @@ function test_ust_after_start ()
 	start_lttng_tracing $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
-	./$CURDIR/$BIN_NAME 5 1000000 >/dev/null 2>&1 &
+	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
 
-	wait_apps
+	#FIXME: racy missing synchro
 
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
+
+	# Wait for the applications started in background
+	wait
 }
 
 plan_tests $NUM_TESTS
 
-start_lttng_sessiond
+print_test_banner "$TEST_DESC"
+
 start_lttng_relayd "-o $TRACE_PATH"
+start_lttng_sessiond
 
 tests=( test_ust_before_start test_ust_after_start )