X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fgetcpu-override%2Ftest_getcpu_override;h=4ca385aeb0c5e19f58136af4c979498eb8a86963;hp=585f3b3a0c58d8593ed720b3dc5c99a5042791f3;hb=f37e092d5360510f2975ea5bd0ae69084ae17691;hpb=75da093a5547d11cd6b0bcbd6fa80bbe901c8870 diff --git a/tests/regression/ust/getcpu-override/test_getcpu_override b/tests/regression/ust/getcpu-override/test_getcpu_override index 585f3b3a0..4ca385aeb 100755 --- a/tests/regression/ust/getcpu-override/test_getcpu_override +++ b/tests/regression/ust/getcpu-override/test_getcpu_override @@ -45,14 +45,10 @@ SEQUENCE_SEED=( 89 13 63 6 136 153 23 16 47 130 75 62 ) -# Equivalent to the syconf(_SC_NPROCESSORS_CONF) call. -num_cpus=$(conf_proc_count) - source $TESTDIR/utils/utils.sh -if [ ! -x "$CURDIR/.libs/lttng-ust-getcpu-override-test.so" ]; then - BAIL_OUT "No shared object generated" -fi +# Equivalent to the syconf(_SC_NPROCESSORS_CONF) call. +num_cpus=$(conf_proc_count) # MUST set TESTDIR before calling those functions @@ -161,6 +157,14 @@ plan_tests $NUM_TESTS print_test_banner "$TEST_DESC" +if [ -x "$CURDIR/.libs/lttng-ust-getcpu-override-test.so" ]; then + foundobj=1 +else + foundobj=0 +fi + +skip $foundobj "No shared object generated. Skipping all tests." $NUM_TESTS && exit 0 + TESTS=( test_getcpu_override_fail test_getcpu_override