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

ChangeLog:

2013-10-02  Will Newton  <will.newton@linaro.org>

	* malloc/tst-valloc.c: Rewrite to use test-skeleton.c and
	improve test coverage.

2 files changed, 89 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 0eded37815..f91c01b497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-10-02  Will Newton  <will.newton@linaro.org>
 
+	* malloc/tst-valloc.c: Rewrite to use test-skeleton.c and
+	improve test coverage.
+
+2013-10-02  Will Newton  <will.newton@linaro.org>
+
 	* malloc/Makefile: Add tst-posix_memalign.
 	* malloc/tst-posix_memalign.c: New file.
 
diff --git a/malloc/tst-valloc.c b/malloc/tst-valloc.c
index 643a0dda4a..3648f2f1b4 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"