Move all malloc tests under test/malloc/

7 files changed, 70 insertions, 67 deletions

diff --git a/test/malloc/.cvsignore b/test/malloc/.cvsignore
new file mode 100644
index 000000000..3a3bea67b
--- /dev/null
+++ b/test/malloc/.cvsignore
@@ -0,0 +1,7 @@
+malloc
+testmalloc
+testmalloc.o
+testmalloc_glibc
+testmalloc_glibc.o
+mallocbug
+mallocbug_glibc
diff --git a/test/malloc/Makefile b/test/malloc/Makefile
index b1f61cdc9..aaa2976d6 100644
--- a/test/malloc/Makefile
+++ b/test/malloc/Makefile
@@ -21,6 +21,8 @@ include $(TESTDIR)/Rules.mak
 
 
 TARGETS=malloc
+TARGETS+=testmalloc testmalloc_glibc 
+TARGETS+=mallocbug mallocbug_glibc
 all: $(TARGETS)
 
 malloc: malloc.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
@@ -34,6 +36,66 @@ malloc: malloc.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
 	-./$@
 	-@ echo " "
 
+testmalloc_source:
+	-@ echo "-------"
+	-@ echo "testmalloc.c source: "
+	-@ echo " "
+	-@ cat testmalloc.c
+	-@ echo " "
+
+testmalloc: testmalloc.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
+	-@ echo "-------"
+	-@ echo " "
+	-@ echo "Compiling vs uClibc: "
+	-@ echo " "
+	$(CC) $(CFLAGS) -c $< -o $@.o
+	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+	$(STRIPTOOL) -x -R .note -R .comment $@
+	-$(LDD) $@
+	ls -l $@
+	-./$@
+	-@ echo " "
+
+testmalloc_glibc: testmalloc.c Makefile
+	-@ echo "-------"
+	-@ echo " "
+	-@ echo "Compiling vs GNU libc: "
+	-@ echo " "
+	$(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+	$(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
+	$(STRIPTOOL) -x -R .note -R .comment $@
+	-$(LDD) $@
+	ls -l $@
+	-./$@
+	-@ echo " "
+
+mallocbug: mallocbug.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
+	-@ echo "-------"
+	-@ echo " "
+	-@ echo "Compiling vs uClibc: "
+	-@ echo " "
+	$(CC) $(CFLAGS) -c $< -o $@.o
+	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+	$(STRIPTOOL) -x -R .note -R .comment $@
+	-$(LDD) $@
+	ls -l $@
+	-./$@
+	-@ echo " "
+
+mallocbug_glibc: mallocbug.c Makefile
+	-@ echo "-------"
+	-@ echo " "
+	-@ echo "Compiling vs GNU libc: "
+	-@ echo " "
+	$(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+	$(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
+	$(STRIPTOOL) -x -R .note -R .comment $@
+	-$(LDD) $@
+	ls -l $@
+	-./$@
+	-@ echo " "
+
+
 clean:
 	rm -f *.[oa] *~ core $(TARGETS)
 
diff --git a/test/malloc/malloc.c b/test/malloc/malloc.c
index ac40ec6a2..8e93cf205 100644
--- a/test/malloc/malloc.c
+++ b/test/malloc/malloc.c
@@ -17,6 +17,7 @@ int main(int argc,char *argv[])
 {
 	test1();
 	test2();
+	return 0;
 }
 
 void test1(void)
diff --git a/test/stdlib/mallocbug.c b/test/malloc/mallocbug.c
index 84a638795..84a638795 100644
--- a/test/stdlib/mallocbug.c
+++ b/test/malloc/mallocbug.c
diff --git a/test/stdlib/testmalloc.c b/test/malloc/testmalloc.c
index 158bf4236..158bf4236 100644
--- a/test/stdlib/testmalloc.c
+++ b/test/malloc/testmalloc.c
diff --git a/test/stdlib/.cvsignore b/test/stdlib/.cvsignore
index 253c81051..a85e224fb 100644
--- a/test/stdlib/.cvsignore
+++ b/test/stdlib/.cvsignore
@@ -1,14 +1,8 @@
-testmalloc
-testmalloc.o
-testmalloc_glibc
-testmalloc_glibc.o
 teststrtol
 teststrtol_glibc
 teststrtol.o
 teststrtol.out
 teststrtol_glibc.out
-mallocbug
-mallocbug_glibc
 qsort
 qsort_glibc
 qsort.out
diff --git a/test/stdlib/Makefile b/test/stdlib/Makefile
index 209c43b5b..5f2f12b16 100644
--- a/test/stdlib/Makefile
+++ b/test/stdlib/Makefile
@@ -21,8 +21,6 @@ include $(TESTDIR)/Rules.mak
 
 
 
-TARGETS=testmalloc testmalloc_glibc 
-TARGETS+=mallocbug mallocbug_glibc
 TARGETS+=teststrtol teststrtol_glibc teststrtol_diff
 TARGETS+=qsort qsort_glibc qsort_diff
 TARGETS+=teston_exit teston_exit_glibc teston_exit_diff
@@ -30,65 +28,6 @@ TARGETS+=testatexit testatexit_glibc testatexit_diff
 
 all: $(TARGETS)
 
-testmalloc_source:
-	-@ echo "-------"
-	-@ echo "testmalloc.c source: "
-	-@ echo " "
-	-@ cat testmalloc.c
-	-@ echo " "
-
-testmalloc: testmalloc.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	-$(LDD) $@
-	ls -l $@
-	-./$@
-	-@ echo " "
-
-testmalloc_glibc: testmalloc.c Makefile
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
-	-@ echo " "
-	$(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
-	$(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	-$(LDD) $@
-	ls -l $@
-	-./$@
-	-@ echo " "
-
-mallocbug: mallocbug.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	-$(LDD) $@
-	ls -l $@
-	-./$@
-	-@ echo " "
-
-mallocbug_glibc: mallocbug.c Makefile
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
-	-@ echo " "
-	$(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
-	$(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	-$(LDD) $@
-	ls -l $@
-	-./$@
-	-@ echo " "
-
 teststrtol_source:
 	-@ echo "-------"
 	-@ echo "teststrtol.c source: "