Browse Source

Fix tests to work if MALLOC_GLIBC_COMPAT is enabled.

"Steven J. Hill" 18 years ago
parent
commit
18811a88f7
3 changed files with 27 additions and 0 deletions
  1. 4 0
      test/malloc/malloc.c
  2. 15 0
      test/malloc/tst-malloc.c
  3. 8 0
      test/malloc/tst-mcheck.c

+ 4 - 0
test/malloc/malloc.c

@@ -70,7 +70,11 @@ int test2(void)
 	
 	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);

+ 15 - 0
test/malloc/tst-malloc.c

@@ -54,9 +54,16 @@ main (void)
 
   /* 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 @@ main (void)
     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;
 }

+ 8 - 0
test/malloc/tst-mcheck.c

@@ -50,7 +50,11 @@ main (void)
     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 @@ main (void)
     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);