From patchwork Fri Feb 16 00:26:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13559322 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E413D27A; Fri, 16 Feb 2024 00:26:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708043187; cv=none; b=FGidxqBLfSNRG5YDA/R1ZXZuVgsxrUXmkl1OwCBp4JiPxFSZD8vw69FCGfmLJdGairyKZLQGuSb8OrxOpOsriNv2dSIdf8NvXZrpy8fQJra9VSddWDKtZS9XzogBNg5NC72bdvKcHoRca8We/OBSEwSSp4OA+M3vNs5h+Pb2JDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708043187; c=relaxed/simple; bh=kwKiBDztizT5PCVWWAAG283qr1ciUc48zykcpGO4k4Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=swe8nB3pX8RAXlvmOibcbh4jg0/651dcKVm8P1wRgYJ/eYsv+Eo816Loy13Vz2RDoqVEvPaQWv1tdJMwKkyE+ZCg7Yis+zSCiwKmXfCffe2l2Qrfq+0OTqgkMEEcd8wpJwcRtbPycFKB9+jtOOg6cLISmQzrZDOclJxlZjzFN78= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gSYkKIRa; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gSYkKIRa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88186C43394; Fri, 16 Feb 2024 00:26:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708043186; bh=kwKiBDztizT5PCVWWAAG283qr1ciUc48zykcpGO4k4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gSYkKIRamH3krFkv7JiYq7zq6EXz05FkTvsaxvObNuMKfib8usTRH3ulz5iAubYlm IHDmdM9z6vAjXUDDAjQmuZP3dQl8/Sv0gH6S7DpmntPKluo2HjUz7Now4Ut9Bcxpe+ kkER8qSC1rpGMbLSZPJUM2gbwK78thmPmPiBufw0Ij+pNlkj3MtgOX5HrlibajoH9K 8640IMFWLpTSbpfhdl7HwOBKYmx/64lUrC+UvkFXBAxObNoHZryx0vP6aQHJbcUr7c EULIfzlq6Fr96b+vJSBogYWn/O9Z6qHzRpVdsxI6xJ+5fAz6xpiA9B+8CMpDfeOsYC TmdfNvijMm2+g== From: Jakub Kicinski To: shuah@kernel.org, keescook@chromium.org Cc: linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, jakub@cloudflare.com, Jakub Kicinski Subject: [PATCH net-next v2 1/4] selftests: kselftest_harness: pass step via shared memory Date: Thu, 15 Feb 2024 16:26:16 -0800 Message-ID: <20240216002619.1999225-2-kuba@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240216002619.1999225-1-kuba@kernel.org> References: <20240216002619.1999225-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Commit 0ef67a888375 ("selftests/harness: Report skip reason") added shared memory to communicate between harness and test. Use that instead of exit codes to send the failing step back to the harness. The exit codes are limited and because of the step passing we can't use the full range of KSFT_* exit codes. Acked-by: Kees Cook Tested-by: Jakub Sitnicki Signed-off-by: Jakub Kicinski --- tools/testing/selftests/kselftest_harness.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h index e05ac8261046..98bdedf9a53a 100644 --- a/tools/testing/selftests/kselftest_harness.h +++ b/tools/testing/selftests/kselftest_harness.h @@ -101,8 +101,8 @@ * ASSERT_* number for which the test failed. This behavior can be enabled by * writing `_metadata->no_print = true;` before the check sequence that is * unable to print. When an error occur, instead of printing an error message - * and calling `abort(3)`, the test process call `_exit(2)` with the assert - * number as argument, which is then printed by the parent process. + * and calling `abort(3)`, the test process call `_exit(2)` and pass the error + * to be printed to the parent process via shared memory. */ #define TH_LOG(fmt, ...) do { \ if (TH_LOG_ENABLED) \ @@ -695,9 +695,8 @@ __bail(_assert, _metadata)) #define __INC_STEP(_metadata) \ - /* Keep "step" below 255 (which is used for "SKIP" reporting). */ \ - if (_metadata->passed && _metadata->step < 253) \ - _metadata->step++; + if (_metadata->passed) \ + _metadata->results->step++; #define is_signed_type(var) (!!(((__typeof__(var))(-1)) < (__typeof__(var))1)) @@ -784,6 +783,7 @@ struct __test_results { char reason[1024]; /* Reason for test result */ + unsigned int step; /* Test step reached without failure */ }; struct __test_metadata; @@ -837,7 +837,6 @@ struct __test_metadata { int trigger; /* extra handler after the evaluation */ int timeout; /* seconds to wait for test timeout */ bool timed_out; /* did this test timeout instead of exiting? */ - __u8 step; bool no_print; /* manual trigger when TH_LOG_STREAM is not available */ bool aborted; /* stopped test due to failed ASSERT */ bool setup_completed; /* did setup finish? */ @@ -875,7 +874,7 @@ static inline void __test_check_assert(struct __test_metadata *t) { if (t->aborted) { if (t->no_print) - _exit(t->step); + _exit(1); abort(); } } @@ -960,7 +959,7 @@ void __wait_for_test(struct __test_metadata *t) fprintf(TH_LOG_STREAM, "# %s: Test failed at step #%d\n", t->name, - WEXITSTATUS(status)); + t->results->step); } } } else if (WIFSIGNALED(status)) { @@ -1114,9 +1113,9 @@ void __run_test(struct __fixture_metadata *f, t->passed = 1; t->skip = 0; t->trigger = 0; - t->step = 1; t->no_print = 0; memset(t->results->reason, 0, sizeof(t->results->reason)); + t->results->step = 1; ksft_print_msg(" RUN %s%s%s.%s ...\n", f->name, variant->name[0] ? "." : "", variant->name, t->name); @@ -1137,8 +1136,8 @@ void __run_test(struct __fixture_metadata *f, /* Pass is exit 0 */ if (t->passed) _exit(0); - /* Something else happened, report the step. */ - _exit(t->step); + /* Something else happened. */ + _exit(1); } else { __wait_for_test(t); } From patchwork Fri Feb 16 00:26:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13559323 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF239D520; Fri, 16 Feb 2024 00:26:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708043187; cv=none; b=fdDHKJE+aRQ1LmciaLFW137WMbitlJmbFN1j6BcLX5FL+n5iOGHorxoV500rDfQPr7iIsDK9ZuKyp56sINJPz292su4knmSNwEHoqoFIypKKUK4H4rX0onIex+eiMihq33MN39x8bUYabiVYY3VtYOrXu1NYMhUkrDfT867dw5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708043187; c=relaxed/simple; bh=Z9hNhdVvFV7ETtFUNB58TEtQQH7wuVllQqGyEb2w9Y8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ycby38GRzmMicozC+04DBCRbxH5SkkTjlBK0SCt+rhq81NEff4EQbrES3mqj+/tUirtNBaXoSWJPU1RLp9krgqWqer4Awm8T1Gtw37riudIkGMQVYUhQIC2vfCIhZBLjko1HBedRz0guoncUBfUDLNooiom24Wdwqbt4IJqCdWA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FjVgmYGs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FjVgmYGs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A313C43399; Fri, 16 Feb 2024 00:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708043187; bh=Z9hNhdVvFV7ETtFUNB58TEtQQH7wuVllQqGyEb2w9Y8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FjVgmYGsl0+XRHuO2PWg/dI6SBCPGP47VNJIOyYsvbu0uTExqd8NOtBOVm9u7RF0k 6EA2mnCkSg8PdrD7MYZIUoq6AO8L7ypyRTFAqtyAZsjsM16yD+BE6Yy0SoSwR6ZJex RafD2WkCniT68Nx1dhKmhe07hJNZyCw9sXboEJ+Yl2pJLhQnX1rKevS/NsdDHBpGIS ZUMc9JzyVQ86bw2un6uiTVn4tJwugtEV+JTk753NVfeW9piZkBHm8k41s6eUELzrrN 0nCQghz/uQg7uzoLWBdtHHD/1nJXRlWb93Qh1fiT06AVUYPr8bO/5St7iC9GZM/KhK JrlHbae80qHAg== From: Jakub Kicinski To: shuah@kernel.org, keescook@chromium.org Cc: linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, jakub@cloudflare.com, Jakub Kicinski Subject: [PATCH net-next v2 2/4] selftests: kselftest_harness: use KSFT_* exit codes Date: Thu, 15 Feb 2024 16:26:17 -0800 Message-ID: <20240216002619.1999225-3-kuba@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240216002619.1999225-1-kuba@kernel.org> References: <20240216002619.1999225-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Now that we no longer need low exit codes to communicate assertion steps - use normal KSFT exit codes. Acked-by: Kees Cook Tested-by: Jakub Sitnicki Signed-off-by: Jakub Kicinski --- tools/testing/selftests/kselftest_harness.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h index 98bdedf9a53a..618b41eac749 100644 --- a/tools/testing/selftests/kselftest_harness.h +++ b/tools/testing/selftests/kselftest_harness.h @@ -874,7 +874,7 @@ static inline void __test_check_assert(struct __test_metadata *t) { if (t->aborted) { if (t->no_print) - _exit(1); + _exit(KSFT_FAIL); abort(); } } @@ -937,7 +937,7 @@ void __wait_for_test(struct __test_metadata *t) fprintf(TH_LOG_STREAM, "# %s: Test terminated by timeout\n", t->name); } else if (WIFEXITED(status)) { - if (WEXITSTATUS(status) == 255) { + if (WEXITSTATUS(status) == KSFT_SKIP) { /* SKIP */ t->passed = 1; t->skip = 1; @@ -950,7 +950,7 @@ void __wait_for_test(struct __test_metadata *t) } else { switch (WEXITSTATUS(status)) { /* Success */ - case 0: + case KSFT_PASS: t->passed = 1; break; /* Other failure, assume step report. */ @@ -1132,12 +1132,11 @@ void __run_test(struct __fixture_metadata *f, setpgrp(); t->fn(t, variant); if (t->skip) - _exit(255); - /* Pass is exit 0 */ + _exit(KSFT_SKIP); if (t->passed) - _exit(0); + _exit(KSFT_PASS); /* Something else happened. */ - _exit(1); + _exit(KSFT_FAIL); } else { __wait_for_test(t); } From patchwork Fri Feb 16 00:26:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13559324 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DFF4DDC9; Fri, 16 Feb 2024 00:26:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708043188; cv=none; b=nyqvpLYcEm0UymvxU89zWZGSeOJVbFVk1SlqlUKjHEd99nk2Dpn+vAotLs/7wY5xqI0dXPBUq1CXdvPZNKRdpQaXAWT90S6JoXuNDNNrznq6J8zqvVoeWbVvQsWbXNA7PPM7NDNihx+HdG3WGGLo5bF5c9EeXxe8SFD+B65ijIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708043188; c=relaxed/simple; bh=q0xfZYAcm1JrBc0ZtQu1vUugWevh4kl+g+bxVxnZu5A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GdrPw4YC9TxhlEmFEYLbpLzeVQtqViXx9WSdYfEKjuXwTc1Fh6W+H4wyoLDRNjaHjeq75KyM6t4jFAkuBJzRnQkfd3Oel8LFuIBv5bI/ECCczOKYcQxRCi2yp/ipDE9KDsbS3agJAjQk+7F6dm5N7AQgv4q2M83dNhyC0IWwnyo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=s0Y80cjI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="s0Y80cjI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A742C433C7; Fri, 16 Feb 2024 00:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708043187; bh=q0xfZYAcm1JrBc0ZtQu1vUugWevh4kl+g+bxVxnZu5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s0Y80cjIpEEgB014f4Ifqv8iDjMEahxahTbzHblWOCBlPIQ71jBMY15QVlNc5RQkG pGgghWoqFD49hW3s7pemcCORtT0RjfuDKjbsntjnPip5KkXm+QrAcmQpw36JMAJ9Ws VhOBRXXrSSUjJRZj0gB68UJTLIGA4P9M2VLnuXGpxou5HadGW5OgXVmbuywrJJs1sx 9NZ2l25c6EgD2maNYTCOY9hIAPPG7Cai3AU8yE52f0iaJSHnER+dbDULSsk3pBPPKK 2hu9MFDIkCc7yueQ/+AM6ChGAkGNVbxTod7RAjCwCOb/hcmrhYZPBBIcWaYohgb+Db pXPg0Q2mMXAfg== From: Jakub Kicinski To: shuah@kernel.org, keescook@chromium.org Cc: linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, jakub@cloudflare.com, Jakub Kicinski Subject: [PATCH net-next v2 3/4] selftests: kselftest_harness: support using xfail Date: Thu, 15 Feb 2024 16:26:18 -0800 Message-ID: <20240216002619.1999225-4-kuba@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240216002619.1999225-1-kuba@kernel.org> References: <20240216002619.1999225-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Selftest summary includes XFAIL but there's no way to use it from within the harness. Support it in a similar way to skip. Currently tests report skip for things they expect to fail e.g. when given combination of parameters is known to be unsupported. This is confusing because in an ideal environment and fully featured kernel no tests should be skipped. Acked-by: Kees Cook Tested-by: Jakub Sitnicki Signed-off-by: Jakub Kicinski --- v2: fix alignment of the reason (remove one space after XFAIL) --- tools/testing/selftests/kselftest_harness.h | 37 +++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h index 618b41eac749..04177813930b 100644 --- a/tools/testing/selftests/kselftest_harness.h +++ b/tools/testing/selftests/kselftest_harness.h @@ -141,6 +141,33 @@ statement; \ } while (0) +/** + * XFAIL() + * + * @statement: statement to run after reporting XFAIL + * @fmt: format string + * @...: optional arguments + * + * .. code-block:: c + * + * XFAIL(statement, fmt, ...); + * + * This forces a "pass" after reporting why something is expected to fail, + * and runs "statement", which is usually "return" or "goto skip". + */ +#define XFAIL(statement, fmt, ...) do { \ + snprintf(_metadata->results->reason, \ + sizeof(_metadata->results->reason), fmt, ##__VA_ARGS__); \ + if (TH_LOG_ENABLED) { \ + fprintf(TH_LOG_STREAM, "# XFAIL %s\n", \ + _metadata->results->reason); \ + } \ + _metadata->passed = 1; \ + _metadata->xfail = 1; \ + _metadata->trigger = 0; \ + statement; \ +} while (0) + /** * TEST() - Defines the test function and creates the registration * stub @@ -834,6 +861,7 @@ struct __test_metadata { int termsig; int passed; int skip; /* did SKIP get used? */ + int xfail; /* did XFAIL get used? */ int trigger; /* extra handler after the evaluation */ int timeout; /* seconds to wait for test timeout */ bool timed_out; /* did this test timeout instead of exiting? */ @@ -941,6 +969,9 @@ void __wait_for_test(struct __test_metadata *t) /* SKIP */ t->passed = 1; t->skip = 1; + } else if (WEXITSTATUS(status) == KSFT_XFAIL) { + t->passed = 1; + t->xfail = 1; } else if (t->termsig != -1) { t->passed = 0; fprintf(TH_LOG_STREAM, @@ -1112,6 +1143,7 @@ void __run_test(struct __fixture_metadata *f, /* reset test struct */ t->passed = 1; t->skip = 0; + t->xfail = 0; t->trigger = 0; t->no_print = 0; memset(t->results->reason, 0, sizeof(t->results->reason)); @@ -1133,6 +1165,8 @@ void __run_test(struct __fixture_metadata *f, t->fn(t, variant); if (t->skip) _exit(KSFT_SKIP); + if (t->xfail) + _exit(KSFT_XFAIL); if (t->passed) _exit(KSFT_PASS); /* Something else happened. */ @@ -1146,6 +1180,9 @@ void __run_test(struct __fixture_metadata *f, if (t->skip) ksft_test_result_skip("%s\n", t->results->reason[0] ? t->results->reason : "unknown"); + else if (t->xfail) + ksft_test_result_xfail("%s\n", t->results->reason[0] ? + t->results->reason : "unknown"); else ksft_test_result(t->passed, "%s%s%s.%s\n", f->name, variant->name[0] ? "." : "", variant->name, t->name); From patchwork Fri Feb 16 00:26:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13559325 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B600DF58; Fri, 16 Feb 2024 00:26:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708043188; cv=none; b=VzdPZbsYuFT0Spjk+uoUrhI55jjFCn/HYAHO1LyxpzEA7mhgnKCjzt4iGm7Qv3CNvfJuOYNfP2bbxbT5GsTXFDDjGGmtz2AjQLMZD3QUmbZ2+6GKM+BT7gNYAjbmwLLPyscfCuINvjJQvFK3EBdpIHyspiga+U+ZYhLEi0AnImY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708043188; c=relaxed/simple; bh=lXyymbj5JxAALmr55E/ta+tS01Gc7jBnpZ55sx8kYpE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j8N4qsLjoXLzq3EfFdM8Ma0AP8/FZZyguoqVwaVH8bexzBaR2xS1p5izG/RlvvlabCuCVfHNWtV+eamDFuieVW6uZXBXhnXRy4Ow2wY3g9i51sL/pTYhhQLtKBsP0Ac6llk8JNJ+Q4GesT/UXYW6fzXs2Fsw85lUIiZZt/zrd9k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dSnjsn+k; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dSnjsn+k" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE8E9C43390; Fri, 16 Feb 2024 00:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708043188; bh=lXyymbj5JxAALmr55E/ta+tS01Gc7jBnpZ55sx8kYpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dSnjsn+kZQyKfVfiDcc3RFujWxeuzn1Z+HPrWkyNvIj/sG41SAqP+Sg5Urd44I3em az5CYUbcMUC/1Vy/GG/4GefPwXycIvxq5QFTkYhnm7nuT9xgSaCAlyZFx8nlhGqNPo WvzWW+/b79Ef14QRIcgyotars+Y11kqrwL6xxXeWOCCx4KTRVe2ZKzGLzb+BHAc72l btol6H/xn8n3ZJoIrV1EbzRKf/zjrja1rVG1LmvF4ES6gI+Ta3E6qb3pZDSs1a1cWs VZ6O/xRJWaKR9El+rg1aDY2HnfgBRzpdJpJEcA7W4bWA7U/OOTyeY6cEEP1HQRZuyl CCUVzXhbQ4BWw== From: Jakub Kicinski To: shuah@kernel.org, keescook@chromium.org Cc: linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, jakub@cloudflare.com, Jakub Kicinski Subject: [PATCH net-next v2 4/4] selftests: ip_local_port_range: use XFAIL instead of SKIP Date: Thu, 15 Feb 2024 16:26:19 -0800 Message-ID: <20240216002619.1999225-5-kuba@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240216002619.1999225-1-kuba@kernel.org> References: <20240216002619.1999225-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 SCTP does not support IP_LOCAL_PORT_RANGE and we know it, so use XFAIL instead of SKIP. Reviewed-by: Kees Cook Tested-by: Jakub Sitnicki Signed-off-by: Jakub Kicinski --- tools/testing/selftests/net/ip_local_port_range.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/ip_local_port_range.c b/tools/testing/selftests/net/ip_local_port_range.c index 6ebd58869a63..d4f789f524e5 100644 --- a/tools/testing/selftests/net/ip_local_port_range.c +++ b/tools/testing/selftests/net/ip_local_port_range.c @@ -366,7 +366,7 @@ TEST_F(ip_local_port_range, late_bind) __u16 port; if (variant->so_protocol == IPPROTO_SCTP) - SKIP(return, "SCTP doesn't support IP_BIND_ADDRESS_NO_PORT"); + XFAIL(return, "SCTP doesn't support IP_BIND_ADDRESS_NO_PORT"); fd = socket(variant->so_domain, variant->so_type, 0); ASSERT_GE(fd, 0) TH_LOG("socket failed");