diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | malloc/Makefile | 3 | ||||
-rw-r--r-- | malloc/tst-pvalloc.c | 91 |
3 files changed, 98 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index f91c01b497..374e994d4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2013-10-02 Will Newton <will.newton@linaro.org> + * malloc/Makefile: Add tst-pvalloc. + * malloc/tst-pvalloc.c: New file. + +2013-10-02 Will Newton <will.newton@linaro.org> + * malloc/tst-valloc.c: Rewrite to use test-skeleton.c and improve test coverage. diff --git a/malloc/Makefile b/malloc/Makefile index 4903c136df..17d146b6bb 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -26,7 +26,8 @@ dist-headers := malloc.h headers := $(dist-headers) obstack.h mcheck.h tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \ tst-mallocstate tst-mcheck tst-mallocfork tst-trim1 \ - tst-malloc-usable tst-realloc tst-posix_memalign + tst-malloc-usable tst-realloc tst-posix_memalign \ + tst-pvalloc test-srcs = tst-mtrace routines = malloc morecore mcheck mtrace obstack diff --git a/malloc/tst-pvalloc.c b/malloc/tst-pvalloc.c new file mode 100644 index 0000000000..1126672bd4 --- /dev/null +++ b/malloc/tst-pvalloc.c @@ -0,0 +1,91 @@ +/* Copyright (C) 2013 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 + <http://www.gnu.org/licenses/>. */ + +#include <errno.h> +#include <malloc.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> + +static int errors = 0; + +static void +merror (const char *msg) +{ + ++errors; + printf ("Error: %s\n", msg); +} + +static int +do_test (void) +{ + void *p; + unsigned long pagesize = getpagesize(); + unsigned long ptrval; + int save; + + errno = 0; + + p = pvalloc (-1); + + save = errno; + + if (p != NULL) + merror ("pvalloc (-1) succeeded."); + + if (p == NULL && save != ENOMEM) + merror ("pvalloc (-1) errno is not set correctly"); + + errno = 0; + + p = pvalloc (-pagesize); + + save = errno; + + if (p != NULL) + merror ("pvalloc (-pagesize) succeeded."); + + if (p == NULL && save != ENOMEM) + merror ("pvalloc (-pagesize) errno is not set correctly"); + + p = pvalloc (0); + + if (p == NULL) + merror ("pvalloc (0) failed."); + + free (p); + + p = pvalloc (32); + + if (p == NULL) + merror ("pvalloc (32) failed."); + + ptrval = (unsigned long)p; + + if (p == NULL) + merror ("pvalloc (32) failed."); + + if ((ptrval & (pagesize - 1)) != 0) + merror ("returned pointer is not page aligned."); + + free (p); + + return errors != 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |