From c1ae0ad8262ce40178a54a393bcf466b57ad5819 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 15 Jun 2001 19:06:07 +0000 Subject: Make all the uClibc tests use the --uclibc-use-build-dir flag --- test/Rules.mak | 3 ++- test/args/Makefile | 2 +- test/assert/Makefile | 2 +- test/ctype/Makefile | 2 +- test/malloc/Makefile | 2 +- test/misc/Makefile | 2 +- test/mmap/Makefile | 2 +- test/pwd_grp/Makefile | 4 ++-- test/setjmp/Makefile | 2 +- test/signal/Makefile | 2 +- test/silly/Makefile | 2 +- test/stat/Makefile | 2 +- test/stdlib/Makefile | 12 ++++++------ test/string/Makefile | 6 +++--- test/termios/Makefile | 2 +- test/unistd/Makefile | 2 +- 16 files changed, 25 insertions(+), 24 deletions(-) (limited to 'test') diff --git a/test/Rules.mak b/test/Rules.mak index 00abb880f..ab0cd27ff 100644 --- a/test/Rules.mak +++ b/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 diff --git a/test/args/Makefile b/test/args/Makefile index 6593be0aa..539e6b0fb 100644 --- a/test/args/Makefile +++ b/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 diff --git a/test/assert/Makefile b/test/assert/Makefile index 96999bccd..d9d78be7c 100644 --- a/test/assert/Makefile +++ b/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 $@ -./$@ diff --git a/test/ctype/Makefile b/test/ctype/Makefile index 4f7db6e44..98a1b750c 100644 --- a/test/ctype/Makefile +++ b/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 $@ ./$@ diff --git a/test/malloc/Makefile b/test/malloc/Makefile index d0274d2ce..d6bf7182b 100644 --- a/test/malloc/Makefile +++ b/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 $@ -./$@ diff --git a/test/misc/Makefile b/test/misc/Makefile index 5e6ffb504..c7a616e58 100644 --- a/test/misc/Makefile +++ b/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 $@ ./$@ diff --git a/test/mmap/Makefile b/test/mmap/Makefile index 82fd5ee1b..d23bbf68f 100644 --- a/test/mmap/Makefile +++ b/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 $@ -./$@ diff --git a/test/pwd_grp/Makefile b/test/pwd_grp/Makefile index 295cc8e23..6b033efad 100644 --- a/test/pwd_grp/Makefile +++ b/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 diff --git a/test/setjmp/Makefile b/test/setjmp/Makefile index 45721ef90..226df0b57 100644 --- a/test/setjmp/Makefile +++ b/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 $@ -./$@ diff --git a/test/signal/Makefile b/test/signal/Makefile index dbd6e2c32..1ba7f0350 100644 --- a/test/signal/Makefile +++ b/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 $@ -./$@ diff --git a/test/silly/Makefile b/test/silly/Makefile index 717656575..8431fd412 100644 --- a/test/silly/Makefile +++ b/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 $@ diff --git a/test/stat/Makefile b/test/stat/Makefile index 4a1cf405f..7d09dbcb8 100644 --- a/test/stat/Makefile +++ b/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 $@ diff --git a/test/stdlib/Makefile b/test/stdlib/Makefile index 43b942f99..863a56492 100644 --- a/test/stdlib/Makefile +++ b/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 $@ diff --git a/test/string/Makefile b/test/string/Makefile index 0677f3aab..715595c6f 100644 --- a/test/string/Makefile +++ b/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 $@ -./$@ diff --git a/test/termios/Makefile b/test/termios/Makefile index 69c949a4a..2f5c702e3 100644 --- a/test/termios/Makefile +++ b/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 $@ diff --git a/test/unistd/Makefile b/test/unistd/Makefile index aff74b4ab..7f4014074 100644 --- a/test/unistd/Makefile +++ b/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 $@ ./$@ -- cgit v1.2.3