X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fstreaming%2Ftest_ust;h=2d5d0ca5b07352d4538453be2f8c952d270df927;hp=6e6e5a752e2ecb8288c2e22506c629d69d0178ac;hb=a4c305246c4b8021fa1681076326731349a1cd17;hpb=ef8343605f92072ca2ed7174b0cc2594ee33dfab

diff --git a/tests/regression/tools/streaming/test_ust b/tests/regression/tools/streaming/test_ust
index 6e6e5a752..2d5d0ca5b 100755
--- a/tests/regression/tools/streaming/test_ust
+++ b/tests/regression/tools/streaming/test_ust
@@ -18,73 +18,80 @@ 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)
 
-source $TESTDIR/utils/utils.sh
+NUM_TESTS=16
 
-print_test_banner "$TEST_DESC"
+source $TESTDIR/utils/utils.sh
 
-if [ ! -x "$CURDIR/$BIN_NAME" ]; then
-	echo -e "No UST nevents binary detected. Passing."
-	exit 0
+if [ ! -x "$TESTAPP_BIN" ]; then
+	BAIL_OUT "No UST events binary detected."
 fi
 
-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
-}
-
-function wait_apps
-{
-	echo -n "Waiting for applications to end"
-	while [ -n "$(pidof $BIN_NAME)" ]; do
-		echo -n "."
-		sleep 0.5
-	done
-	echo ""
-}
-
 # MUST set TESTDIR before calling those functions
 
 function test_ust_before_start ()
 {
-	echo -e "\n=== Testing UST streaming BEFORE tracing starts\n"
-	lttng_create_session_uri
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+	local file_sync_before_last=$(mktemp -u)
+
+	diag "Test UST streaming BEFORE tracing starts"
+	create_lttng_session_uri $SESSION_NAME net://localhost
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
 	# Run 5 times with a 1 second delay
-	./$CURDIR/$BIN_NAME 5 1000000 >/dev/null 2>&1 &
+	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-before-last-event ${file_sync_before_last} > /dev/null 2>&1 &
 
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
-	wait_apps
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	touch ${file_sync_before_last}
+
+	# Wait for the applications started in background
+	wait
+
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
+	rm -f ${file_sync_before_last}
 }
 
 function test_ust_after_start ()
 {
-	echo -e "\n=== Testing UST streaming AFTER tracing starts\n"
-	lttng_create_session_uri
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME
+	local file_sync_after_first=$(mktemp -u)
+
+	diag "Test UST streaming AFTER tracing starts"
+	create_lttng_session_uri $SESSION_NAME net://localhost
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
-	./$CURDIR/$BIN_NAME 5 1000000 >/dev/null 2>&1 &
+	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+		--sync-after-first-event ${file_sync_after_first} >/dev/null 2>&1
+
+	while [ ! -f "${file_sync_after_first}" ]; do
+		sleep 0.5
+	done
 
-	wait_apps
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
+
+	# Wait for the applications started in background
+	wait
+	rm -f ${file_sync_after_first}
 }
 
-start_lttng_sessiond
+plan_tests $NUM_TESTS
+
+print_test_banner "$TEST_DESC"
+
 start_lttng_relayd "-o $TRACE_PATH"
+start_lttng_sessiond
 
 tests=( test_ust_before_start test_ust_after_start )
 
@@ -103,7 +110,6 @@ do
 	fi
 done
 
-echo ""
 stop_lttng_sessiond
 stop_lttng_relayd