On Fri, Apr 12, 2024 at 07:03:06PM +0200, Petr Machata wrote:
> $ksft_skip is used to mark selftests that have tooling issues. The fact
> that LLDPad is running, but shouldn't, is one such issue. Therefore have
> bail_on_lldpad() bail with $ksft_skip.
>
> Signed-off-by: Petr Machata <petrm@xxxxxxxxxx>
> Reviewed-by: Benjamin Poirier <bpoirier@xxxxxxxxxx>
> ---
> tools/testing/selftests/net/forwarding/lib.sh | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
> index 3cbbc2fd4d7d..7913c6ee418d 100644
> --- a/tools/testing/selftests/net/forwarding/lib.sh
> +++ b/tools/testing/selftests/net/forwarding/lib.sh
> @@ -2138,6 +2138,8 @@ bail_on_lldpad()
> {
> local reason1="$1"; shift
> local reason2="$1"; shift
> + local caller=${FUNCNAME[1]}
> + local src=${BASH_SOURCE[1]}
>
> if systemctl is-active --quiet lldpad; then
>
> @@ -2158,7 +2160,8 @@ bail_on_lldpad()
> an environment variable ALLOW_LLDPAD to a
> non-empty string.
> EOF
> - exit 1
> + log_test_skip $src:$caller
> + exit $EXIT_STATUS
> else
> return
> fi
> --
> 2.43.0
>
Reviewed-by: Hangbin Liu <liuhangbin@xxxxxxxxx>
