X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Ftest_ust_streaming;h=c97813e40eec6738284682f621904fc4e2ee59ab;hb=18c9d47c32d019535b6ef12ed84e3eb220f6060d;hp=52330a5c9f8362b1625cbe05f17b71a257c5edbf;hpb=0fc2834cb1892927708c858baf0147f1cddd1219;p=lttng-tools.git

diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming
index 52330a5c9..c97813e40 100755
--- a/tests/regression/tools/snapshots/test_ust_streaming
+++ b/tests/regression/tools/snapshots/test_ust_streaming
@@ -19,14 +19,13 @@ TEST_DESC="Streaming - Snapshot UST tracing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="tp:tptest"
-PID_RELAYD=0
 SESSION_NAME=""
 CHANNEL_NAME="chan1"
 BIN_NAME="gen-nevents"
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
-NR_ITER=2000000
+NR_ITER=-1
 NR_USEC_WAIT=100
 APPS_PID=
 
@@ -58,7 +57,7 @@ function snapshot_add_output ()
 # Start trace application and return once one event has been hit.
 function start_test_app()
 {
-	local tmp_file="/tmp/lttng_test_ust.42.file"
+	local tmp_file=$(mktemp -u)
 
 	# Start application with a temporary file.
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
@@ -80,8 +79,9 @@ function stop_test_apps()
 	diag "Stopping $TESTAPP_NAME"
 	for p in ${APPS_PID}; do
 		kill ${p}
-		wait ${p} 2>&1
+		wait ${p} 2>/dev/null
 	done
+	APPS_PID=
 }
 
 # Test a snapshot using a default name for the output destination.
@@ -90,8 +90,8 @@ function test_ust_default_name_with_del()
 	diag "Test UST snapshot streaming with default name with delete output"
 	create_lttng_session_no_output $SESSION_NAME
 	enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-	start_lttng_tracing $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	start_test_app
 
@@ -106,7 +106,7 @@ function test_ust_default_name_with_del()
 		return $?
 	fi
 
-	lttng_snapshot_del_output $SESSION_NAME 1
+	lttng_snapshot_del_output_ok $SESSION_NAME 1
 	snapshot_add_output $SESSION_NAME "net://localhost"
 	lttng_snapshot_record $SESSION_NAME
 
@@ -117,8 +117,8 @@ function test_ust_default_name_with_del()
 		return $?
 	fi
 
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	stop_test_apps
 
@@ -131,15 +131,15 @@ function test_ust_default_name()
 	diag "Test UST snapshot streaming with default name"
 	create_lttng_session_no_output $SESSION_NAME
 	enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-	start_lttng_tracing $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	start_test_app
 
 	snapshot_add_output $SESSION_NAME "net://localhost"
 	lttng_snapshot_record $SESSION_NAME
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 	# Validate test
 	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
 	out=$?
@@ -154,15 +154,15 @@ function test_ust_default_name_custom_uri()
 	diag "Test UST snapshot streaming with default name with custom URL"
 	create_lttng_session_no_output $SESSION_NAME
 	enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-	start_lttng_tracing $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	start_test_app
 
 	snapshot_add_output $SESSION_NAME "-C tcp://localhost:5342 -D tcp://localhost:5343"
 	lttng_snapshot_record $SESSION_NAME
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 	# Validate test
 	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
 	out=$?
@@ -181,15 +181,15 @@ function test_ust_custom_name()
 	diag "Test UST snapshot streaming with custom name"
 	create_lttng_session_no_output $SESSION_NAME
 	enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-	start_lttng_tracing $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	start_test_app
 
 	snapshot_add_output $SESSION_NAME "net://localhost" $name
 	lttng_snapshot_record $SESSION_NAME
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	if ls $TRACE_PATH/$HOSTNAME/$name* &> /dev/null; then
 		ok 0 "Custom name snapshot exists"