From: Jonathan Rajotte Date: Tue, 1 Mar 2022 17:33:53 +0000 (-0500) Subject: Fix: test: test plan/skip must come after TAP initialization X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=564b41c459b1d73600fd1606947d9fe0ec082631;p=lttng-tools.git Fix: test: test plan/skip must come after TAP initialization 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 --- diff --git a/tests/regression/kernel/test_select_poll_epoll b/tests/regression/kernel/test_select_poll_epoll index 44b389213..d8245a0e7 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 @@ -375,6 +367,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