[v2] malloc/tst-valloc.c: Improve test coverage and use test-skeleton.c.

Message ID 523042CC.5010305@linaro.org
State Accepted
Headers show

Commit Message

Will Newton Sept. 11, 2013, 10:15 a.m.
ChangeLog:

2013-08-12  Will Newton  <will.newton@linaro.org>

	* malloc/tst-valloc.c: Rewrite to use test-skeleton.c and
	improve test coverage.
---
 malloc/tst-valloc.c | 100 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 84 insertions(+), 16 deletions(-)

Changes in v2:
 - Check errno for -pagesize failure case

Comments

Will Newton Sept. 25, 2013, 1:10 p.m. | #1
On 11 September 2013 11:15, Will Newton <will.newton@linaro.org> wrote:
>
> ChangeLog:
>
> 2013-08-12  Will Newton  <will.newton@linaro.org>
>
>         * malloc/tst-valloc.c: Rewrite to use test-skeleton.c and
>         improve test coverage.
> ---
>  malloc/tst-valloc.c | 100 +++++++++++++++++++++++++++++++++++++++++++---------
>  1 file changed, 84 insertions(+), 16 deletions(-)
>
> Changes in v2:
>  - Check errno for -pagesize failure case

Ping?
Carlos O'Donell Oct. 2, 2013, 4:28 p.m. | #2
Will,

I'm am *very* excited to see people putting in more testing
into glibc. I really value your effort and time here. It will
make the project better. Thank you.

Having said that I'm looking for just a little more descriptions
on each of the tests here. Some comments explaining why the test
is testing what it tests go a long way to helping a QE, or any
other junior developer looking at a test failure. While you and
I have the experience to know what's wrong just a single line
comment per test sequence would help immensely.

What do you say? I know you've checked this in already, but 
please consider adding some comments.

My review below (at least one cut-and-paste error):

> 2013-08-12  Will Newton  <will.newton@linaro.org>
> 
> 	* malloc/tst-valloc.c: Rewrite to use test-skeleton.c and
> 	improve test coverage.
> ---
>  malloc/tst-valloc.c | 100 +++++++++++++++++++++++++++++++++++++++++++---------
>  1 file changed, 84 insertions(+), 16 deletions(-)
> 
> Changes in v2:
>  - Check errno for -pagesize failure case
> 
> diff --git a/malloc/tst-valloc.c b/malloc/tst-valloc.c
> index 643a0dd..3648f2f 100644
> --- a/malloc/tst-valloc.c
> +++ b/malloc/tst-valloc.c
> @@ -1,23 +1,91 @@
> -/* Test case by Stephen Tweedie <sct@redhat.com>.  */
> -#include <unistd.h>
> -#include <stdio.h>
> +/* Copyright (C) 2013 Free Software Foundation, Inc.

Complete rewrite so 2013 is OK.


> +   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 <stdlib.h>
> +#include <stdio.h>
> +#include <string.h>
> +#include <unistd.h>
> 
> -int
> -main (void)
> +static int errors = 0;
> +
> +static void
> +merror (const char *msg)
> +{
> +  ++errors;
> +  printf ("Error: %s\n", msg);
> +}
> +
> +static int
> +do_test (void)
>  {
> -  char *p;
> -  int pagesize = getpagesize ();
> -  int i;
> +  void *p;
> +  unsigned long pagesize = getpagesize();
> +  unsigned long ptrval;
> +  int save;
> +
> +  errno = 0;
> +
> +  p = valloc (-1);
> +
> +  save = errno;
> 
> -  p = valloc (pagesize);
> -  i = (long int) p;
> +  if (p != NULL)
> +    merror ("valloc (-1) succeeded.");
> 
> -  if ((i & (pagesize-1)) != 0)
> -    {
> -      fprintf (stderr, "Alignment problem: valloc returns %p\n", p);
> -      exit (1);
> -    }
> +  if (p == NULL && save != ENOMEM)
> +    merror ("valloc (-1) errno is not set correctly");

OK, modulo comments describing test, and free (p).

> -  return 0;
> +  errno = 0;
> +
> +  p = valloc (-pagesize);

Why test with -pagesize?

> +
> +  save = errno;
> +
> +  if (p != NULL)
> +    merror ("valloc (-pagesize) succeeded.");
> +
> +  if (p == NULL && save != ENOMEM)
> +    merror ("valloc (-pagesize) errno is not set correctly");
> +

OK, modulo comments describing test, and free (p).

> +  p = valloc (0);
> +
> +  if (p == NULL)
> +    merror ("valloc (0) failed.");
> +
> +  free (p);
> +

OK, modulo comments describing test.

> +  p = valloc (32);
> +
> +  if (p == NULL)
> +    merror ("valloc (32) failed.");
> +
> +  ptrval = (unsigned long)p;
> +
> +  if (p == NULL)
> +    merror ("valloc (32) failed.");

Duplicate check? Cut and paste error?

> +
> +  if ((ptrval & (pagesize - 1)) != 0)
> +    merror ("returned pointer is not page aligned.");

OK, modulo comments describing test.

> +
> +  free (p);
> +
> +  return errors != 0;
>  }
> +
> +#define TEST_FUNCTION do_test ()
> +#include "../test-skeleton.c"
> 

Cheers,
Carlos.
Joseph Myers Oct. 2, 2013, 10:10 p.m. | #3
On Wed, 2 Oct 2013, Carlos O'Donell wrote:

> > diff --git a/malloc/tst-valloc.c b/malloc/tst-valloc.c
> > index 643a0dd..3648f2f 100644
> > --- a/malloc/tst-valloc.c
> > +++ b/malloc/tst-valloc.c
> > @@ -1,23 +1,91 @@
> > -/* Test case by Stephen Tweedie <sct@redhat.com>.  */
> > -#include <unistd.h>
> > -#include <stdio.h>
> > +/* Copyright (C) 2013 Free Software Foundation, Inc.
> 
> Complete rewrite so 2013 is OK.

But, the first line of any new file should be a comment describing the 
file - the copyright line should be the *second* line.

Patch

diff --git a/malloc/tst-valloc.c b/malloc/tst-valloc.c
index 643a0dd..3648f2f 100644
--- a/malloc/tst-valloc.c
+++ b/malloc/tst-valloc.c
@@ -1,23 +1,91 @@ 
-/* Test case by Stephen Tweedie <sct@redhat.com>.  */
-#include <unistd.h>
-#include <stdio.h>
+/* 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 <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>

-int
-main (void)
+static int errors = 0;
+
+static void
+merror (const char *msg)
+{
+  ++errors;
+  printf ("Error: %s\n", msg);
+}
+
+static int
+do_test (void)
 {
-  char *p;
-  int pagesize = getpagesize ();
-  int i;
+  void *p;
+  unsigned long pagesize = getpagesize();
+  unsigned long ptrval;
+  int save;
+
+  errno = 0;
+
+  p = valloc (-1);
+
+  save = errno;

-  p = valloc (pagesize);
-  i = (long int) p;
+  if (p != NULL)
+    merror ("valloc (-1) succeeded.");

-  if ((i & (pagesize-1)) != 0)
-    {
-      fprintf (stderr, "Alignment problem: valloc returns %p\n", p);
-      exit (1);
-    }
+  if (p == NULL && save != ENOMEM)
+    merror ("valloc (-1) errno is not set correctly");

-  return 0;
+  errno = 0;
+
+  p = valloc (-pagesize);
+
+  save = errno;
+
+  if (p != NULL)
+    merror ("valloc (-pagesize) succeeded.");
+
+  if (p == NULL && save != ENOMEM)
+    merror ("valloc (-pagesize) errno is not set correctly");
+
+  p = valloc (0);
+
+  if (p == NULL)
+    merror ("valloc (0) failed.");
+
+  free (p);
+
+  p = valloc (32);
+
+  if (p == NULL)
+    merror ("valloc (32) failed.");
+
+  ptrval = (unsigned long)p;
+
+  if (p == NULL)
+    merror ("valloc (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"