Tests fix: source utils.sh before using conf_proc_count

[lttng-tools.git] / tests / regression / ust / getcpu-override / test_getcpu_override

diff --git a/tests/regression/ust/getcpu-override/test_getcpu_override b/tests/regression/ust/getcpu-override/test_getcpu_override
index 081099e798d5a99fd816b094ba5e044c1bd94ef1..f140eeaed2e6b1e686c8cb3f57810e4629d804f9 100755 (executable)
--- a/tests/regression/ust/getcpu-override/test_getcpu_override
+++ b/tests/regression/ust/getcpu-override/test_getcpu_override
@@ -45,11 +45,11 @@ SEQUENCE_SEED=(
 89 13 63 6 136 153 23 16 47 130 75 62
 )
 
-# Equivalent to the syconf(_SC_NPROCESSORS_CONF) call.
-NPROC=`nproc --all`
-
 source $TESTDIR/utils/utils.sh
 
+# Equivalent to the syconf(_SC_NPROCESSORS_CONF) call.
+num_cpus=$(conf_proc_count)
+
 if [ ! -x "$CURDIR/.libs/lttng-ust-getcpu-override-test.so" ]; then
        BAIL_OUT "No shared object generated"
 fi
@@ -90,7 +90,7 @@ compare()
        ok $? "Sequence seed and cpuid sequence have the same size ${#SEQUENCE_SEED[*]}/${#array_to_compare[*]}"
 
        for (( i = 0; i < ${#SEQUENCE_SEED[*]}; i++ )); do
-               if [ "${array_to_compare[$i]}" -ne "$(( ${SEQUENCE_SEED[$i]} % $NPROC))" ]; then
+               if [ "${array_to_compare[$i]}" -ne "$(( ${SEQUENCE_SEED[$i]} % $num_cpus))" ]; then
                        valid=1
                        break
                fi
@@ -107,7 +107,7 @@ compare()
                                echo -n "# array value is "
                                echo -n "${array_to_compare[$i]}"
                                echo -n " expected "
-                               echo "$(( ${SEQUENCE_SEED[$i]} % $NPROC))"
+                               echo "$(( ${SEQUENCE_SEED[$i]} % $num_cpus))"
                        done
                        diag "Dumping trace"
                        $BABELTRACE_BIN $TRACE_PATH | awk '{print "# " $0}'