Make all the uClibc tests use the --uclibc-use-build-dir flag

test/Rules.mak

@@ -29,7 +29,8 @@ WARNINGS=-Wall
 OPTIMIZATION = $(shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
     then echo "-Os"; else echo "-O2" ; fi)
 
-CFLAGS=$(WARNINGS) $(OPTIMIZATION) 
+TEST_CFLAGS=$(WARNINGS) $(OPTIMIZATION) --uclibc-use-build-dir 
+CFLAGS=$(WARNINGS) $(OPTIMIZATION)
 
 ifeq ($(DODEBUG),true)
     CFLAGS +=-g

test/args/Makefile

@@ -10,7 +10,7 @@ arg_test: arg_test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@ a b c d e f g h

test/assert/Makefile

@@ -10,7 +10,7 @@ assert: assert.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@

test/ctype/Makefile

@@ -9,7 +9,7 @@ ctype: ctype.c ../testsuite.h Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	./$@

test/malloc/Makefile

@@ -10,7 +10,7 @@ malloc: malloc.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@

test/misc/Makefile

@@ -9,7 +9,7 @@ outb: outb.c ../testsuite.h Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TE
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	./$@

test/mmap/Makefile

@@ -10,7 +10,7 @@ mmap: mmap.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@

test/pwd_grp/Makefile

@@ -13,7 +13,7 @@ test_pwd: test_pwd.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@ 2>&1 >test_pwd.out
@@ -35,7 +35,7 @@ test_grp: test_grp.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@ 2>&1 >test_grp.out

test/setjmp/Makefile

@@ -10,7 +10,7 @@ setjmp_test: setjmp_test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TES
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@

test/signal/Makefile

@@ -10,7 +10,7 @@ signal: signal.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@

test/silly/Makefile

@@ -20,7 +20,7 @@ hello: hello.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@

test/stat/Makefile

@@ -20,7 +20,7 @@ stat: stat.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@

test/stdlib/Makefile

@@ -22,7 +22,7 @@ testmalloc: testmalloc.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTC
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@
@@ -46,9 +46,9 @@ testmalloc_glibc: testmalloc.c Makefile
 mallocbug: mallocbug.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uC-Libc: "
+	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@
@@ -79,9 +79,9 @@ teststrtol_source:
 teststrtol: teststrtol.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo "-------"
 	-@ echo " "
-	-@ echo "Compiling vs uC-Libc: "
+	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@
@@ -115,7 +115,7 @@ qsort: qsort.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@

test/string/Makefile

@@ -13,7 +13,7 @@ string: string.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@
@@ -35,7 +35,7 @@ testcopy: testcopy.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@ > testcopy.out
@@ -66,7 +66,7 @@ strerror: ../../libc/string/strerror.c $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -DCHECK_BUF -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -DCHECK_BUF -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-./$@

test/termios/Makefile

@@ -12,7 +12,7 @@ termios: termios.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	-ldd $@

test/unistd/Makefile

@@ -11,7 +11,7 @@ fork: fork.c ../testsuite.h Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TE
 	-@ echo " "
 	-@ echo "Compiling vs uClibc: "
 	-@ echo " "
-	$(TESTCC) $(CFLAGS) -c $< -o $@.o
+	$(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
 	$(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
 	./$@