From: "René Scharfe" <l.s.r@web•de>
To: git@vger•kernel.org
Cc: Phillip Wood <phillip.wood123@gmail•com>,
Josh Steadmon <steadmon@google•com>,
Achu Luma <ach.lumap@gmail•com>,
Christian Couder <christian.couder@gmail•com>
Subject: [PATCH v2 0/4] t-ctype: simplify unit test definitions
Date: Sun, 3 Mar 2024 11:13:24 +0100 [thread overview]
Message-ID: <20240303101330.20187-1-l.s.r@web.de> (raw)
In-Reply-To: <20240225112722.89221-1-l.s.r@web.de>
Simplify the ctype unit tests to allow combining specification strings
in any order and no longer require repeating class names.
Changes since v1:
* Added checks to guard string length calculation using sizeof.
* Kept the definition string in the error output.
* Added patches 2 and 3 with further cosmetic changes.
* Dropped the last patch with the huge output for now, as it needs
further thought.
t-ctype: allow NUL anywhere in the specification string
t-ctype: simplify EOF check
t-ctype: align output of i
t-ctype: avoid duplicating class names
t/unit-tests/t-ctype.c | 81 ++++++++++++++----------------------------
1 file changed, 27 insertions(+), 54 deletions(-)
Range-Diff gegen v1:
1: ae9b5468db ! 1: 28fba8bda9 t-ctype: allow NUL anywhere in the specification string
@@ Commit message
if we ever want to support more character classes that contain it.
Getting the string size using sizeof only works in a macro and with a
- string constant, but that's exactly what we have and I don't see it
- changing anytime soon.
+ string constant. Use ARRAY_SIZE and compile-time checks to make sure we
+ are not passed a string pointer.
## t/unit-tests/t-ctype.c ##
@@
@@ t/unit-tests/t-ctype.c
/* Macro to test a character type */
#define TEST_CTYPE_FUNC(func, string) \
static void test_ctype_##func(void) { \
++ size_t len = ARRAY_SIZE(string) - 1 + \
++ BUILD_ASSERT_OR_ZERO(ARRAY_SIZE(string) > 0) + \
++ BUILD_ASSERT_OR_ZERO(sizeof(string[0]) == sizeof(char)); \
for (int i = 0; i < 256; i++) { \
- if (!check_int(func(i), ==, is_in(string, i))) \
-+ int expect = !!memchr(string, i, sizeof(string) - 1); \
-+ if (!check_int(func(i), ==, expect)) \
++ if (!check_int(func(i), ==, !!memchr(string, i, len))) \
test_msg(" i: 0x%02x", i); \
} \
if (!check(!func(EOF))) \
-: ---------- > 2: 1eab0d289c t-ctype: simplify EOF check
-: ---------- > 3: 901312e980 t-ctype: align output of i
2: 688e6b6cb5 ! 4: 5dac51cfeb t-ctype: avoid duplicating class names
@@ t/unit-tests/t-ctype.c
-/* Macro to test a character type */
-#define TEST_CTYPE_FUNC(func, string) \
-static void test_ctype_##func(void) { \
-- for (int i = 0; i < 256; i++) { \
-- int expect = !!memchr(string, i, sizeof(string) - 1); \
-- if (!check_int(func(i), ==, expect)) \
-- test_msg(" i: 0x%02x", i); \
-- } \
-- if (!check(!func(EOF))) \
+#define TEST_CHAR_CLASS(class, string) do { \
+ size_t len = ARRAY_SIZE(string) - 1 + \
+ BUILD_ASSERT_OR_ZERO(ARRAY_SIZE(string) > 0) + \
+ BUILD_ASSERT_OR_ZERO(sizeof(string[0]) == sizeof(char)); \
+- for (int i = 0; i < 256; i++) { \
+- if (!check_int(func(i), ==, !!memchr(string, i, len))) \
+- test_msg(" i: 0x%02x", i); \
+ int skip = test__run_begin(); \
+ if (!skip) { \
+ for (int i = 0; i < 256; i++) { \
-+ int expect = !!memchr(string, i, sizeof(string) - 1); \
-+ if (!check_int(class(i), ==, expect)) \
-+ test_msg(" i: 0x%02x", i); \
++ if (!check_int(class(i), ==, !!memchr(string, i, len)))\
++ test_msg(" i: 0x%02x", i); \
+ } \
-+ if (!check(!class(EOF))) \
- test_msg(" i: 0x%02x (EOF)", EOF); \
++ check(!class(EOF)); \
+ } \
+- check(!func(EOF)); \
-}
-
-#define TEST_CHAR_CLASS(class) TEST(test_ctype_##class(), #class " works")
-+ } \
+ test__run_end(!skip, TEST_LOCATION(), #class " works"); \
+} while (0)
3: caf2acbd09 < -: ---------- t-ctype: do one test per class and char
--
2.44.0
next prev parent reply other threads:[~2024-03-03 10:13 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-25 11:27 [PATCH 0/3] t-ctype: simplify unit test definitions René Scharfe
2024-02-25 11:27 ` [PATCH 1/3] t-ctype: allow NUL anywhere in the specification string René Scharfe
2024-02-25 18:05 ` Eric Sunshine
2024-02-25 18:28 ` René Scharfe
2024-02-25 18:41 ` Eric Sunshine
2024-02-25 21:00 ` Jeff King
2024-02-25 21:02 ` Eric Sunshine
2024-02-25 11:27 ` [PATCH 2/3] t-ctype: avoid duplicating class names René Scharfe
2024-02-25 11:27 ` [PATCH 3/3] t-ctype: do one test per class and char René Scharfe
2024-02-26 9:28 ` Christian Couder
2024-02-26 17:26 ` René Scharfe
2024-02-26 17:44 ` Junio C Hamano
2024-02-26 18:58 ` Josh Steadmon
2024-02-27 10:04 ` Christian Couder
2024-03-02 22:00 ` René Scharfe
2024-03-04 10:00 ` Christian Couder
2024-03-06 18:16 ` René Scharfe
2024-03-04 18:35 ` Josh Steadmon
2024-03-04 18:46 ` Junio C Hamano
2024-03-03 10:13 ` René Scharfe [this message]
2024-03-03 10:13 ` [PATCH v2 1/4] t-ctype: allow NUL anywhere in the specification string René Scharfe
2024-03-03 10:13 ` [PATCH v2 2/4] t-ctype: simplify EOF check René Scharfe
2024-03-03 10:13 ` [PATCH v2 3/4] t-ctype: align output of i René Scharfe
2024-03-03 10:13 ` [PATCH v2 4/4] t-ctype: avoid duplicating class names René Scharfe
2024-03-04 9:51 ` Phillip Wood
2024-03-06 18:16 ` René Scharfe
2024-03-08 14:05 ` Phillip Wood
2024-03-09 11:28 ` Phillip Wood
2024-03-10 12:48 ` René Scharfe
2024-03-04 9:25 ` [PATCH v2 0/4] t-ctype: simplify unit test definitions Christian Couder
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=20240303101330.20187-1-l.s.r@web.de \
--to=l.s.r@web$(echo .)de \
--cc=ach.lumap@gmail$(echo .)com \
--cc=christian.couder@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=phillip.wood123@gmail$(echo .)com \
--cc=steadmon@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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