X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fstreaming%2Ftest_high_throughput_limits;h=276e1a96c55d148716f4733b740b101e09783c3f;hp=f3885a84266448ab8b3b92754ea38ca45ca7f73e;hb=a4c305246c4b8021fa1681076326731349a1cd17;hpb=e3bef7256ce348cf232ede3f36721e661cfda2a7

diff --git a/tests/regression/tools/streaming/test_high_throughput_limits b/tests/regression/tools/streaming/test_high_throughput_limits
index f3885a842..276e1a96c 100755
--- a/tests/regression/tools/streaming/test_high_throughput_limits
+++ b/tests/regression/tools/streaming/test_high_throughput_limits
@@ -22,7 +22,9 @@ CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 NR_APP_ITER=10
 NR_ITER=1000000
-BIN_NAME="gen-ust-events"
+TESTAPP_PATH="$TESTDIR/utils/testapp"
+TESTAPP_NAME="gen-ust-events"
+TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="high-throughput"
 EVENT_NAME="tp:tptest"
 SESSIOND_CTRL_PORT=5342
@@ -31,12 +33,12 @@ DEFAULT_IF="lo"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=112
+NUM_TESTS=104
 
 source $TESTDIR/utils/utils.sh
 
-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 set_bw_limit
@@ -89,28 +91,22 @@ function run_apps
 		# due to very slow communication between the consumer and relayd making
 		# the status reply from the consumer quite slow thus delaying the
 		# registration done message.
-		LTTNG_UST_REGISTER_TIMEOUT=-1 ./$CURDIR/$BIN_NAME $NR_ITER & >/dev/null 2>&1
+		LTTNG_UST_REGISTER_TIMEOUT=-1 $TESTAPP_BIN -i $NR_ITER & >/dev/null 2>&1
 	done
 }
 
-function wait_apps
-{
-	while [ -n "$(pidof $BIN_NAME)" ]; do
-		sleep 1
-	done
-	pass "Wait for applications to end"
-}
-
 function test_high_throughput
 {
 	NETWORK_URI="net://localhost"
 	create_lttng_session_with_uri $SESSION_NAME $NETWORK_URI
-	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
 	run_apps
-	wait_apps
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	diag "Waiting for applications to end"
+	wait
+	pass "waiting done"
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 	validate_event_count
 }
 
@@ -172,12 +168,14 @@ skip $isroot "Root access is needed to set bandwith limits. Skipping all tests."
 {
 
 	# Catch sigint and try to cleanup limits
+	trap interrupt_cleanup SIGTERM
 	trap interrupt_cleanup SIGINT
 
 	BW_LIMITS=(3200 1600 800 400 200 100 50 25)
 	for BW in ${BW_LIMITS[@]};
 	do
 		diag "Test high-throughput with bandwidth limit set to ${BW}kbits"
+
 		set_bw_limit $BW
 
 		start_lttng_sessiond