X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fclear%2Ftest_ust;h=27af7becac06987a5eb149494ade2cbb167f497d;hb=becd029c4fda2dc6478751f4d45fa6b68a1d6120;hp=fadf0e952ea5427165527805f3cc76edcb8c8ec4;hpb=8d5a3312b34841f1ecba2605acad3eaca79fd5e4;p=lttng-tools.git

diff --git a/tests/regression/tools/clear/test_ust b/tests/regression/tools/clear/test_ust
index fadf0e952..27af7beca 100755
--- a/tests/regression/tools/clear/test_ust
+++ b/tests/regression/tools/clear/test_ust
@@ -21,7 +21,8 @@ NUM_TESTS=2071
 PAGE_SIZE=$(getconf PAGE_SIZE)
 TRACE_PATH=$(mktemp -d -t tmp.test_clear_ust_trace_path.XXXXXX)
 
-source $TESTDIR/utils/utils.sh
+# shellcheck source=../utils/utils.sh
+source "$TESTDIR/utils/utils.sh"
 
 if [ ! -x "$TESTAPP_BIN" ]; then
 	BAIL_OUT "No UST events binary detected."
@@ -636,6 +637,7 @@ function test_ust_local_snapshot_per_pid ()
 		--sync-before-last-event-touch ${file_sync_before_last_touch} \
 		--sync-before-exit ${file_sync_before_exit} \
 		--sync-before-exit-touch ${file_sync_before_exit_touch} >/dev/null 2>&1 &
+	local app_pid="${!}"
 
 	# Continue only when there is only the last event remaining.
 	while [ ! -f "${file_sync_before_last_touch}" ]; do
@@ -679,7 +681,7 @@ function test_ust_local_snapshot_per_pid ()
 
 	# Release the application.
 	touch ${file_sync_before_exit}
-	wait
+	wait "${app_pid}"
 	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -f ${file_sync_before_last}
@@ -752,7 +754,7 @@ function test_ust_streaming_tracefile_rotation_overwrite_files ()
 		--tracefile-size=$PAGE_SIZE --tracefile-count=2 --buffers-$buffer_type
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $channel_name
 	start_lttng_tracing_ok $SESSION_NAME
-	taskset -c 0 $TESTAPP_BIN -i 200000
+	taskset -c "$(get_any_available_cpu)" $TESTAPP_BIN -i 200000
 	do_clear_session $SESSION_NAME $tracing_active $clear_twice $rotate_before $rotate_after
 	stop_lttng_tracing_ok $SESSION_NAME
 
@@ -767,7 +769,7 @@ function test_ust_streaming_tracefile_rotation_overwrite_files ()
 	fi
 
 	start_lttng_tracing_ok $SESSION_NAME
-	taskset -c 0 $TESTAPP_BIN -i 400000
+	taskset -c "$(get_any_available_cpu)" $TESTAPP_BIN -i 400000
 	stop_lttng_tracing_ok
 
 	if [[ $rotate_before -eq 1 ]]; then