X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftracefile-limits%2Ftest_tracefile_size;h=9fe4637e6e19f167172cfd7f3caf8c1e82acdc02;hp=99301b59d4e624b5c01e8dd84401509c35559bbd;hb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00;hpb=34497a63c36c870fecbc0fa371058e129cef1bab

diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_size b/tests/regression/tools/tracefile-limits/test_tracefile_size
index 99301b59d..9fe4637e6 100755
--- a/tests/regression/tools/tracefile-limits/test_tracefile_size
+++ b/tests/regression/tools/tracefile-limits/test_tracefile_size
@@ -26,7 +26,7 @@ TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 
-NUM_TESTS=47
+NUM_TESTS=42
 
 source $TESTDIR/utils/utils.sh
 
@@ -34,14 +34,6 @@ if [ ! -x "$TESTAPP_BIN" ]; then
 	BAIL_OUT "No UST events binary detected."
 fi
 
-function wait_apps
-{
-	while [ -n "$(pidof $TESTAPP_NAME)" ]; do
-		sleep 0.5
-	done
-	pass "Wait for applications to end"
-}
-
 function enable_lttng_channel_size_limit ()
 {
 	sess_name="$1"
@@ -53,7 +45,7 @@ function enable_lttng_channel_size_limit ()
 	test_name+="$tracefile_size_limit bytes tracefile limit"
 
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel \
-	    -u $channel_name -s $sess_name \
+	    -u $channel_name -s $sess_name --buffers-pid \
 	    -C $tracefile_size_limit >/dev/null 2>&1
 
 	ok $? "$test_name"
@@ -108,7 +100,7 @@ function test_tracefile_size_limit ()
 
 	diag "Test tracefile size limit : $size_limit bytes"
 
-	create_lttng_session $session_name $trace_path
+	create_lttng_session_ok $session_name $trace_path
 
 	enable_lttng_channel_size_limit \
 	    $session_name $channel_name $size_limit
@@ -116,15 +108,13 @@ function test_tracefile_size_limit ()
 	enable_ust_lttng_event_per_channel \
 	    $session_name $event_name $channel_name
 
-	start_lttng_tracing $session_name
-
-	$TESTAPP_BIN $NR_ITER >/dev/null 2>&1 &
+	start_lttng_tracing_ok $session_name
 
-	wait_apps
+	$TESTAPP_BIN $NR_ITER >/dev/null 2>&1
 
-	stop_lttng_tracing $session_name
+	stop_lttng_tracing_ok $session_name
 
-	destroy_lttng_session $session_name
+	destroy_lttng_session_ok $session_name
 
 	# Validate file size, each one shall be no larger than the
 	# specified size limit