X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Fust_test;h=0b8bb24e95b001f39fb9d241fc1c70a770804861;hb=5fbc8b2773792892a41dc2424df5f5d08c1b9e76;hp=9dd95bf2bb257569e95da06d084bbeabc736ac56;hpb=7ec0f31f8f3227ec89de3bf104ba6bac5a03fcf2;p=lttng-tools.git

diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index 9dd95bf2b..0b8bb24e9 100755
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -49,7 +49,7 @@ NUM_TESTS=$(($NUM_TESTS + ($NR_SNAPSHOT * 2)))
 
 function start_test_app()
 {
-	local tmp_file="/tmp/lttng_test_ust.42.file"
+	local tmp_file=$(mktemp -u)
 
 	# Start application with a temporary file.
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
@@ -71,8 +71,9 @@ function stop_test_apps()
 	diag "Stopping $TESTAPP_NAME"
 	for p in ${APPS_PID}; do
 		kill ${p}
-		wait ${p} 2>&1
+		wait ${p} 2>/dev/null
 	done
+	APPS_PID=
 }
 
 function snapshot_add_output ()
@@ -181,7 +182,7 @@ function test_ust_local_snapshot ()
 function test_ust_local_snapshot_max_size ()
 {
 	subbuf_size=8192
-	num_cpus=`nproc`
+	num_cpus=$(conf_proc_count)
 
 	# The minimum size limit is min(subbuf_size) * nb_streams
 	max_size=$(($subbuf_size*$num_cpus))