From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 83F503858401 for ; Mon, 10 Apr 2023 15:59:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 83F503858401 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681142386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gch4CSrrjoguVoFNvj2wLNXVUbQ9WquqD5Q/ZYN/tVg=; b=c9siYslrCWirnTggQR2dj/frNY+aYL3q2DkKWqsmkIXWCOhE+zElf2w9NwbDLMVzOtS7mm tVrcKYwJ4YiQzZMBNTpCJ5cB99CH6Zg797XWLz63PMTVrdAb+eXJgtRnpLQwdgtM8U+A96 wQ829DqMriTp7I3zJROIkdPima9SYmE= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-81-14GGPNliOHKixrs1y4Sr2A-1; Mon, 10 Apr 2023 11:59:45 -0400 X-MC-Unique: 14GGPNliOHKixrs1y4Sr2A-1 Received: by mail-qt1-f199.google.com with SMTP id a19-20020a05622a02d300b003e4ecb5f613so28738677qtx.21 for ; Mon, 10 Apr 2023 08:59:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681142384; x=1683734384; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gch4CSrrjoguVoFNvj2wLNXVUbQ9WquqD5Q/ZYN/tVg=; b=vC+9Pa/y0KfQFcNq8geOkwBEFGySY6KKO8VasEGl4N60ML4sDy5I02KZVhQGhMo9ZM DKlUY8KDaYk6h9DO3EDgMEHnZcz/hqIAcPWd5c+i5z2/A89cGB4YN0fwkIBFrIV0jPPh OF7BNEdsUm55V9YXDpYDbAxyzWNqrTVvnZTrRzQONlryYfiAK3LlbQoQBR7T+DKzV7J8 RJHzdQIsSPPz5HH4j4bTrvy/e+PtUn1ebb6E7nFWvR3elHeUXi5hLzJJ7JG5U7u0OJRd T/fyJgF4LN+xFvEpGJWd+e3xIxwd200cQ1CpYDLuIdzFJpfAmtp/5gDS3QSWkk2YkVcI Yf+A== X-Gm-Message-State: AAQBX9fCm1BsJ4IELGxz31f7NTj0xx9PDFncFhmdLS92Q5MVwRs+q1iS MG5uYRa6ps/jUChfjCSmfYSqBideeCnMpNDAswIBT4J7lc9IdNfmiqTEmfg0eCfDICoc0Uhr2dp FJQf21LVv6WXbvEhclSKAQuJKsixrdhKatxasAwDKre8NDTHs25XATHFQieDVewPDWduBWp1iEw t23joW X-Received: by 2002:a05:6214:1c8a:b0:5c7:cc77:d203 with SMTP id ib10-20020a0562141c8a00b005c7cc77d203mr16702815qvb.3.1681142384050; Mon, 10 Apr 2023 08:59:44 -0700 (PDT) X-Google-Smtp-Source: AKy350YErseA4fitVkDU1QBEkkJjqi7+dFQp0oFLtULpwNL902+kZ55RGujjAgaGC1FGPJ6YrT2XIA== X-Received: by 2002:a05:6214:1c8a:b0:5c7:cc77:d203 with SMTP id ib10-20020a0562141c8a00b005c7cc77d203mr16702793qvb.3.1681142383695; Mon, 10 Apr 2023 08:59:43 -0700 (PDT) Received: from oak.redhat.com (c-71-206-142-238.hsd1.va.comcast.net. [71.206.142.238]) by smtp.gmail.com with ESMTPSA id h2-20020ad45442000000b005dd8b9345e0sm3470413qvt.120.2023.04.10.08.59.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 08:59:42 -0700 (PDT) From: Joe Simmons-Talbott To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH v4 2/4] string: Add tests for strdup (BZ #30266) Date: Mon, 10 Apr 2023 11:59:32 -0400 Message-Id: <20230410155934.3503627-3-josimmon@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230410155934.3503627-1-josimmon@redhat.com> References: <20230329150500.2886135-1-josimmon@redhat.com> <20230410155934.3503627-1-josimmon@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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 List-Id: 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 + . */ + +#include + +#ifdef WIDE +# include +# 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 -- 2.39.2