From adda2c9af486dc17fcf24e330d4ddba12c2c3d67 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 1 Mar 2022 12:33:53 -0500 Subject: [PATCH] Fix: test: test plan/skip must come after TAP initialization MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit TAP is initialized during the sourcing of `utils.sh`. Calling it before yield nothing. Move the platform validation after the `PLAN_TEST` call. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau Change-Id: Ib7b4434440ed7590b39b0580ea294045ace40495 --- tests/regression/kernel/test_select_poll_epoll | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/regression/kernel/test_select_poll_epoll b/tests/regression/kernel/test_select_poll_epoll index 5789a3f59..340419535 100755 --- a/tests/regression/kernel/test_select_poll_epoll +++ b/tests/regression/kernel/test_select_poll_epoll @@ -12,14 +12,6 @@ TESTDIR=$CURDIR/../.. VALIDATE_SCRIPT="$CURDIR/validate_select_poll_epoll.py" NUM_TESTS=102 -# Only run this test on x86 and arm -uname -m | grep -E "x86|i686|arm|aarch64" >/dev/null 2>&1 -if test $? != 0; then - plan_tests $NUM_TESTS - skip 0 "Run only on x86 and arm. Skipping all tests." $NUM_TESTS - exit 0 -fi - DISABLE_VALIDATE=0 # Babeltrace python bindings are required for the validation, but # it is not a mandatory dependancy of the project, so fail run the @@ -364,6 +356,13 @@ plan_tests $NUM_TESTS print_test_banner "$TEST_DESC" +# Only run this test on x86 and arm +uname -m | grep -E "x86|i686|arm|aarch64" >/dev/null 2>&1 +if test $? != 0; then + skip 0 "Run only on x86 and arm. Skipping all tests." $NUM_TESTS + exit 0 +fi + if [ "$(id -u)" == "0" ]; then isroot=1 else -- 2.34.1