summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-07-03 06:45:58 +0000
committerEric Andersen <andersen@codepoet.org>2001-07-03 06:45:58 +0000
commitf9158d441880222b1ba287947ebc863785bf557c (patch)
tree39cceddbe7fc1457a8224a3b4270db1099d1a991
parent4836768df76d3919451aa9f847182c8f5f4068e7 (diff)
Scrub up the tests a bit, and force everybody to use the
build dir, so nothing need be installed... -Erik
-rw-r--r--test/Makefile5
-rw-r--r--test/Rules.mak15
-rw-r--r--test/args/Makefile6
-rw-r--r--test/assert/Makefile6
-rw-r--r--test/ctype/Makefile6
-rw-r--r--test/ldso/Makefile11
-rw-r--r--test/malloc/Makefile6
-rw-r--r--test/misc/Makefile6
-rw-r--r--test/mmap/Makefile6
-rw-r--r--test/pwd_grp/Makefile20
-rw-r--r--test/setjmp/Makefile6
-rw-r--r--test/signal/Makefile10
-rw-r--r--test/silly/Makefile14
-rw-r--r--test/stat/Makefile14
-rw-r--r--test/stdlib/Makefile50
-rw-r--r--test/string/Makefile30
-rw-r--r--test/termios/Makefile14
-rw-r--r--test/unistd/Makefile10
18 files changed, 120 insertions, 115 deletions
diff --git a/test/Makefile b/test/Makefile
index 611fb19b5..2cc365e3f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -23,12 +23,15 @@
TOPDIR=../
include $(TOPDIR)Rules.mak
-ALL_SUBDIRS = args assert ctype pwd_grp signal silly stdlib string unistd misc
+ALL_SUBDIRS = args assert ctype pwd_grp signal silly stdlib string unistd #misc
ifeq ($(TARGET_ARCH), $(NATIVE_ARCH))
DIRS = $(ALL_SUBDIRS)
else
DIRS =
endif
+ifeq ($(DO_SHARED),shared)
+ DIRS += ldso
+endif
all: subdirs
diff --git a/test/Rules.mak b/test/Rules.mak
index ab0cd27ff..63a8b2b95 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -14,8 +14,8 @@ NATIVE_ARCH = $(shell uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \
# If you are running a cross compiler, you may want to set this
# to something more interesting...
-TESTCC = ../$(TESTDIR)extra/gcc-uClibc/$(NATIVE_ARCH)-uclibc-gcc
-CC = gcc
+CC = ../$(TESTDIR)extra/gcc-uClibc/$(NATIVE_ARCH)-uclibc-gcc
+HOST_CC = gcc
STRIPTOOL=strip
@@ -29,20 +29,23 @@ 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)
-TEST_CFLAGS=$(WARNINGS) $(OPTIMIZATION) --uclibc-use-build-dir
-CFLAGS=$(WARNINGS) $(OPTIMIZATION)
-
ifeq ($(DODEBUG),true)
- CFLAGS +=-g
+ CFLAGS +=$(WARNINGS) $(OPTIMIZATION) -g
+ GLIBC_CFLAGS +=$(WARNINGS) $(OPTIMIZATION) -g
LDFLAGS =-Wl,-warn-common
+ GLIBC_LDFLAGS =-Wl,-warn-common
STRIPTOOL =/bin/true -Since_we_are_debugging
else
CFLAGS +=-fomit-frame-pointer
+ GLIBC_CFLAGS +=-fomit-frame-pointer
LDFLAGS =-s -Wl,-warn-common
+ GLIBC_LDFLAGS =-s -Wl,-warn-common
STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG)
endif
ifneq ($(DODYNAMIC),true)
LDFLAGS +=--static
endif
+CFLAGS+=--uclibc-use-build-dir
+LDFLAGS+=--uclibc-use-build-dir
diff --git a/test/args/Makefile b/test/args/Makefile
index 539e6b0fb..509cddd96 100644
--- a/test/args/Makefile
+++ b/test/args/Makefile
@@ -5,13 +5,13 @@ include $(TESTDIR)/Rules.mak
TARGETS=arg_test
all: $(TARGETS)
-arg_test: arg_test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+arg_test: arg_test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@ a b c d e f g h
-@ echo " "
diff --git a/test/assert/Makefile b/test/assert/Makefile
index d9d78be7c..8b6a4281a 100644
--- a/test/assert/Makefile
+++ b/test/assert/Makefile
@@ -5,13 +5,13 @@ include $(TESTDIR)/Rules.mak
TARGETS=assert
all: $(TARGETS)
-assert: assert.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+assert: assert.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@
-@ echo " "
diff --git a/test/ctype/Makefile b/test/ctype/Makefile
index 98a1b750c..b8b415c5d 100644
--- a/test/ctype/Makefile
+++ b/test/ctype/Makefile
@@ -4,13 +4,13 @@ include $(TESTDIR)/Rules.mak
TARGETS=ctype
all: $(TARGETS)
-ctype: ctype.c ../testsuite.h Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+ctype: ctype.c ../testsuite.h Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
./$@
-@ echo " "
diff --git a/test/ldso/Makefile b/test/ldso/Makefile
index 3131a715a..59946ae85 100644
--- a/test/ldso/Makefile
+++ b/test/ldso/Makefile
@@ -4,17 +4,16 @@ include $(TESTDIR)/Rules.mak
all: dltest shared run
dltest:
- $(TESTCC) $(TEST_CFLAGS) -c dltest.c -o dltest.o
- $(TESTCC) $(TEST_CFLAGS) -c howdy.c -o howdy.o
+ $(CC) $(CFLAGS) -c dltest.c -o dltest.o
+ $(CC) $(CFLAGS) -c howdy.c -o howdy.o
shared:
- $(TESTCC) $(TEST_CFLAGS) -shared -o libhowdy.so -Wl,-soname,libhowdy.so howdy.o
- $(TESTCC) $(TEST_CFLAGS) -o dltest dltest.o -ldl
+ $(CC) $(CFLAGS) -shared -o libhowdy.so -Wl,-soname,libhowdy.so howdy.o
+ $(CC) $(CFLAGS) -o dltest dltest.o -ldl
run:
@echo Running dltest
./dltest
clean:
- rm -f *.o *.so dltest core
-
+ rm -f *.o *.so dltest core libhowdy.so
diff --git a/test/malloc/Makefile b/test/malloc/Makefile
index d6bf7182b..0254995b4 100644
--- a/test/malloc/Makefile
+++ b/test/malloc/Makefile
@@ -5,13 +5,13 @@ include $(TESTDIR)/Rules.mak
TARGETS=malloc
all: $(TARGETS)
-malloc: malloc.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+malloc: malloc.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@
-@ echo " "
diff --git a/test/misc/Makefile b/test/misc/Makefile
index c7a616e58..631e0ed2d 100644
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -4,13 +4,13 @@ include $(TESTDIR)/Rules.mak
TARGETS=outb
all: $(TARGETS)
-outb: outb.c ../testsuite.h Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+outb: outb.c ../testsuite.h Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
./$@
-@ echo " "
diff --git a/test/mmap/Makefile b/test/mmap/Makefile
index d23bbf68f..5c99e36ba 100644
--- a/test/mmap/Makefile
+++ b/test/mmap/Makefile
@@ -5,13 +5,13 @@ include $(TESTDIR)/Rules.mak
TARGETS=mmap
all: $(TARGETS)
-mmap: mmap.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+mmap: mmap.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@
-@ echo " "
diff --git a/test/pwd_grp/Makefile b/test/pwd_grp/Makefile
index 6b033efad..ae420c0d0 100644
--- a/test/pwd_grp/Makefile
+++ b/test/pwd_grp/Makefile
@@ -8,13 +8,13 @@ TARGETS+=test_pwd_diff test_grp_diff
all: $(TARGETS)
-test_pwd: test_pwd.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+test_pwd: test_pwd.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@ 2>&1 >test_pwd.out
-@ echo " "
@@ -24,19 +24,19 @@ test_pwd_glibc: test_pwd.c Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@ 2>&1 >test_pwd_glibc.out
-@ echo " "
-test_grp: test_grp.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+test_grp: test_grp.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@ 2>&1 >test_grp.out
-@ echo " "
@@ -46,8 +46,8 @@ test_grp_glibc: test_grp.c Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@ 2>&1 >test_grp_glibc.out
-@ echo " "
diff --git a/test/setjmp/Makefile b/test/setjmp/Makefile
index 226df0b57..25a1e0fbf 100644
--- a/test/setjmp/Makefile
+++ b/test/setjmp/Makefile
@@ -5,13 +5,13 @@ include $(TESTDIR)/Rules.mak
TARGETS=setjmp_test
all: $(TARGETS)
-setjmp_test: setjmp_test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+setjmp_test: setjmp_test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@
-@ echo " "
diff --git a/test/signal/Makefile b/test/signal/Makefile
index 1ba7f0350..68b31e75e 100644
--- a/test/signal/Makefile
+++ b/test/signal/Makefile
@@ -5,13 +5,13 @@ include $(TESTDIR)/Rules.mak
TARGETS=signal signal_glibc
all: $(TARGETS)
-signal: signal.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+signal: signal.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@
-@ echo " "
@@ -21,8 +21,8 @@ signal_glibc: signal.c Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@
-@ echo " "
diff --git a/test/silly/Makefile b/test/silly/Makefile
index 8431fd412..e94d67515 100644
--- a/test/silly/Makefile
+++ b/test/silly/Makefile
@@ -15,16 +15,16 @@ hello_source:
-@ cat hello.c
-@ echo " "
-hello: hello.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+hello: hello.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
- ls $(LSFLAGS) $@
+ ls -l $@
-./$@
-@ echo " "
@@ -33,11 +33,11 @@ hello_glibc: hello.c Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
- ls $(LSFLAGS) $@
+ ls -l $@
-./$@
-@ echo " "
diff --git a/test/stat/Makefile b/test/stat/Makefile
index 7d09dbcb8..2247f283f 100644
--- a/test/stat/Makefile
+++ b/test/stat/Makefile
@@ -15,16 +15,16 @@ stat_source:
-@ cat stat.c
-@ echo " "
-stat: stat.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+stat: stat.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
- ls $(LSFLAGS) $@
+ ls -l $@
-./$@
-@ echo " "
@@ -33,11 +33,11 @@ stat_glibc: stat.c Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
- ls $(LSFLAGS) $@
+ ls -l $@
-./$@
-@ echo " "
diff --git a/test/stdlib/Makefile b/test/stdlib/Makefile
index 863a56492..f551880f7 100644
--- a/test/stdlib/Makefile
+++ b/test/stdlib/Makefile
@@ -17,16 +17,16 @@ testmalloc_source:
-@ cat testmalloc.c
-@ echo " "
-testmalloc: testmalloc.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+testmalloc: testmalloc.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
- ls $(LSFLAGS) $@
+ ls -l $@
-./$@
-@ echo " "
@@ -35,24 +35,24 @@ testmalloc_glibc: testmalloc.c Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
- ls $(LSFLAGS) $@
+ ls -l $@
-./$@
-@ echo " "
-mallocbug: mallocbug.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+mallocbug: mallocbug.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
- ls $(LSFLAGS) $@
+ ls -l $@
-./$@
-@ echo " "
@@ -61,11 +61,11 @@ mallocbug_glibc: mallocbug.c Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
- ls $(LSFLAGS) $@
+ ls -l $@
-./$@
-@ echo " "
@@ -76,13 +76,13 @@ teststrtol_source:
-@ cat teststrtol.c
-@ echo " "
-teststrtol: teststrtol.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+teststrtol: teststrtol.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
ls -sh $@
@@ -94,8 +94,8 @@ teststrtol_glibc: teststrtol.c Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
ls -sh $@
@@ -110,16 +110,16 @@ teststrtol_diff: teststrtol_glibc teststrtol
-diff -u teststrtol_glibc.out teststrtol.out
-@ echo " "
-qsort: qsort.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+qsort: qsort.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
- ls $(LSFLAGS) $@
+ ls -l $@
-./$@ > $@.out
-@ echo " "
@@ -128,8 +128,8 @@ qsort_glibc: qsort.c Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
ls -sh $@
diff --git a/test/string/Makefile b/test/string/Makefile
index 715595c6f..36d8a9cff 100644
--- a/test/string/Makefile
+++ b/test/string/Makefile
@@ -8,13 +8,13 @@ TARGETS+=strerror #strsignal
all: $(TARGETS)
-string: string.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+string: string.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@
-@ echo " "
@@ -24,19 +24,19 @@ string_glibc: string.c Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@
-@ echo " "
-testcopy: testcopy.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+testcopy: testcopy.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@ > testcopy.out
-@ echo " "
@@ -46,8 +46,8 @@ testcopy_glibc: testcopy.c Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@ > testcopy.gnu.out
-@ echo " "
@@ -61,13 +61,13 @@ testcopy_diff: testcopy testcopy_glibc
-@ echo " "
-strerror: ../../libc/string/strerror.c $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+strerror: ../../libc/string/strerror.c $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -DCHECK_BUF -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -DCHECK_BUF -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@
-@ echo " "
@@ -77,8 +77,8 @@ strsignal: ../../libc/string/strsignal.c
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(CFLAGS) -DCHECK_BUF -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -DCHECK_BUF -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@
-@ echo " "
diff --git a/test/termios/Makefile b/test/termios/Makefile
index 2f5c702e3..930cbdca3 100644
--- a/test/termios/Makefile
+++ b/test/termios/Makefile
@@ -7,16 +7,16 @@ TARGETS=termios termios_glibc
all: $(TARGETS)
-termios: termios.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+termios: termios.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
- ls $(LSFLAGS) $@
+ ls -l $@
-./$@
-@ echo " "
@@ -25,11 +25,11 @@ termios_glibc: termios.c Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-ldd $@
- ls $(LSFLAGS) $@
+ ls -l $@
-./$@
-@ echo " "
diff --git a/test/unistd/Makefile b/test/unistd/Makefile
index 7f4014074..49febf79a 100644
--- a/test/unistd/Makefile
+++ b/test/unistd/Makefile
@@ -6,13 +6,13 @@ include $(TESTDIR)/Rules.mak
TARGETS=fork fork_glibc
all: $(TARGETS)
-fork: fork.c ../testsuite.h Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
+fork: fork.c ../testsuite.h Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo "-------"
-@ echo " "
-@ echo "Compiling vs uClibc: "
-@ echo " "
- $(TESTCC) $(TEST_CFLAGS) -c $< -o $@.o
- $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
+ $(CC) $(CFLAGS) -c $< -o $@.o
+ $(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
$(STRIPTOOL) -x -R .note -R .comment $@
./$@
-@ echo " "
@@ -22,8 +22,8 @@ fork_glibc: fork.c ../testsuite.h Makefile
-@ echo " "
-@ echo "Compiling vs GNU libc: "
-@ echo " "
- $(CC) $(CFLAGS) -c $< -o $@.o
- $(CC) $(LDFLAGS) $@.o -o $@
+ $(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
+ $(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
$(STRIPTOOL) -x -R .note -R .comment $@
-./$@
-@ echo " "