From: David Malcolm <dmalcolm@redhat.com>
To: gcc-patches@gcc.gnu.org
Cc: Joseph Myers <joseph@codesourcery.com>,
David Malcolm <dmalcolm@redhat.com>
Subject: [PATCH 1/4] selftest.h: Add ASSERT_TRUE_AT and ASSERT_FALSE_AT
Date: Wed, 03 Aug 2016 15:17:00 -0000 [thread overview]
Message-ID: <1470239113-42666-1-git-send-email-dmalcolm@redhat.com> (raw)
In-Reply-To: <1469841382.17384.65.camel@redhat.com>
I split out the selftest.h changes from v2 of the kit for ease of review;
here they are.
Successfully bootstrapped®rtested in conjunction with the rest of the
patch kit on x86_64-pc-linux-gnu.
OK for trunk?
gcc/ChangeLog:
* selftest.h (ASSERT_TRUE): Reimplement in terms of...
(ASSERT_TRUE_AT): New macro.
(ASSERT_FALSE): Reimplement in terms of...
(ASSERT_FALSE_AT): New macro.
(ASSERT_STREQ_AT): Fix typo in comment.
---
gcc/selftest.h | 30 +++++++++++++++++++++---------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/gcc/selftest.h b/gcc/selftest.h
index 0bee476..397e998 100644
--- a/gcc/selftest.h
+++ b/gcc/selftest.h
@@ -104,13 +104,19 @@ extern int num_passes;
::selftest::fail if it false. */
#define ASSERT_TRUE(EXPR) \
+ ASSERT_TRUE_AT (SELFTEST_LOCATION, (EXPR))
+
+/* Like ASSERT_TRUE, but treat LOC as the effective location of the
+ selftest. */
+
+#define ASSERT_TRUE_AT(LOC, EXPR) \
SELFTEST_BEGIN_STMT \
const char *desc = "ASSERT_TRUE (" #EXPR ")"; \
bool actual = (EXPR); \
if (actual) \
- ::selftest::pass (SELFTEST_LOCATION, desc); \
+ ::selftest::pass ((LOC), desc); \
else \
- ::selftest::fail (SELFTEST_LOCATION, desc); \
+ ::selftest::fail ((LOC), desc); \
SELFTEST_END_STMT
/* Evaluate EXPR and coerce to bool, calling
@@ -118,13 +124,19 @@ extern int num_passes;
::selftest::fail if it true. */
#define ASSERT_FALSE(EXPR) \
+ ASSERT_FALSE_AT (SELFTEST_LOCATION, (EXPR))
+
+/* Like ASSERT_FALSE, but treat LOC as the effective location of the
+ selftest. */
+
+#define ASSERT_FALSE_AT(LOC, EXPR) \
SELFTEST_BEGIN_STMT \
- const char *desc = "ASSERT_FALSE (" #EXPR ")"; \
- bool actual = (EXPR); \
- if (actual) \
- ::selftest::fail (SELFTEST_LOCATION, desc); \
- else \
- ::selftest::pass (SELFTEST_LOCATION, desc); \
+ const char *desc = "ASSERT_FALSE (" #EXPR ")"; \
+ bool actual = (EXPR); \
+ if (actual) \
+ ::selftest::fail ((LOC), desc); \
+ else \
+ ::selftest::pass ((LOC), desc); \
SELFTEST_END_STMT
/* Evaluate EXPECTED and ACTUAL and compare them with ==, calling
@@ -169,7 +181,7 @@ extern int num_passes;
(EXPECTED), (ACTUAL)); \
SELFTEST_END_STMT
-/* Like ASSERT_STREQ_AT, but treat LOC as the effective location of the
+/* Like ASSERT_STREQ, but treat LOC as the effective location of the
selftest. */
#define ASSERT_STREQ_AT(LOC, EXPECTED, ACTUAL) \
--
1.8.5.3
next prev parent reply other threads:[~2016-08-03 15:17 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-08 21:22 [PATCH] RFC: On-demand locations within string-literals David Malcolm
2016-07-20 19:38 ` David Malcolm
2016-07-21 16:38 ` Jeff Law
2016-07-26 16:43 ` [PATCH 1/3] (v2) " David Malcolm
2016-07-26 16:43 ` [PATCH 2/3] Use class substring_loc in c-format.c (PR c/52952) David Malcolm
2016-07-26 16:43 ` [PATCH 3/3] c-format.c: suggest the correct format string to use (PR c/64955) David Malcolm
2016-07-26 18:06 ` [PATCH 1/3] (v2) On-demand locations within string-literals Manuel López-Ibáñez
2016-07-27 14:30 ` David Malcolm
2016-07-27 22:42 ` Manuel López-Ibáñez
2016-07-28 20:12 ` David Malcolm
2016-07-28 20:38 ` Martin Sebor
2016-07-28 21:17 ` Martin Sebor
2016-07-29 12:37 ` David Malcolm
2016-07-29 14:22 ` Martin Sebor
2016-07-29 14:46 ` David Malcolm
2016-07-29 15:26 ` David Malcolm
2016-07-29 16:54 ` Manuel López-Ibáñez
2016-07-29 17:27 ` David Malcolm
2016-07-30 1:18 ` Manuel López-Ibáñez
2016-08-03 15:56 ` Jeff Law
2016-08-01 21:13 ` Joseph Myers
2016-07-29 21:42 ` Joseph Myers
2016-07-30 1:16 ` David Malcolm
2016-08-03 15:17 ` David Malcolm [this message]
2016-08-03 15:17 ` [PATCH 3/4] Use class substring_loc in c-format.c (PR c/52952) David Malcolm
2016-08-04 18:09 ` Jeff Law
2016-08-04 19:25 ` David Malcolm
2016-08-04 20:22 ` Jeff Law
2016-08-06 0:56 ` [PATCH] c-format.c: cleanup of check_format_info_main David Malcolm
2016-08-08 17:20 ` Jeff Law
2016-08-08 20:16 ` [PATCH 3/4] Use class substring_loc in c-format.c (PR c/52952) David Malcolm
2016-08-03 15:17 ` [PATCH 2/4] (v3) On-demand locations within string-literals David Malcolm
2016-08-04 17:38 ` Jeff Law
2016-08-04 19:21 ` David Malcolm
2016-08-04 20:18 ` Jeff Law
2016-08-05 18:17 ` [Committed] [PATCH 2/4] (v4) " David Malcolm
2016-08-06 5:48 ` Markus Trippelsdorf
2016-08-06 5:59 ` Prathamesh Kulkarni
2016-08-06 18:10 ` [committed] Fix crash in selftest::test_lexer_string_locations_ucn4 (PR bootstrap/72823) David Malcolm
2021-09-02 13:59 ` [Committed] [PATCH 2/4] (v4) On-demand locations within string-literals Thomas Schwinge
2021-09-02 19:09 ` Thomas Schwinge
2021-09-03 16:33 ` Thomas Schwinge
2021-09-10 7:48 ` [PING] " Thomas Schwinge
2021-09-17 11:16 ` [PING^2] " Thomas Schwinge
2021-09-30 6:47 ` [PING^3] Generalize 'gcc/input.h:struct location_hash' (was: [Committed] [PATCH 2/4] (v4) On-demand locations within string-literals) Thomas Schwinge
2021-10-17 22:33 ` Jeff Law
2021-11-09 13:48 ` Thomas Schwinge
2021-09-19 5:52 ` [PING] Re: [Committed] [PATCH 2/4] (v4) On-demand locations within string-literals Jeff Law
2016-08-03 15:17 ` [PATCH 4/4] c-format.c: suggest the correct format string to use (PR c/64955) David Malcolm
2016-08-04 19:55 ` Jeff Law
2016-08-04 21:06 ` David Malcolm
2016-08-03 16:06 ` [PATCH 1/4] selftest.h: Add ASSERT_TRUE_AT and ASSERT_FALSE_AT Jeff Law
2016-08-04 19:02 ` David Malcolm
2016-08-03 15:59 ` [PATCH 1/3] (v2) On-demand locations within string-literals Jeff Law
2016-08-04 14:27 ` David Malcolm
2016-08-04 17:37 ` Jeff Law
2016-07-23 21:36 ` [PATCH] RFC: " Martin Sebor
2016-07-24 0:37 ` David Malcolm
2016-08-23 3:25 ` Martin Sebor
2016-08-23 13:59 ` David Malcolm
2016-08-23 15:18 ` Martin Sebor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1470239113-42666-1-git-send-email-dmalcolm@redhat.com \
--to=dmalcolm@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=joseph@codesourcery.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).