svn commit: trunk/uClibc/test/malloc

[sjhill at uclibc.org]

Author: sjhill
Date: 2006-03-16 18:43:51 -0800 (Thu, 16 Mar 2006)
New Revision: 14550

Log:
Fix tests to work if MALLOC_GLIBC_COMPAT is enabled.


Modified:
   trunk/uClibc/test/malloc/malloc.c
   trunk/uClibc/test/malloc/tst-malloc.c
   trunk/uClibc/test/malloc/tst-mcheck.c


Changeset:
Modified: trunk/uClibc/test/malloc/malloc.c
===================================================================
--- trunk/uClibc/test/malloc/malloc.c	2006-03-17 00:30:39 UTC (rev 14549)
+++ trunk/uClibc/test/malloc/malloc.c	2006-03-17 02:43:51 UTC (rev 14550)
@@ -70,7 +70,11 @@
 	
 	ptr = malloc(100);
 	ptr = realloc(ptr, 0);
+#ifdef __MALLOC_GLIBC_COMPAT__
+	if (!ptr) {
+#else
 	if (ptr) {
+#endif
 		printf("realloc(,0) failed\n");
 		++ret;
 		free(ptr);

Modified: trunk/uClibc/test/malloc/tst-malloc.c
===================================================================
--- trunk/uClibc/test/malloc/tst-malloc.c	2006-03-17 00:30:39 UTC (rev 14549)
+++ trunk/uClibc/test/malloc/tst-malloc.c	2006-03-17 02:43:51 UTC (rev 14550)
@@ -54,9 +54,16 @@
 
   /* realloc (p, 0) == free (p).  */
   p = realloc (p, 0);
+#ifdef __MALLOC_GLIBC_COMPAT__
+  if (!p)
+#else
   if (p != NULL)
+#endif
     merror ("realloc (p, 0) failed.");
 
+#ifdef __MALLOC_GLIBC_COMPAT__
+  free (p);
+#endif
   p = malloc (0);
 #if !defined(__UCLIBC__) || defined(__MALLOC_GLIBC_COMPAT__)
   if (p == NULL)
@@ -66,8 +73,16 @@
     merror ("malloc (0) failed.");
 
   p = realloc (p, 0);
+#ifdef __MALLOC_GLIBC_COMPAT__
+  if (!p)
+#else
   if (p != NULL)
+#endif
     merror ("realloc (p, 0) failed.");
 
+#ifdef __MALLOC_GLIBC_COMPAT__
+  free (p);
+#endif
+
   return errors != 0;
 }

Modified: trunk/uClibc/test/malloc/tst-mcheck.c
===================================================================
--- trunk/uClibc/test/malloc/tst-mcheck.c	2006-03-17 00:30:39 UTC (rev 14549)
+++ trunk/uClibc/test/malloc/tst-mcheck.c	2006-03-17 02:43:51 UTC (rev 14550)
@@ -50,7 +50,11 @@
     merror ("malloc (10) failed.");
 
   p = realloc (p, 0);
+#ifdef __MALLOC_GLIBC_COMPAT__
+  if (!p)
+#else
   if (p != NULL)
+#endif
     merror ("realloc (p, 0) failed.");
 
   p = malloc (0);
@@ -62,7 +66,11 @@
     merror ("malloc (0) failed.");
 
   p = realloc (p, 0);
+#ifdef __MALLOC_GLIBC_COMPAT__
+  if (!p)
+#else
   if (p != NULL)
+#endif
     merror ("realloc (p, 0) failed.");
 
   q = malloc (256);