X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fblocking%2Ftest_blocking;h=abd50d45938ee2625746211bc38291b056d6e170;hb=931bdbaa3a3fd1d586a0045c15cac23d6cfc67f9;hp=c5c95903b0190f06efe639691129fc8d1d923496;hpb=491d15395b58df09f8a3e7ba7404eb1f46392b79;p=lttng-tools.git

diff --git a/tests/regression/ust/blocking/test_blocking b/tests/regression/ust/blocking/test_blocking
index c5c95903b..abd50d459 100755
--- a/tests/regression/ust/blocking/test_blocking
+++ b/tests/regression/ust/blocking/test_blocking
@@ -1,20 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) - 2015 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
-# Copyright (C) - 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+# Copyright (C) 2015 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# SPDX-License-Identifier: LGPL-2.1-only
+
 TEST_DESC="UST - Blocking mode"
 
 CURDIR=$(dirname $0)/
@@ -35,7 +25,7 @@ source $TESTDIR/utils/utils.sh
 # Run app on CPU 0 to ensure we only write in a single ring buffer.
 function run_app()
 {
-	taskset 0x00000001 $TESTAPP_BIN $NUM_EVENT
+	taskset 0x00000001 $TESTAPP_BIN -i $NUM_EVENT
 	ok $? "Application done"
 }
 
@@ -60,12 +50,12 @@ function test_ust_implicit_no_blocking()
 function test_ust_implicit_no_blocking_with_channel_blocking()
 {
 	NUM_EVENT=5000000
-	diag "UST implicit non-blocking mode (default) with blocking-timeout=-1 channel: will hang if fails"
+	diag "UST implicit non-blocking mode (default) with blocking-timeout=inf channel: will hang if fails"
 
 	start_lttng_sessiond
 	# session in no-output mode
 	create_lttng_session_no_output $SESSION_NAME
-	enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME "--blocking-timeout=-1"
+	enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME "--blocking-timeout=inf"
 	enable_ust_lttng_event_ok $SESSION_NAME "$EVENT_NAME" $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
 	run_app
@@ -125,7 +115,7 @@ function test_ust_blocking_no_discard()
 	start_lttng_sessiond
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	# infinite blocking timeout
-	enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME "--blocking-timeout=-1"
+	enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME "--blocking-timeout=inf"
 	enable_ust_lttng_event_ok $SESSION_NAME "$EVENT_NAME" $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
 	LTTNG_UST_ALLOW_BLOCKING=1 run_app