X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftracefile-limits%2Ftest_tracefile_size;h=489e68510f299a7cbe34e91a78ea7461da8b874e;hb=8d5a3312b34841f1ecba2605acad3eaca79fd5e4;hp=809490c097500fcac471c831c76a516e7e8cc6b1;hpb=034a784813438dd99cfd1c1ea2fc9ee713dad345;p=lttng-tools.git

diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_size b/tests/regression/tools/tracefile-limits/test_tracefile_size
index 809490c09..489e68510 100755
--- a/tests/regression/tools/tracefile-limits/test_tracefile_size
+++ b/tests/regression/tools/tracefile-limits/test_tracefile_size
@@ -1,19 +1,8 @@
 #!/bin/bash
 #
-# Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
+# Copyright (C) 2013 Christian Babeux <christian.babeux@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="Tracefile size limits"
 
@@ -28,7 +17,7 @@ TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 
-NUM_TESTS=58
+NUM_TESTS=74
 
 source $TESTDIR/utils/utils.sh
 
@@ -48,6 +37,7 @@ function enable_lttng_channel_size_limit ()
 
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel \
 	    -u $channel_name -s $sess_name --buffers-pid \
+	    --subbuf-size=$PAGE_SIZE \
 	    -C $tracefile_size_limit >/dev/null 2>&1
 
 	ok $? "$test_name"
@@ -94,11 +84,11 @@ function check_file_size ()
 
 function test_tracefile_size_limit ()
 {
-	size_limit="$1"
-	trace_path=$(mktemp -d)
-	session_name=$(randstring 16 0)
-	channel_name="channel"
-	event_name="tp:tptest"
+	local size_limit="$1"
+	local trace_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+	local session_name=$(randstring 16 0)
+	local channel_name="channel"
+	local event_name="tp:tptest"
 
 	diag "Test tracefile size limit : $size_limit bytes"
 
@@ -112,7 +102,7 @@ function test_tracefile_size_limit ()
 
 	start_lttng_tracing_ok $session_name
 
-	$TESTAPP_BIN $NR_ITER >/dev/null 2>&1
+	$TESTAPP_BIN -i $NR_ITER >/dev/null 2>&1
 
 	stop_lttng_tracing_ok $session_name
 
@@ -125,6 +115,7 @@ function test_tracefile_size_limit ()
 
 	# Validate tracing data, we should at least have some events
 
+	validate_trace_path_ust_pid "$trace_path" "" "gen-ust-events"
 	validate_trace $event_name $trace_path
 
 	rm -rf $trace_path
@@ -133,11 +124,11 @@ function test_tracefile_size_limit ()
 function test_tracefile_size_limit_pagesize ()
 {
 	# Set a size limit lower than the page_size
-	size_limit="$(($PAGE_SIZE-2))"
-	trace_path=$(mktemp -d)
-	session_name=$(randstring 16 0)
-	channel_name="channel"
-	event_name="tp:tptest"
+	local size_limit="$(($PAGE_SIZE-2))"
+	local trace_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+	local session_name=$(randstring 16 0)
+	local channel_name="channel"
+	local event_name="tp:tptest"
 
 	diag "Test tracefile size limit lower than PAGE_SIZE : $size_limit bytes"
 
@@ -151,7 +142,7 @@ function test_tracefile_size_limit_pagesize ()
 
 	start_lttng_tracing_ok $session_name
 
-	$TESTAPP_BIN $NR_ITER >/dev/null 2>&1
+	$TESTAPP_BIN -i $NR_ITER >/dev/null 2>&1
 
 	stop_lttng_tracing_ok $session_name
 
@@ -163,6 +154,7 @@ function test_tracefile_size_limit_pagesize ()
 
 	# Validate tracing data, we should at least have some events
 
+	validate_trace_path_ust_pid "$trace_path" "" "gen-ust-events"
 	validate_trace $event_name $trace_path
 
 	rm -rf $trace_path
@@ -172,6 +164,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 start_lttng_sessiond
 
 # Test with multiples of PAGE_SIZE