summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-06-20 10:19:50 +0000
committerEric Andersen <andersen@codepoet.org>2002-06-20 10:19:50 +0000
commit0f41aa8f114eadcd433fb2e0529c710b75a9f0e8 (patch)
tree43c79128c59d46ca4cc2c922527c2d44aa134093 /test
parent76c03cedb9a3f496a0e4fc5580ea1324c28815d2 (diff)
Several test case cleanups
-Erik
Diffstat (limited to 'test')
-rw-r--r--test/Rules.mak19
-rw-r--r--test/string/Makefile2
2 files changed, 17 insertions, 4 deletions
diff --git a/test/Rules.mak b/test/Rules.mak
index 759d0771b..25398a137 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -12,7 +12,7 @@ include $(TESTDIR)Config
# Use NATIVE_ARCH here since running these test is not
# even possible when cross compiling...
-NATIVE_ARCH = ${shell uname -m | sed \
+NATIVE_ARCH:= ${shell uname -m | sed \
-e 's/i.86/i386/' \
-e 's/sparc.*/sparc/' \
-e 's/arm.*/arm/g' \
@@ -22,10 +22,23 @@ NATIVE_ARCH = ${shell uname -m | sed \
-e 's/sh[234].*/sh/' \
-e 's/mips.*/mips/' \
}
+ifeq ($(strip $(TARGET_ARCH)),)
+TARGET_ARCH:=${shell $(CC) -dumpmachine | sed -e s'/-.*//' \
+ -e 's/i.86/i386/' \
+ -e 's/sparc.*/sparc/' \
+ -e 's/arm.*/arm/g' \
+ -e 's/m68k.*/m68k/' \
+ -e 's/ppc/powerpc/g' \
+ -e 's/v850.*/v850/g' \
+ -e 's/sh[234]/sh/' \
+ -e 's/mips.*/mips/' \
+ }
+endif
+
# If you are running a cross compiler, you may want to set this
# to something more interesting...
-CC = ../$(TESTDIR)extra/gcc-uClibc/$(NATIVE_ARCH)-uclibc-gcc
+CC = ../$(TESTDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-gcc
HOST_CC = gcc
STRIPTOOL=strip
LDD = ../$(TESTDIR)ldso/util/ldd
@@ -44,7 +57,7 @@ OPTIMIZATION = ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&
ifeq ($(DODEBUG),true)
CFLAGS +=$(WARNINGS) $(OPTIMIZATION) -g
GLIBC_CFLAGS +=$(WARNINGS) $(OPTIMIZATION) -g
- LDFLAGS =-Wl,-warn-common
+ LDFLAGS =-Wl,-warn-common
GLIBC_LDFLAGS =-Wl,-warn-common
STRIPTOOL =/bin/true -Since_we_are_debugging
else
diff --git a/test/string/Makefile b/test/string/Makefile
index e53281fdd..236dc68ea 100644
--- a/test/string/Makefile
+++ b/test/string/Makefile
@@ -22,7 +22,7 @@ include $(TESTDIR)/Rules.mak
TARGETS=string string_glibc
TARGETS+=testcopy testcopy_glibc
-TARGETS+=strerror #strsignal
+TARGETS+=#strerror #strsignal
all: $(TARGETS)