From 4e557b9f7c41895d88b9ab99c01d73facdf1b4e5 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 12 Mar 2019 14:30:30 -0400 Subject: [PATCH] Fix tests: skip test_getcpu_override on single core systems MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit There is no value in performing this test on single-core system since the only valid value for the cpu field is 0. This test currently fails on single-core systems (i.e yocto runqemu) on the test_getcpu_override_fail test case. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- .../ust/getcpu-override/test_getcpu_override | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/regression/ust/getcpu-override/test_getcpu_override b/tests/regression/ust/getcpu-override/test_getcpu_override index 4ca385aeb..72010581e 100755 --- a/tests/regression/ust/getcpu-override/test_getcpu_override +++ b/tests/regression/ust/getcpu-override/test_getcpu_override @@ -157,13 +157,19 @@ 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 +if [ ! -x "$CURDIR/.libs/lttng-ust-getcpu-override-test.so" ]; then + skip 0 "No shared object generated. Skipping all tests." $NUM_TESTS && exit 0 +fi + +if [ "$num_cpus" -eq "1" ]; then + # Skip the test since we cannot perform it as designed since N mod 1 + # is always equals to zero. There is no point testing this on a system + # with a single configured core. LTTng-UST limits the get_cpu function + # to return value inside the [0, NUM_CPU - 1] range for a valid event + # (present in trace). + skip 0 "Test system only have a single thread. Skipping all tests." $NUM_TESTS && exit 0 fi -skip $foundobj "No shared object generated. Skipping all tests." $NUM_TESTS && exit 0 TESTS=( test_getcpu_override_fail -- 2.34.1