X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fblocking%2Ftest_blocking;h=0bbc02ddc3c61dec86768c5d14fd27b6353ecc6b;hb=ce8adea389285b4397f1c5b743c744b18dbda56e;hp=617d9a27833a901273735b255dabee9d29faaf78;hpb=33e557114a2ba28e26e220a833e8a449c78b8b65;p=lttng-tools.git

diff --git a/tests/regression/ust/blocking/test_blocking b/tests/regression/ust/blocking/test_blocking
index 617d9a278..0bbc02ddc 100755
--- a/tests/regression/ust/blocking/test_blocking
+++ b/tests/regression/ust/blocking/test_blocking
@@ -19,16 +19,30 @@ EVENT_NAME="tp:tptest"
 
 NUM_TESTS=49
 
-source $TESTDIR/utils/utils.sh
+# shellcheck source=../utils/utils.sh
+source "$TESTDIR/utils/utils.sh"
 
 # MUST set TESTDIR before calling those functions
-# Run app on CPU 0 to ensure we only write in a single ring buffer.
+# Run app on a single CPU to ensure we only write in a single ring buffer.
 function run_app()
 {
-	taskset 0x00000001 $TESTAPP_BIN -i $NUM_EVENT
+	taskset --cpu-list "$(get_any_available_cpu)" $TESTAPP_BIN -i $NUM_EVENT
 	ok $? "Application done"
 }
 
+function check_disk_space()
+{
+	local path
+
+	path="${1:?}"
+	kb_free=$(df -k -P "${path}" | tail -n 1 | awk '{ print $4 }')
+	if [ "${kb_free}" -lt "1048576" ] ; then
+		return 1
+	fi
+
+	return 0
+}
+
 function test_ust_implicit_no_blocking()
 {
 	NUM_EVENT=5000000
@@ -123,7 +137,7 @@ function test_ust_blocking_no_discard()
 	destroy_lttng_session_ok $SESSION_NAME
 	stop_lttng_sessiond
 
-	nr_events=$(babeltrace $TRACE_PATH 2>/dev/null | wc -l)
+	nr_events=$("$BABELTRACE_BIN" $TRACE_PATH 2>/dev/null | wc -l)
 
 	test $nr_events -eq $NUM_EVENT
 	ok $? "No event lost with UST blocking mode: found $nr_events expect $NUM_EVENT"
@@ -133,6 +147,12 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
+if ! check_disk_space "${TMPDIR:-/tmp}"; then
+	BAIL_OUT "Not enough free space to run blocking tests"
+fi
+
 TESTS=(
 	"test_ust_implicit_no_blocking"
 	"test_ust_implicit_no_blocking_with_channel_blocking"
@@ -146,7 +166,7 @@ i=0
 
 while [ "$i" -lt "$TEST_COUNT" ]; do
 
-	TRACE_PATH=$(mktemp --tmpdir -d tmp.test_blocking_ust_trace_path.XXXXXX)
+	TRACE_PATH=$(mktemp -d -t tmp.test_blocking_ust_trace_path.XXXXXX)
 
 	# Execute test
 	${TESTS[$i]}