Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
From:   Yuran Pereira <yuran.pereira@hotmail.com>
To:     bpf@vger.kernel.org
Cc:     Yuran Pereira <yuran.pereira@hotmail.com>, andrii@kernel.org,
        andrii.nakryiko@gmail.com, mykolal@fb.com, ast@kernel.org,
        martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev,
        john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com,
        haoluo@google.com, jolsa@kernel.org, shuah@kernel.org,
        linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-kernel-mentees@lists.linuxfoundation.org
Subject: [PATCH bpf-next v2 2/4] selftests/bpf: Replaces the usage of CHECK calls for ASSERTs in bind_perm
Date:   Sun, 19 Nov 2023 00:14:29 +0530
Message-ID: <GV1PR10MB6563DA27C0B42E88881B6534E8B6A@GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM>
In-Reply-To: <GV1PR10MB6563AECF8E94798A1E5B36A4E8B6A@GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM>
References: <GV1PR10MB6563AECF8E94798A1E5B36A4E8B6A@GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: GV1PR10MB6563:EE_|AS1PR10MB7936:EE_
X-MS-Office365-Filtering-Correlation-Id: 640a8ffb-8465-492e-abf8-08dbe866774b
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: K7yfJjMruJ4hgLHDUECsSGenJnwyCBjCreAPz7CCYWaFzsCAExzz6RQdWfrOoKZXVPDrbjCMagHqJS+GiKhouCyutKxAqb1VniOYKPKu4B38h2YXvbOReG4LRMu7QvSC/HpTY9Xx6rDICn2goT7LX9f0oYq+9saS9PYcyA+dOZNlTvA3oqFpGaIz5b7cLkqGvlQCiHUdV0AgoHMYmPDaUxEE4kMH9/sFrneqUgHlKwR3EvSpi7fgVUr+XYztgADcdF7EV/SRCIB6uf7W8nRF8V9+DZton7ADvCVxjkQtuhnA/JpQw/Jp97GhEEV6ELdYe70EwI+zAYFdCcq0CQpq2ysMpts6WsKJHTLy0N7nIpSyRIbK2y7qatJjI5ED0mgqvmGFi+x9MlBb+ify/CG00PkULbhI81TS2+29H4CtI6JTIwebgcrOCMxJol+8WkIXRYmFN0vHhA/JWI514pXf4vMFchO1SlHb9Zi7Fe7zaUcABL+CAirFd20rrSTMXIuf1LLzJ4DP+p9lLMEN2PDcbhf9IQPLOoFJHTwWmKMo/t0793obYjGY13IoBiT5EJM0pljlTz9HOX3h5Y2rD6gujwcHvYtxlOu7hbUHg5r6kLFIU4h7d1GiiA8W7QRFXDgQ
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jk6XEUBoVLFzdDXI3/RaAPrPmsKao3huQfWk4V3ONEjBSvRcL0zAF4moNbn3?=
 =?us-ascii?Q?tmXfF5q8RDaYaMvp7Mzqn0qIiJUD8sLOGshLZ10qH914tiXjAbboKKo52P3e?=
 =?us-ascii?Q?8GSLQu8X+fUXfpGEUteeTrIrc9dJwoD6aZkxgkgxPOevVJIuEkGvrsFJrl5E?=
 =?us-ascii?Q?U1G31NP6g/xDsVTxHg5qllcGfQw6kxJppT6gnLa6Oo7kbRrAFp19jAc8Cfei?=
 =?us-ascii?Q?s41gkravKe79y/cNg7tQXLhetDEDBuQBy49DGAKuo428mOLcSdxZhN/1egUk?=
 =?us-ascii?Q?PaSytJKecKEnKEx1JgvMWK/x7ob3jIOiXuXvcbm2rqmtMEf1gi71j7aELgFC?=
 =?us-ascii?Q?s3+BynW6isESh85Sit68xrOvUInY/PzshxbX2x6sdhgdf2SN/2ji+JawX5Xg?=
 =?us-ascii?Q?wnaLlv3BGMtoFhYaXZ6V++lrKbyxNKr7V20MD5It3L6+/lBL990EvPz6W9pD?=
 =?us-ascii?Q?2bd1oszrM3xlTsbbEGdqXQ+KRcouGMRLoHPAZb1nC7pTlPFWFK7d+zxvgsZg?=
 =?us-ascii?Q?q6UNcuHFsHGmTmuYiYHG01MHehxzPFrZEHICwps/2aTdkEfhhqGphfnZ4gtW?=
 =?us-ascii?Q?Gn+s86C7B2jwDSwG4jnRLGd4q3crKzh4BoZLZgiVQ2lfJDLo+JABqp0VjGvn?=
 =?us-ascii?Q?RK2nPyvdIM7uxw5to4U7uTnTAkmwWz3TChITuAH+RTGya3s5d7VOtRfzCamO?=
 =?us-ascii?Q?tFWYIcyJBfYQ7RRFWsuihIgMkSgdC5wAx2ayftqLuwilNJw7zZXCq5Mq7RY8?=
 =?us-ascii?Q?Edw9BLoCdS3dBYXAdb1rR+qKPVVlBn5FahD/obNRkTWqDHdrDC5+EWjRMEYb?=
 =?us-ascii?Q?lU8aifWOdocxKq0bI1pgX1HahQV0V+mfpnLRVyIubcRFiZw6plbwBFuU8A9l?=
 =?us-ascii?Q?nH/n0N/WtaPL54S/vBuECR0c8bFggrNWgs6t59xEhBLPAyTpGJNaZmULc8v6?=
 =?us-ascii?Q?vzlzeC5tBoKQ9oOoOE04mi2LJk5FY75MRNAwUfDPA5qmIxq8vmtlCnO9Gmx8?=
 =?us-ascii?Q?ECBdX8J2osHcthBcDLHqKMh2fcTz/2Gq7Eqs8hsPNxzEfOc+5sXDIGZNAv6b?=
 =?us-ascii?Q?r/cdA9wyf0U9qoxADnztgreOQgkzw71wlg8/5N1ChLxCA9St2bNBAuI3imWW?=
 =?us-ascii?Q?Ei+jfxMBWfzP0AZKMM2tt7KCBKmM0iiM5gkBUuuzjXWMBlvOtAObhlzaAKCU?=
 =?us-ascii?Q?4ftOYILxXBOtsbslStnl8o8nO2tZDvbsemoLSeQPKdBWuqur05zup2BwCAk?=
 =?us-ascii?Q?=3D?=
X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-6b909.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: 640a8ffb-8465-492e-abf8-08dbe866774b
X-MS-Exchange-CrossTenant-AuthSource: GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2023 18:44:59.2032
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR10MB7936
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 18 Nov 2023 10:45:07 -0800 (PST)

bind_perm uses the `CHECK` calls even though the use of
ASSERT_ series of macros is preferred in the bpf selftests.

This patch replaces all `CHECK` calls for equivalent `ASSERT_`
macro calls.

Signed-off-by: Yuran Pereira <yuran.pereira@hotmail.com>
---
 tools/testing/selftests/bpf/prog_tests/bind_perm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/bind_perm.c b/tools/testing/selftests/bpf/prog_tests/bind_perm.c
index a1766a298bb7..f7cd129cb82b 100644
--- a/tools/testing/selftests/bpf/prog_tests/bind_perm.c
+++ b/tools/testing/selftests/bpf/prog_tests/bind_perm.c
@@ -9,8 +9,6 @@
 #include "cap_helpers.h"
 #include "bind_perm.skel.h"
 
-static int duration;
-
 static int create_netns(void)
 {
 	if (!ASSERT_OK(unshare(CLONE_NEWNET), "create netns"))
@@ -27,7 +25,7 @@ void try_bind(int family, int port, int expected_errno)
 	int fd = -1;
 
 	fd = socket(family, SOCK_STREAM, 0);
-	if (CHECK(fd < 0, "fd", "errno %d", errno))
+	if (!ASSERT_GE(fd, 0, "socket"))
 		goto close_socket;
 
 	if (family == AF_INET) {
@@ -60,7 +58,7 @@ void test_bind_perm(void)
 		return;
 
 	cgroup_fd = test__join_cgroup("/bind_perm");
-	if (CHECK(cgroup_fd < 0, "cg-join", "errno %d", errno))
+	if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup"))
 		return;
 
 	skel = bind_perm__open_and_load();
-- 
2.25.1