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 3e8635cd76af6e7e920d52311ccf1419c442bab1..f140eeaed2e6b1e686c8cb3f57810e4629d804f9 100755 (executable)
--- a/tests/regression/ust/getcpu-override/test_getcpu_override
+++ b/tests/regression/ust/getcpu-override/test_getcpu_override
@@ -25,6 +25,7 @@ TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 TESTAPP_WRAPPER="run-getcpu-override"
 NUM_EVENT=256
+EVENT_WAIT_USEC=1
 EVENT_NAME="tp:tptest"
 
 NUM_TESTS=20
@@ -44,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
@@ -58,14 +59,14 @@ fi
 run_app()
 {
        diag "Launching app without getcpu-plugin wrapper"
-       $TESTAPP_BIN $NUM_EVENT 1
+       $TESTAPP_BIN $NUM_EVENT $EVENT_WAIT_USEC
        ok $? "Application without wrapper done"
 }
 
 run_getcpu_plugin_app()
 {
        diag "Launching app with getcpu-plugin wrapper"
-       $CURDIR/$TESTAPP_WRAPPER $TESTAPP_BIN $NUM_EVENT
+       $CURDIR/$TESTAPP_WRAPPER $TESTAPP_BIN $NUM_EVENT $EVENT_WAIT_USEC
        ok $? "Application with wrapper done"
 }
 
@@ -89,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
@@ -106,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}'