Tests: use configured processor count in snapshot tests

[lttng-tools.git] / tests / regression / tools / snapshots / ust_test

diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index d8ab18880a0b9bc7f152533d81c1a1f36e134f1a..0b8bb24e95b001f39fb9d241fc1c70a770804861 100755 (executable)
--- 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,7 +71,7 @@ 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=
 }
@@ -182,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))