From 568123a720dce896dcd0ac8f7c8ebfe20a8a6adb Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Tue, 22 Jun 2021 14:27:15 +0530 Subject: tst-mcheck: Rename to tst-malloc-check MALLOC_CHECK_ and mcheck() are two different malloc checking features. tst-mcheck does not check mcheck(), instead it checks MALLOC_CHECK_, so rename the file to avoid confusion. --- malloc/Makefile | 6 +-- malloc/tst-malloc-check.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++ malloc/tst-mcheck.c | 115 ---------------------------------------------- 3 files changed, 118 insertions(+), 118 deletions(-) create mode 100644 malloc/tst-malloc-check.c delete mode 100644 malloc/tst-mcheck.c (limited to 'malloc') diff --git a/malloc/Makefile b/malloc/Makefile index 149dc7471f..f606c70fed 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -25,7 +25,7 @@ include ../Makeconfig dist-headers := malloc.h headers := $(dist-headers) obstack.h mcheck.h tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \ - tst-mcheck tst-mallocfork tst-trim1 \ + tst-malloc-check tst-mallocfork tst-trim1 \ tst-malloc-usable tst-realloc tst-reallocarray tst-posix_memalign \ tst-pvalloc tst-pvalloc-fortify tst-memalign tst-mallopt \ tst-malloc-backtrace tst-malloc-thread-exit \ @@ -70,7 +70,7 @@ test-srcs = tst-mtrace # These tests either are run with MALLOC_CHECK_=3 by default or do not work # with MALLOC_CHECK_=3 because they expect a specific failure. -tests-exclude-mcheck = tst-mcheck tst-malloc-usable \ +tests-exclude-mcheck = tst-malloc-check tst-malloc-usable \ tst-interpose-nothread tst-interpose-static-nothread \ tst-interpose-static-thread \ tst-mxfast tst-safe-linking @@ -210,7 +210,7 @@ endif endif endif -tst-mcheck-ENV = MALLOC_CHECK_=3 +tst-malloc-check-ENV = MALLOC_CHECK_=3 tst-malloc-usable-ENV = MALLOC_CHECK_=3 tst-malloc-usable-static-ENV = $(tst-malloc-usable-ENV) tst-malloc-usable-tunables-ENV = GLIBC_TUNABLES=glibc.malloc.check=3 diff --git a/malloc/tst-malloc-check.c b/malloc/tst-malloc-check.c new file mode 100644 index 0000000000..6650d09cf6 --- /dev/null +++ b/malloc/tst-malloc-check.c @@ -0,0 +1,115 @@ +/* Copyright (C) 2005-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Jakub Jelinek , 2005. + + 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 +#include +#include +#include + +static int errors = 0; + +static void +merror (const char *msg) +{ + ++errors; + printf ("Error: %s\n", msg); +} + +static int +do_test (void) +{ + void *p, *q; + + errno = 0; + + DIAG_PUSH_NEEDS_COMMENT; +#if __GNUC_PREREQ (7, 0) + /* GCC 7 warns about too-large allocations; here we want to test + that they fail. */ + DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); +#endif + p = malloc (-1); + DIAG_POP_NEEDS_COMMENT; + + if (p != NULL) + merror ("malloc (-1) succeeded."); + else if (errno != ENOMEM) + merror ("errno is not set correctly."); + + p = malloc (10); + if (p == NULL) + merror ("malloc (10) failed."); + + p = realloc (p, 0); + if (p != NULL) + merror ("realloc (p, 0) failed."); + + p = malloc (0); + if (p == NULL) + merror ("malloc (0) failed."); + + p = realloc (p, 0); + if (p != NULL) + merror ("realloc (p, 0) failed."); + + q = malloc (256); + if (q == NULL) + merror ("malloc (256) failed."); + + p = malloc (512); + if (p == NULL) + merror ("malloc (512) failed."); + + DIAG_PUSH_NEEDS_COMMENT; +#if __GNUC_PREREQ (7, 0) + /* GCC 7 warns about too-large allocations; here we want to test + that they fail. */ + DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); +#endif + if (realloc (p, -256) != NULL) + merror ("realloc (p, -256) succeeded."); + else if (errno != ENOMEM) + merror ("errno is not set correctly."); + DIAG_POP_NEEDS_COMMENT; + + free (p); + + p = malloc (512); + if (p == NULL) + merror ("malloc (512) failed."); + + DIAG_PUSH_NEEDS_COMMENT; +#if __GNUC_PREREQ (7, 0) + /* GCC 7 warns about too-large allocations; here we want to test + that they fail. */ + DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); +#endif + if (realloc (p, -1) != NULL) + merror ("realloc (p, -1) succeeded."); + else if (errno != ENOMEM) + merror ("errno is not set correctly."); + DIAG_POP_NEEDS_COMMENT; + + free (p); + free (q); + + return errors != 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/malloc/tst-mcheck.c b/malloc/tst-mcheck.c deleted file mode 100644 index 6650d09cf6..0000000000 --- a/malloc/tst-mcheck.c +++ /dev/null @@ -1,115 +0,0 @@ -/* Copyright (C) 2005-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek , 2005. - - 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 -#include -#include -#include - -static int errors = 0; - -static void -merror (const char *msg) -{ - ++errors; - printf ("Error: %s\n", msg); -} - -static int -do_test (void) -{ - void *p, *q; - - errno = 0; - - DIAG_PUSH_NEEDS_COMMENT; -#if __GNUC_PREREQ (7, 0) - /* GCC 7 warns about too-large allocations; here we want to test - that they fail. */ - DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); -#endif - p = malloc (-1); - DIAG_POP_NEEDS_COMMENT; - - if (p != NULL) - merror ("malloc (-1) succeeded."); - else if (errno != ENOMEM) - merror ("errno is not set correctly."); - - p = malloc (10); - if (p == NULL) - merror ("malloc (10) failed."); - - p = realloc (p, 0); - if (p != NULL) - merror ("realloc (p, 0) failed."); - - p = malloc (0); - if (p == NULL) - merror ("malloc (0) failed."); - - p = realloc (p, 0); - if (p != NULL) - merror ("realloc (p, 0) failed."); - - q = malloc (256); - if (q == NULL) - merror ("malloc (256) failed."); - - p = malloc (512); - if (p == NULL) - merror ("malloc (512) failed."); - - DIAG_PUSH_NEEDS_COMMENT; -#if __GNUC_PREREQ (7, 0) - /* GCC 7 warns about too-large allocations; here we want to test - that they fail. */ - DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); -#endif - if (realloc (p, -256) != NULL) - merror ("realloc (p, -256) succeeded."); - else if (errno != ENOMEM) - merror ("errno is not set correctly."); - DIAG_POP_NEEDS_COMMENT; - - free (p); - - p = malloc (512); - if (p == NULL) - merror ("malloc (512) failed."); - - DIAG_PUSH_NEEDS_COMMENT; -#if __GNUC_PREREQ (7, 0) - /* GCC 7 warns about too-large allocations; here we want to test - that they fail. */ - DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); -#endif - if (realloc (p, -1) != NULL) - merror ("realloc (p, -1) succeeded."); - else if (errno != ENOMEM) - merror ("errno is not set correctly."); - DIAG_POP_NEEDS_COMMENT; - - free (p); - free (q); - - return errors != 0; -} - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" -- cgit v1.2.3-70-g09d2