From patchwork Fri Apr 7 21:04:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67535 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1C85F3858C1F for ; Fri, 7 Apr 2023 21:04:37 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy2-pub.mail.unifiedlayer.com (gproxy2-pub.mail.unifiedlayer.com [69.89.18.3]) by sourceware.org (Postfix) with ESMTPS id CD92E3858D32 for ; Fri, 7 Apr 2023 21:04:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CD92E3858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway4.mail.pro1.eigbox.com (Postfix) with ESMTP id 2996110047E01 for ; Fri, 7 Apr 2023 21:04:22 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id ktFupQfHwNX2aktFup4RfZ; Fri, 07 Apr 2023 21:04:22 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=NMAQR22g c=1 sm=1 tr=0 ts=64308556 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=dKHAf1wccvYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=3nsOUgJDElzXbOIg0EAA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=J0JOgaZXNLH/S4YjQVR3c/9to1VzBA2ZaZfUYeSeYjo=; b=GKSFFv+JNb+QJmXfX1OvJu0Iv8 ul/ZOXks67PYgSkO7R8n+tBrEbp6vKgsEaDGhCI7Hgx8+F9WOZBU1kK/WSLy/68APDpKUuf7tQKZv 3xWu78thSpQzgNnSO8FqZSfnv; Received: from 75-166-159-36.hlrn.qwest.net ([75.166.159.36]:59404 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pktFt-001jjO-VQ; Fri, 07 Apr 2023 15:04:22 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Use SELF_CHECK in all unit tests Date: Fri, 7 Apr 2023 15:04:08 -0600 Message-Id: <20230407210408.3411936-1-tom@tromey.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.159.36 X-Source-L: No X-Exim-ID: 1pktFt-001jjO-VQ X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-159-36.hlrn.qwest.net (localhost.localdomain) [75.166.159.36]:59404 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3026.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" I noticed a few unit tests are using gdb_assert. I think this was an older style, before SELF_CHECK was added. This patch switches them over. --- gdb/unittests/filtered_iterator-selftests.c | 20 +++---- gdb/unittests/intrusive_list-selftests.c | 60 ++++++++++----------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/gdb/unittests/filtered_iterator-selftests.c b/gdb/unittests/filtered_iterator-selftests.c index 6e93a09627a..2558bb4291b 100644 --- a/gdb/unittests/filtered_iterator-selftests.c +++ b/gdb/unittests/filtered_iterator-selftests.c @@ -59,7 +59,7 @@ struct int_array_iterator /* If they are both not past-the-end, make sure they iterate on the same array (we shouldn't compare iterators that iterate on different things). */ - gdb_assert (m_array == other.m_array); + SELF_CHECK (m_array == other.m_array); /* They are equal if they have the same current index. */ return m_cur_idx == other.m_cur_idx; @@ -73,7 +73,7 @@ struct int_array_iterator void operator++ () { /* Make sure nothing tries to increment a past the end iterator. */ - gdb_assert (m_cur_idx < m_size); + SELF_CHECK (m_cur_idx < m_size); m_cur_idx++; @@ -85,7 +85,7 @@ struct int_array_iterator int operator* () const { /* Make sure nothing tries to dereference a past the end iterator. */ - gdb_assert (m_cur_idx < m_size); + SELF_CHECK (m_cur_idx < m_size); return m_array[m_cur_idx]; } @@ -123,7 +123,7 @@ test_filtered_iterator () for (; iter != end; ++iter) even_ints.push_back (*iter); - gdb_assert (even_ints == expected_even_ints); + SELF_CHECK (even_ints == expected_even_ints); } /* Test operator== and operator!=. */ @@ -139,18 +139,18 @@ test_filtered_iterator_eq () iter2(array, ARRAY_SIZE (array)); /* They start equal. */ - gdb_assert (iter1 == iter2); - gdb_assert (!(iter1 != iter2)); + SELF_CHECK (iter1 == iter2); + SELF_CHECK (!(iter1 != iter2)); /* Advance 1, now they aren't equal (despite pointing to equal values). */ ++iter1; - gdb_assert (!(iter1 == iter2)); - gdb_assert (iter1 != iter2); + SELF_CHECK (!(iter1 == iter2)); + SELF_CHECK (iter1 != iter2); /* Advance 2, now they are equal again. */ ++iter2; - gdb_assert (iter1 == iter2); - gdb_assert (!(iter1 != iter2)); + SELF_CHECK (iter1 == iter2); + SELF_CHECK (!(iter1 != iter2)); } } /* namespace selftests */ diff --git a/gdb/unittests/intrusive_list-selftests.c b/gdb/unittests/intrusive_list-selftests.c index fe47177d51f..1f85b326683 100644 --- a/gdb/unittests/intrusive_list-selftests.c +++ b/gdb/unittests/intrusive_list-selftests.c @@ -87,13 +87,13 @@ struct intrusive_list_test { const item_type &item = *it; - gdb_assert (i < expected.size ()); - gdb_assert (&item == expected[i]); + SELF_CHECK (i < expected.size ()); + SELF_CHECK (&item == expected[i]); ++i; } - gdb_assert (i == expected.size ()); + SELF_CHECK (i == expected.size ()); for (typename ListType::reverse_iterator it = list.rbegin (); it != list.rend (); @@ -103,11 +103,11 @@ struct intrusive_list_test --i; - gdb_assert (i >= 0); - gdb_assert (&item == expected[i]); + SELF_CHECK (i >= 0); + SELF_CHECK (&item == expected[i]); } - gdb_assert (i == 0); + SELF_CHECK (i == 0); } static void @@ -384,10 +384,10 @@ struct intrusive_list_test list.push_back (b); list.push_back (c); - gdb_assert (&list.front () == &a); - gdb_assert (&clist.front () == &a); - gdb_assert (&list.back () == &c); - gdb_assert (&clist.back () == &c); + SELF_CHECK (&list.front () == &a); + SELF_CHECK (&clist.front () == &a); + SELF_CHECK (&list.back () == &c); + SELF_CHECK (&clist.back () == &c); } static void @@ -701,14 +701,14 @@ struct intrusive_list_test expected = {}; verify_items (list, expected); - gdb_assert (disposer_calls == 3); - gdb_assert (disposer_seen.find (&a) != disposer_seen.end ()); - gdb_assert (disposer_seen.find (&b) != disposer_seen.end ()); - gdb_assert (disposer_seen.find (&c) != disposer_seen.end ()); + SELF_CHECK (disposer_calls == 3); + SELF_CHECK (disposer_seen.find (&a) != disposer_seen.end ()); + SELF_CHECK (disposer_seen.find (&b) != disposer_seen.end ()); + SELF_CHECK (disposer_seen.find (&c) != disposer_seen.end ()); /* Verify idempotency. */ list.clear_and_dispose (disposer); - gdb_assert (disposer_calls == 3); + SELF_CHECK (disposer_calls == 3); } static void @@ -717,11 +717,11 @@ struct intrusive_list_test item_type a ("a"); ListType list; - gdb_assert (list.empty ()); + SELF_CHECK (list.empty ()); list.push_back (a); - gdb_assert (!list.empty ()); + SELF_CHECK (!list.empty ()); list.erase (list.iterator_to (a)); - gdb_assert (list.empty ()); + SELF_CHECK (list.empty ()); } static void @@ -735,12 +735,12 @@ struct intrusive_list_test list.push_back (b); list.push_back (c); - gdb_assert (&*list.begin () == &a); - gdb_assert (&*list.cbegin () == &a); - gdb_assert (&*clist.begin () == &a); - gdb_assert (&*list.rbegin () == &c); - gdb_assert (&*list.crbegin () == &c); - gdb_assert (&*clist.rbegin () == &c); + SELF_CHECK (&*list.begin () == &a); + SELF_CHECK (&*list.cbegin () == &a); + SELF_CHECK (&*clist.begin () == &a); + SELF_CHECK (&*list.rbegin () == &c); + SELF_CHECK (&*list.crbegin () == &c); + SELF_CHECK (&*clist.rbegin () == &c); /* At least check that they compile. */ list.end (); @@ -782,22 +782,22 @@ test_node_is_linked () item_with_base a ("a"); item_with_base_list list; - gdb_assert (!a.is_linked ()); + SELF_CHECK (!a.is_linked ()); list.push_back (a); - gdb_assert (a.is_linked ()); + SELF_CHECK (a.is_linked ()); list.pop_back (); - gdb_assert (!a.is_linked ()); + SELF_CHECK (!a.is_linked ()); } { item_with_member a ("a"); item_with_member_list list; - gdb_assert (!a.node.is_linked ()); + SELF_CHECK (!a.node.is_linked ()); list.push_back (a); - gdb_assert (a.node.is_linked ()); + SELF_CHECK (a.node.is_linked ()); list.pop_back (); - gdb_assert (!a.node.is_linked ()); + SELF_CHECK (!a.node.is_linked ()); } }