make test output nicer so its easier to go through a log of `make -s` and find out what works/fails

18 files changed, 74 insertions, 99 deletions

diff --git a/test/Makefile b/test/Makefile
index a4cab040b..cc54cd25f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -48,6 +48,7 @@ subdirs: $(patsubst %, _dir_%, $(DIRS))
 subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
 
 $(patsubst %, _dir_%, $(DIRS)) : dummy
+	@echo "Making test in $(patsubst _dir_%,%,$@)"
 	$(MAKE) -C $(patsubst _dir_%, %, $@)
 
 $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
diff --git a/test/args/Makefile b/test/args/Makefile
index a9eef3a84..a4bcfc588 100644
--- a/test/args/Makefile
+++ b/test/args/Makefile
@@ -24,7 +24,7 @@ all: $(TARGETS)
 arg_test: arg_test.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
diff --git a/test/assert/Makefile b/test/assert/Makefile
index b0fb40038..e6ceb1b0e 100644
--- a/test/assert/Makefile
+++ b/test/assert/Makefile
@@ -24,7 +24,7 @@ all: $(TARGETS)
 assert: assert.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
diff --git a/test/crypt/Makefile b/test/crypt/Makefile
index f206c9d1a..3993230da 100644
--- a/test/crypt/Makefile
+++ b/test/crypt/Makefile
@@ -26,7 +26,7 @@ all: $(TARGETS)
 crypt: crypt.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -37,7 +37,7 @@ crypt: crypt.c Makefile $(TESTDIR)/Rules.mak
 crypt_glibc: crypt.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs glibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -56,7 +56,7 @@ diff: crypt_glibc crypt
 md5c-test: md5c-test.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
diff --git a/test/ctype/Makefile b/test/ctype/Makefile
index 533cfc3ea..e72932b8c 100644
--- a/test/ctype/Makefile
+++ b/test/ctype/Makefile
@@ -24,7 +24,7 @@ all: $(TARGETS)
 ctype: ctype.c ../testsuite.h Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -33,7 +33,6 @@ ctype: ctype.c ../testsuite.h Makefile $(TESTDIR)/Rules.mak
 ctype_run:
 	./ctype
 	-@ echo " "
+
 clean:
 	$(RM) *.[oa] *~ core $(TARGETS)
-
-
diff --git a/test/malloc/Makefile b/test/malloc/Makefile
index c1763dd34..c338d002d 100644
--- a/test/malloc/Makefile
+++ b/test/malloc/Makefile
@@ -27,7 +27,7 @@ all: $(TARGETS)
 malloc: malloc.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -45,7 +45,7 @@ testmalloc_source:
 testmalloc: testmalloc.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -58,7 +58,7 @@ testmalloc: testmalloc.c Makefile $(TESTDIR)/Rules.mak
 testmalloc_glibc: testmalloc.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -71,7 +71,7 @@ testmalloc_glibc: testmalloc.c Makefile
 mallocbug: mallocbug.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -84,7 +84,7 @@ mallocbug: mallocbug.c Makefile $(TESTDIR)/Rules.mak
 mallocbug_glibc: mallocbug.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -97,7 +97,7 @@ mallocbug_glibc: mallocbug.c Makefile
 realloc0: realloc0.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -110,7 +110,7 @@ realloc0: realloc0.c Makefile $(TESTDIR)/Rules.mak
 realloc0_glibc: realloc0.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -123,5 +123,3 @@ realloc0_glibc: realloc0.c Makefile
 
 clean:
 	$(RM) *.[oa] *~ core $(TARGETS)
-
-
diff --git a/test/math/Makefile b/test/math/Makefile
index 0d0639d46..568e1ae6d 100644
--- a/test/math/Makefile
+++ b/test/math/Makefile
@@ -58,7 +58,7 @@ test-ildouble: test-ildoubl.o
 rint: rint.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -69,7 +69,7 @@ rint: rint.c Makefile $(TESTDIR)/Rules.mak
 rint_glibc: rint.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs glibc: "
+	-@ echo "Compiling $@ vs glibc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -99,5 +99,3 @@ libm-test.c: $(ulps-file) libm-test.inc gen-libm-test.pl
 
 clean:
 	$(RM) *.[oa] *~ core $(TARGETS) $(generated) rint_glibc.out rint.out
-
-
diff --git a/test/misc/Makefile b/test/misc/Makefile
index f86d02abc..9ca56a676 100644
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -26,7 +26,7 @@ all: $(TARGETS)
 outb: outb.c ../testsuite.h Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -37,7 +37,7 @@ outb: outb.c ../testsuite.h Makefile $(TESTDIR)/Rules.mak
 sem: sem.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -48,7 +48,7 @@ sem: sem.c Makefile $(TESTDIR)/Rules.mak
 fdopen: fdopen.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -67,7 +67,7 @@ dirent_source:
 dirent: dirent.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -78,7 +78,7 @@ dirent: dirent.c Makefile $(TESTDIR)/Rules.mak
 dirent_glibc: dirent.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -97,7 +97,7 @@ dirent_diff: dirent dirent_glibc
 dirent64: dirent.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) $(CFLAGS64) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -108,7 +108,7 @@ dirent64: dirent.c Makefile $(TESTDIR)/Rules.mak
 dirent64_glibc: dirent.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) $(CFLAGS64) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -128,6 +128,3 @@ clean:
 	$(RM) *.[oa] *~ core dirent dirent_glibc dirent_glibc.out dirent.out \
 		dirent64 dirent64_glibc dirent64_glibc.out dirent64.out \
 		outb sem fdopen
-
-
-
diff --git a/test/mmap/Makefile b/test/mmap/Makefile
index 24175aa00..451b455f1 100644
--- a/test/mmap/Makefile
+++ b/test/mmap/Makefile
@@ -24,7 +24,7 @@ all: $(TARGETS)
 mmap: mmap.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -34,5 +34,3 @@ mmap: mmap.c Makefile $(TESTDIR)/Rules.mak
 
 clean:
 	$(RM) *.[oa] *~ core $(TARGETS)
-
-
diff --git a/test/pthread/Makefile b/test/pthread/Makefile
index 35842afc2..43e8c535e 100644
--- a/test/pthread/Makefile
+++ b/test/pthread/Makefile
@@ -28,7 +28,7 @@ all: $(TARGETS)
 ex1: ex1.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -39,7 +39,7 @@ ex1: ex1.c Makefile $(TESTDIR)/Rules.mak
 ex2: ex2.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -50,7 +50,7 @@ ex2: ex2.c Makefile $(TESTDIR)/Rules.mak
 ex3: ex3.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -61,7 +61,7 @@ ex3: ex3.c Makefile $(TESTDIR)/Rules.mak
 ex4: ex4.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -72,7 +72,7 @@ ex4: ex4.c Makefile $(TESTDIR)/Rules.mak
 ex5: ex5.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -83,7 +83,7 @@ ex5: ex5.c Makefile $(TESTDIR)/Rules.mak
 ex6: ex6.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -94,7 +94,7 @@ ex6: ex6.c Makefile $(TESTDIR)/Rules.mak
 ex7: ex7.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
diff --git a/test/pwd_grp/Makefile b/test/pwd_grp/Makefile
index fe6a71817..e456c38c1 100644
--- a/test/pwd_grp/Makefile
+++ b/test/pwd_grp/Makefile
@@ -30,7 +30,7 @@ all: $(TARGETS)
 test_pwd: test_pwd.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -41,7 +41,7 @@ test_pwd: test_pwd.c Makefile $(TESTDIR)/Rules.mak
 test_pwd_glibc: test_pwd.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -52,7 +52,7 @@ test_pwd_glibc: test_pwd.c Makefile
 test_grp: test_grp.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -63,7 +63,7 @@ test_grp: test_grp.c Makefile $(TESTDIR)/Rules.mak
 test_grp_glibc: test_grp.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -74,7 +74,7 @@ test_grp_glibc: test_grp.c Makefile
 pwcat: pwcat.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -85,7 +85,7 @@ pwcat: pwcat.c Makefile $(TESTDIR)/Rules.mak
 pwcat_glibc: pwcat.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -96,7 +96,7 @@ pwcat_glibc: pwcat.c Makefile
 grcat: grcat.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -107,7 +107,7 @@ grcat: grcat.c Makefile $(TESTDIR)/Rules.mak
 grcat_glibc: grcat.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -118,7 +118,7 @@ grcat_glibc: grcat.c Makefile
 getgroups: getgroups.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -129,7 +129,7 @@ getgroups: getgroups.c Makefile $(TESTDIR)/Rules.mak
 getgroups_glibc: getgroups.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -179,5 +179,3 @@ getgroups_diff: getgroups_glibc getgroups
 
 clean:
 	$(RM) *.[oa] *~ core $(TARGETS) *.out
-
-
diff --git a/test/setjmp/Makefile b/test/setjmp/Makefile
index ae820e679..41bee3d78 100644
--- a/test/setjmp/Makefile
+++ b/test/setjmp/Makefile
@@ -24,7 +24,7 @@ all: $(TARGETS)
 setjmp_test: setjmp_test.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -34,5 +34,3 @@ setjmp_test: setjmp_test.c Makefile $(TESTDIR)/Rules.mak
 
 clean:
 	$(RM) *.[oa] *~ core $(TARGETS)
-
-
diff --git a/test/signal/Makefile b/test/signal/Makefile
index c47aa50ed..36a362ce9 100644
--- a/test/signal/Makefile
+++ b/test/signal/Makefile
@@ -19,6 +19,7 @@
 include ../Rules.mak
 
 CFLAGS += -D_GNU_SOURCE
+GLIBC_CFLAGS += -D_GNU_SOURCE
 
 TARGETS=signal signal_glibc sigchld sigchld_glibc 
 all: $(TARGETS)
@@ -26,7 +27,7 @@ all: $(TARGETS)
 signal: signal.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -37,7 +38,7 @@ signal: signal.c Makefile $(TESTDIR)/Rules.mak
 signal_glibc: signal.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -48,7 +49,7 @@ signal_glibc: signal.c Makefile
 sigchld: sigchld.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -59,7 +60,7 @@ sigchld: sigchld.c Makefile $(TESTDIR)/Rules.mak
 sigchld_glibc: sigchld.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -69,5 +70,3 @@ sigchld_glibc: sigchld.c Makefile
 
 clean:
 	$(RM) *.[oa] *~ core $(TARGETS)
-
-
diff --git a/test/stat/Makefile b/test/stat/Makefile
index 3bd98f795..1271ef2c1 100644
--- a/test/stat/Makefile
+++ b/test/stat/Makefile
@@ -36,7 +36,7 @@ stat_source:
 stat: stat.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -47,7 +47,7 @@ stat: stat.c Makefile $(TESTDIR)/Rules.mak
 stat_glibc: stat.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -66,7 +66,7 @@ stat_diff: stat stat_glibc
 stat64: stat.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) $(CFLAGS64) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -77,7 +77,7 @@ stat64: stat.c Makefile $(TESTDIR)/Rules.mak
 stat64_glibc: stat.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) $(CFLAGS64) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -96,5 +96,3 @@ stat64_diff: stat64 stat64_glibc
 clean:
 	$(RM) *.[oa] *~ core stat stat_glibc stat_glibc.out stat.out \
 		stat64 stat64_glibc stat64_glibc.out stat64.out
-
-
diff --git a/test/stdlib/Makefile b/test/stdlib/Makefile
index b02074025..7aee3c71c 100644
--- a/test/stdlib/Makefile
+++ b/test/stdlib/Makefile
@@ -36,7 +36,7 @@ teststrtol_source:
 teststrtol: teststrtol.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -49,7 +49,7 @@ teststrtol: teststrtol.c Makefile $(TESTDIR)/Rules.mak
 teststrtol_glibc: teststrtol.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -70,7 +70,7 @@ teststrtol_diff: teststrtol_glibc teststrtol
 qsort: qsort.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -83,7 +83,7 @@ qsort: qsort.c Makefile $(TESTDIR)/Rules.mak
 qsort_glibc: qsort.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -104,7 +104,7 @@ qsort_diff: qsort_glibc qsort
 teston_exit: teston_exit.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -117,7 +117,7 @@ teston_exit: teston_exit.c Makefile $(TESTDIR)/Rules.mak
 teston_exit_glibc: teston_exit.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -138,7 +138,7 @@ teston_exit_diff: teston_exit_glibc teston_exit
 testatexit: testatexit.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -151,7 +151,7 @@ testatexit: testatexit.c Makefile $(TESTDIR)/Rules.mak
 testatexit_glibc: testatexit.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -172,7 +172,7 @@ testatexit_diff: testatexit_glibc testatexit
 ptytest: ptytest.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -185,5 +185,3 @@ ptytest: ptytest.c Makefile $(TESTDIR)/Rules.mak
 
 clean:
 	$(RM) *.[oa] *~ core $(TARGETS) *.out
-
-
diff --git a/test/string/Makefile b/test/string/Makefile
index 8160241f2..1bfbcc2ca 100644
--- a/test/string/Makefile
+++ b/test/string/Makefile
@@ -27,7 +27,7 @@ all: $(TARGETS)
 string: string.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -38,7 +38,7 @@ string: string.c Makefile $(TESTDIR)/Rules.mak
 string_glibc: string.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -49,7 +49,7 @@ string_glibc: string.c Makefile
 testcopy: testcopy.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -60,7 +60,7 @@ testcopy: testcopy.c Makefile $(TESTDIR)/Rules.mak
 testcopy_glibc: testcopy.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -80,7 +80,7 @@ testcopy_diff: testcopy testcopy_glibc
 strerror: ../../libc/string/strerror.c $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -DCHECK_BUF -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -91,7 +91,7 @@ strerror: ../../libc/string/strerror.c $(TESTDIR)/Rules.mak
 strsignal: ../../libc/string/strsignal.c
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -DCHECK_BUF -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -99,8 +99,5 @@ strsignal: ../../libc/string/strsignal.c
 	./$@
 	-@ echo " "
 
-
 clean:
 	$(RM) *.[oa] *~ core $(TARGETS) testcopy.gnu.out testcopy.out
-
-
diff --git a/test/termios/Makefile b/test/termios/Makefile
index c89318c8c..4c7450be2 100644
--- a/test/termios/Makefile
+++ b/test/termios/Makefile
@@ -25,7 +25,7 @@ all: $(TARGETS)
 termios: termios.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -38,7 +38,7 @@ termios: termios.c Makefile $(TESTDIR)/Rules.mak
 termios_glibc: termios.c Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -50,5 +50,3 @@ termios_glibc: termios.c Makefile
 
 clean:
 	$(RM) *.[oa] *~ core $(TARGETS)
-
-
diff --git a/test/unistd/Makefile b/test/unistd/Makefile
index df23cfc87..aefc66213 100644
--- a/test/unistd/Makefile
+++ b/test/unistd/Makefile
@@ -24,7 +24,7 @@ all: $(TARGETS)
 getcwd: getcwd.c Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -35,7 +35,7 @@ getcwd: getcwd.c Makefile $(TESTDIR)/Rules.mak
 fork: fork.c ../testsuite.h Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -46,7 +46,7 @@ fork: fork.c ../testsuite.h Makefile $(TESTDIR)/Rules.mak
 fork_glibc: fork.c ../testsuite.h Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -57,7 +57,7 @@ fork_glibc: fork.c ../testsuite.h Makefile
 vfork: vfork.c ../testsuite.h Makefile $(TESTDIR)/Rules.mak
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uClibc: "
+	-@ echo "Compiling $@ vs uClibc: "
 	-@ echo " "
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
@@ -68,7 +68,7 @@ vfork: vfork.c ../testsuite.h Makefile $(TESTDIR)/Rules.mak
 vfork_glibc: vfork.c ../testsuite.h Makefile
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
+	-@ echo "Compiling $@ vs GNU libc: "
 	-@ echo " "
 	$(HOSTCC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOSTCC) $(GLIBC_LDFLAGS) $@.o -o $@
@@ -99,5 +99,3 @@ preadwrite: preadwrite.c Makefile $(TESTDIR)/Rules.mak
 
 clean:
 	$(RM) *.[oa] *~ core $(TARGETS)
-
-