From: Joe Simmons-Talbott <josimmon@redhat.com>
To: libc-alpha@sourceware.org
Cc: Joe Simmons-Talbott <josimmon@redhat.com>
Subject: [PATCH v4 2/4] string: Add tests for strdup (BZ #30266)
Date: Mon, 10 Apr 2023 11:59:32 -0400 [thread overview]
Message-ID: <20230410155934.3503627-3-josimmon@redhat.com> (raw)
In-Reply-To: <20230410155934.3503627-1-josimmon@redhat.com>
Copy strcpy tests for strdup. Covers some basic testcases with random
strings. Add a zero-length string testcase.
---
string/Makefile | 1 +
string/test-strdup.c | 203 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 204 insertions(+)
create mode 100644 string/test-strdup.c
diff --git a/string/Makefile b/string/Makefile
index c84b49aaa5..472e318aea 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -157,6 +157,7 @@ tests := \
test-strcmp \
test-strcpy \
test-strcspn \
+ test-strdup \
test-strlen \
test-strncasecmp \
test-strncat \
diff --git a/string/test-strdup.c b/string/test-strdup.c
new file mode 100644
index 0000000000..8a1a267782
--- /dev/null
+++ b/string/test-strdup.c
@@ -0,0 +1,203 @@
+/* Test and measure strdup functions.
+ Copyright (C) 2023 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <support/check.h>
+
+#ifdef WIDE
+# include <wchar.h>
+# define CHAR wchar_t
+# define UCHAR wchar_t
+# define sfmt "ls"
+# define BIG_CHAR WCHAR_MAX
+# define SMALL_CHAR 1273
+# define STRCMP wcscmp
+# define MEMCMP wmemcmp
+# define MEMSET wmemset
+# define TCS TEST_COMPARE_STRING_WIDE
+#else
+# define CHAR char
+# define UCHAR unsigned char
+# define sfmt "s"
+# define BIG_CHAR CHAR_MAX
+# define SMALL_CHAR 127
+# define STRCMP strcmp
+# define MEMCMP memcmp
+# define MEMSET memset
+# define TCS TEST_COMPARE_STRING
+#endif
+
+#ifndef STRDUP_RESULT
+# define STRDUP_RESULT(dst, len) dst
+# define TEST_MAIN
+# ifndef WIDE
+# define TEST_NAME "strdup"
+# else
+# define TEST_NAME "wcsdup"
+# endif
+# include "test-string.h"
+# ifndef WIDE
+# define STRDUP strdup
+# else
+# define STRDUP wcsdup
+# endif
+#endif
+
+typedef CHAR *(*proto_t) (const CHAR *);
+
+static void
+do_zero_len_test (void)
+{
+ CHAR src[1] = { '\0' };
+ CHAR *dst = STRDUP (src);
+
+ TCS (dst, src);
+ free (dst);
+}
+
+static void
+do_one_test (const CHAR *src,
+ size_t len __attribute__((unused)))
+{
+ CHAR *dst = STRDUP (src);
+
+ if (STRCMP (dst, src) != 0)
+ {
+ error (0, 0,
+ "Wrong result in function %s dst \"%" sfmt "\" src \"%" sfmt "\"",
+ TEST_NAME, dst, src);
+ ret = 1;
+ free (dst);
+ return;
+ }
+ free (dst);
+}
+
+static void
+do_test (size_t align1, size_t align2, size_t len, int max_char)
+{
+ size_t i;
+ CHAR *s1;
+/* For wcsdup: align1 and align2 here mean alignment not in bytes,
+ but in wchar_ts, in bytes it will equal to align * (sizeof (wchar_t))
+ len for wcschr here isn't in bytes but it's number of wchar_t symbols. */
+ align1 &= 7;
+ if ((align1 + len) * sizeof (CHAR) >= page_size)
+ return;
+
+ align2 &= 7;
+ if ((align2 + len) * sizeof (CHAR) >= page_size)
+ return;
+
+ s1 = (CHAR *) (buf1) + align1;
+
+ for (i = 0; i < len; i++)
+ s1[i] = 32 + 23 * i % (max_char - 32);
+ s1[len] = 0;
+
+ do_one_test (s1, len);
+}
+
+static void
+do_random_tests (void)
+{
+ size_t i, j, n, align1, align2, len;
+ UCHAR *p1 = (UCHAR *) (buf1 + page_size) - 512;
+ UCHAR *res;
+
+ for (n = 0; n < ITERATIONS; n++)
+ {
+ /* align1 and align2 are expressed as wchar_t and not in bytes for wide
+ char test, and thus it will be equal to align times wchar_t size.
+
+ For non wide version we need to check all alignments from 0 to 63
+ since some assembly implementations have separate prolog for alignments
+ more 48. */
+
+ align1 = random () & (63 / sizeof (CHAR));
+ if (random () & 1)
+ align2 = random () & (63 / sizeof (CHAR));
+ else
+ align2 = align1 + (random () & 24);
+ len = random () & 511;
+ j = align1;
+ if (align2 > j)
+ j = align2;
+ if (len + j >= 511)
+ len = 510 - j - (random () & 7);
+ j = len + align1 + 64;
+ if (j > 512)
+ j = 512;
+ for (i = 0; i < j; i++)
+ {
+ if (i == len + align1)
+ p1[i] = 0;
+ else
+ {
+ p1[i] = random () & BIG_CHAR;
+ if (i >= align1 && i < len + align1 && !p1[i])
+ p1[i] = (random () & SMALL_CHAR) + 3;
+ }
+ }
+
+ res = (UCHAR *) STRDUP((CHAR *) p1 + align1);
+ TCS ((CHAR *) res, (CHAR *) (p1 + align1));
+ free (res);
+ }
+}
+
+
+int
+test_main (void)
+{
+ size_t i;
+
+ test_init ();
+
+ printf ("%23s", "");
+ printf ("\t%s", TEST_NAME);
+ putchar ('\n');
+
+ for (i = 0; i < 16; ++i)
+ {
+ do_test (0, 0, i, SMALL_CHAR);
+ do_test (0, 0, i, BIG_CHAR);
+ do_test (0, i, i, SMALL_CHAR);
+ do_test (i, 0, i, BIG_CHAR);
+ }
+
+ for (i = 1; i < 8; ++i)
+ {
+ do_test (0, 0, 8 << i, SMALL_CHAR);
+ do_test (8 - i, 2 * i, 8 << i, SMALL_CHAR);
+ }
+
+ for (i = 1; i < 8; ++i)
+ {
+ do_test (i, 2 * i, 8 << i, SMALL_CHAR);
+ do_test (2 * i, i, 8 << i, BIG_CHAR);
+ do_test (i, i, 8 << i, SMALL_CHAR);
+ do_test (i, i, 8 << i, BIG_CHAR);
+ }
+
+ do_zero_len_test ();
+ do_random_tests ();
+
+ return ret;
+}
+
+#include <support/test-driver.c>
--
2.39.2
next prev parent reply other threads:[~2023-04-10 15:59 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-29 15:04 [PATCH 0/2] Add tests for strdup and strndup " Joe Simmons-Talbott
2023-03-29 15:04 ` [PATCH 1/2] strdup: Add tests " Joe Simmons-Talbott
2023-03-30 11:16 ` Adhemerval Zanella Netto
2023-03-29 15:05 ` [PATCH 2/2] strndup: " Joe Simmons-Talbott
2023-03-30 11:19 ` Adhemerval Zanella Netto
2023-03-30 14:50 ` [PATCH v2 0/2] Add tests for strdup and strndup " Joe Simmons-Talbott
2023-03-30 14:50 ` [PATCH v2 1/2] strdup: Add tests " Joe Simmons-Talbott
2023-04-04 13:44 ` Adhemerval Zanella Netto
2023-03-30 14:50 ` [PATCH v2 2/2] strndup: " Joe Simmons-Talbott
2023-04-04 19:00 ` [PATCH v3 0/3] string: Add tests for strdup and strndup " Joe Simmons-Talbott
2023-04-04 19:00 ` [PATCH v3 1/3] string: Allow use of test-string.h for non-ifunc implementations Joe Simmons-Talbott
2023-04-07 18:19 ` Adhemerval Zanella Netto
2023-04-04 19:00 ` [PATCH v3 2/3] string: Add tests for strdup (BZ #30266) Joe Simmons-Talbott
2023-04-04 19:17 ` Noah Goldstein
2023-04-04 19:40 ` Adhemerval Zanella Netto
2023-04-07 18:19 ` Adhemerval Zanella Netto
2023-04-10 13:53 ` Joe Simmons-Talbott
2023-04-10 14:44 ` Adhemerval Zanella Netto
2023-04-04 19:00 ` [PATCH v3 3/3] string: Add tests for strndup " Joe Simmons-Talbott
2023-04-07 18:19 ` Adhemerval Zanella Netto
2023-04-10 15:59 ` [PATCH v4 0/4] string: Add tests for strdup and " Joe Simmons-Talbott
2023-04-10 15:59 ` [PATCH v4 1/4] string: Allow use of test-string.h for non-ifunc implementations Joe Simmons-Talbott
2023-04-10 15:59 ` Joe Simmons-Talbott [this message]
2023-04-11 16:57 ` [PATCH v4 2/4] string: Add tests for strdup (BZ #30266) Adhemerval Zanella Netto
2023-04-10 15:59 ` [PATCH v4 3/4] string: Add tests for strndup " Joe Simmons-Talbott
2023-04-11 17:29 ` Adhemerval Zanella Netto
2023-04-10 15:59 ` [PATCH v4 4/4] wcsmbs: Add wcsdup() tests. " Joe Simmons-Talbott
2023-04-11 17:30 ` Adhemerval Zanella Netto
2023-04-11 19:05 ` [PATCH v5 0/4] string: Add tests for strdup and strndup " Joe Simmons-Talbott
2023-04-11 19:05 ` [PATCH v5 1/4] string: Allow use of test-string.h for non-ifunc implementations Joe Simmons-Talbott
2023-04-11 19:05 ` [PATCH v5 2/4] string: Add tests for strdup (BZ #30266) Joe Simmons-Talbott
2023-04-20 15:51 ` Adhemerval Zanella Netto
2023-04-11 19:05 ` [PATCH v5 3/4] string: Add tests for strndup " Joe Simmons-Talbott
2023-04-20 15:51 ` Adhemerval Zanella Netto
2023-04-11 19:05 ` [PATCH v5 4/4] wcsmbs: Add wcsdup() tests. " Joe Simmons-Talbott
2023-04-19 14:24 ` [PATCH v5 0/4] string: Add tests for strdup and strndup " Joe Simmons-Talbott
2023-04-20 16:54 ` [PATCH v6 " Joe Simmons-Talbott
2023-04-20 16:54 ` [PATCH v6 1/4] string: Allow use of test-string.h for non-ifunc implementations Joe Simmons-Talbott
2023-04-20 16:54 ` [PATCH v6 2/4] string: Add tests for strdup (BZ #30266) Joe Simmons-Talbott
2023-04-20 16:54 ` [PATCH v6 3/4] string: Add tests for strndup " Joe Simmons-Talbott
2023-04-20 16:54 ` [PATCH v6 4/4] wcsmbs: Add wcsdup() tests. " Joe Simmons-Talbott
2023-04-21 13:24 ` [PATCH v7 0/4] string: Add tests for strdup and strndup " Joe Simmons-Talbott
2023-04-21 13:24 ` [PATCH v7 1/4] string: Allow use of test-string.h for non-ifunc implementations Joe Simmons-Talbott
2023-04-21 13:24 ` [PATCH v7 2/4] string: Add tests for strdup (BZ #30266) Joe Simmons-Talbott
2023-04-21 13:24 ` [PATCH v7 3/4] string: Add tests for strndup " Joe Simmons-Talbott
2023-04-21 13:24 ` [PATCH v7 4/4] wcsmbs: Add wcsdup() tests. " Joe Simmons-Talbott
2023-04-21 14:07 ` [PATCH v7 0/4] string: Add tests for strdup and strndup " Adhemerval Zanella Netto
2023-04-21 14:43 ` Joe Simmons-Talbott
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=20230410155934.3503627-3-josimmon@redhat.com \
--to=josimmon@redhat.com \
--cc=libc-alpha@sourceware.org \
/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).