summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2009-11-18 16:06:49 +0100
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2009-11-19 16:07:24 +0100
commit8b2ceb8dc4c882a1f5936e6794bc87591422f2d3 (patch)
treefdd124fd6a95b338fa9b7d0e8a57abe80e5c6513 /test
parent06962b0ccf39ef0b2ebb3b73809d81e34da71e1d (diff)
test: sync up with toplevel buildsys
test/Rules.mak was duplicating too much from the toplevel Rules.mak (which is included anyway). Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/Rules.mak88
-rw-r--r--test/Test.mak30
2 files changed, 45 insertions, 73 deletions
diff --git a/test/Rules.mak b/test/Rules.mak
index 8e154c590..492b99706 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -31,9 +31,10 @@ export LC_ALL
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/sun.*/sparc/' -e 's/sparc.*/sparc/' \
+ -e 's/sa110/arm/' -e 's/arm.*/arm/g' \
-e 's/m68k.*/m68k/' \
+ -e 's/parisc.*/hppa/' \
-e 's/ppc/powerpc/g' \
-e 's/v850.*/v850/g' \
-e 's/sh[234]/sh/' \
@@ -44,76 +45,42 @@ TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \
endif
export TARGET_ARCH
-
-#--------------------------------------------------------
-# If you are running a cross compiler, you will want to set 'CROSS'
-# to something more interesting... Target architecture is determined
-# by asking the CC compiler what arch it compiles things for, so unless
-# your compiler is broken, you should not need to specify TARGET_ARCH
-#
-# Most people will set this stuff on the command line, i.e.
-# make CROSS=mipsel-linux-
-# will build uClibc for 'mipsel'.
-
-CROSS = $(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
-CC = $(CROSS)gcc
-RM = rm -f
-RM_R = $(RM) -r
-
-# Select the compiler needed to build binaries for your development system
-HOSTCC = gcc
-
-
-#--------------------------------------------------------
-# A nifty macro to make testing gcc features easier
-check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
- then echo "$(1)"; else echo "$(2)"; fi)
-
-# use '-Os' optimization if available, else use -O2, allow Config to override
-# Override optimization settings when debugging
-ifeq ($(DODEBUG),y)
-OPTIMIZATION = -O0
-else
-OPTIMIZATION += $(call check_gcc,-Os,-O2)
-endif
-
-XWARNINGS := $(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes
-XARCH_CFLAGS := $(subst ",, $(strip $(ARCH_CFLAGS))) $(CPU_CFLAGS)
-XCOMMON_CFLAGS := -D_GNU_SOURCE -I$(top_builddir)test
-CFLAGS := $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS) $(XARCH_CFLAGS) -nostdinc -I$(top_builddir)$(LOCAL_INSTALL_PATH)/usr/include
-
-CC_IPREFIX := $(shell $(CC) --print-file-name=include)
-CC_INC := -I$(dir $(CC_IPREFIX))include-fixed -I$(CC_IPREFIX)
-CFLAGS += $(CC_INC)
+RM_R = $(Q)$(RM) -r
ifneq ($(KERNEL_HEADERS),)
ifeq ($(patsubst /%,/,$(KERNEL_HEADERS)),/)
# Absolute path in KERNEL_HEADERS
-CFLAGS += -I$(KERNEL_HEADERS)
+KERNEL_INCLUDES += -I$(KERNEL_HEADERS)
else
# Relative path in KERNEL_HEADERS
-CFLAGS += -I$(top_builddir)$(KERNEL_HEADERS)
+KERNEL_INCLUDES += -I$(top_builddir)$(KERNEL_HEADERS)
endif
endif
+XCOMMON_CFLAGS := -I$(top_builddir)test -D_GNU_SOURCE
+XWARNINGS += $(call check_gcc,-Wstrict-prototypes,)
+CFLAGS := -nostdinc -I$(top_builddir)$(LOCAL_INSTALL_PATH)/usr/include
+CFLAGS += $(XCOMMON_CFLAGS) $(KERNEL_INCLUDES) $(CC_INC)
+CFLAGS += $(OPTIMIZATION) $(CPU_CFLAGS) $(XWARNINGS)
+
# Can't add $(OPTIMIZATION) here, it may be target-specific.
# Just adding -Os for now.
-HOST_CFLAGS += $(XWARNINGS) -Os $(XCOMMON_CFLAGS)
+HOST_CFLAGS += $(XCOMMON_CFLAGS) -Os $(XWARNINGS)
-LDFLAGS := $(CPU_LDFLAGS)
+LDFLAGS := $(CPU_LDFLAGS-y)
ifeq ($(DODEBUG),y)
CFLAGS += -g
HOST_CFLAGS += -g
- LDFLAGS += -g
- HOST_LDFLAGS += -g
+ LDFLAGS += -Wl,-g
+ HOST_LDFLAGS += -Wl,-g
else
- LDFLAGS += -s
- HOST_LDFLAGS += -s
+ LDFLAGS += -Wl,-s
+ HOST_LDFLAGS += -Wl,-s
endif
-ifneq ($(strip $(HAVE_SHARED)),y)
- LDFLAGS += -static
- HOST_LDFLAGS += -static
+ifneq ($(HAVE_SHARED),y)
+ LDFLAGS += -Wl,-static
+ HOST_LDFLAGS += -Wl,-static
endif
LDFLAGS += -B$(top_builddir)lib -Wl,-rpath,$(top_builddir)lib -Wl,-rpath-link,$(top_builddir)lib
@@ -124,7 +91,7 @@ UCLIBC_LDSO_ABSPATH=$(SHARED_LIB_LOADER_PREFIX)
endif
ifeq ($(findstring -static,$(LDFLAGS)),)
- LDFLAGS += -Wl,--dynamic-linker,$(UCLIBC_LDSO_ABSPATH)/$(UCLIBC_LDSO)
+LDFLAGS += -Wl,--dynamic-linker,$(UCLIBC_LDSO_ABSPATH)/$(UCLIBC_LDSO)
endif
ifeq ($(LDSO_GNU_HASH_SUPPORT),y)
@@ -133,9 +100,7 @@ LDFLAGS += -Wl,${LDFLAGS_GNUHASH}
endif
-# Filter output
-MAKEFLAGS += --no-print-directory
-ifneq ($(findstring s,$(MAKEFLAGS)),)
+ifneq ($(findstring -s,$(MAKEFLAGS)),)
DISP := sil
Q := @
SCAT := -@true
@@ -150,12 +115,15 @@ Q := @
SCAT := -@true
endif
endif
+ifneq ($(Q),)
+MAKEFLAGS += --no-print-directory
+endif
banner := ---------------------------------
pur_showclean = echo " "CLEAN $(notdir $(CURDIR))
pur_showdiff = echo " "TEST_DIFF $(notdir $(CURDIR))/
pur_showlink = echo " "TEST_LINK $(notdir $(CURDIR))/ $@
-pur_showtest = echo " "TEST_EXEC $(notdir $(CURDIR))/ $(patsubst %.exe,%,$@)
+pur_showtest = echo " "TEST_EXEC $(notdir $(CURDIR))/ $(@:.exe=)
sil_showclean =
sil_showdiff = true
sil_showlink = true
@@ -163,7 +131,7 @@ sil_showtest = true
ver_showclean =
ver_showdiff = true echo
ver_showlink = true echo
-ver_showtest = printf "\n$(banner)\nTEST $(notdir $(PWD))/ $(patsubst %.exe,%,$@)\n$(banner)\n"
+ver_showtest = printf "\n$(banner)\nTEST $(notdir $(CURDIR))/ $(@:.exe=)\n$(banner)\n"
do_showclean = $($(DISP)_showclean)
do_showdiff = $($(DISP)_showdiff)
do_showlink = $($(DISP)_showlink)
diff --git a/test/Test.mak b/test/Test.mak
index 66565498f..2dab7f741 100644
--- a/test/Test.mak
+++ b/test/Test.mak
@@ -14,12 +14,12 @@ ifeq ($(SHELL_TESTS),)
SHELL_TESTS := $(patsubst %.sh,shell_%,$(wildcard *.sh))
endif
-ifneq ($(filter-out test,$(TESTS)),$(TESTS))
+ifneq ($(filter-out test,$(strip $(TESTS))),$(strip $(TESTS)))
$(error Sanity check: cannot have a test named "test.c")
endif
U_TARGETS := $(TESTS)
-G_TARGETS := $(patsubst %,%_glibc,$(U_TARGETS))
+G_TARGETS := $(addsuffix _glibc,$(U_TARGETS))
ifeq ($(GLIBC_ONLY),)
TARGETS += $(U_TARGETS)
@@ -30,35 +30,39 @@ endif
CLEAN_TARGETS := $(U_TARGETS) $(G_TARGETS)
COMPILE_TARGETS := $(TARGETS)
-RUN_TARGETS := $(patsubst %,%.exe,$(TARGETS))
+RUN_TARGETS := $(addsuffix .exe,$(TARGETS))
TARGETS += $(SHELL_TESTS)
+CFLAGS+=$(CFLAGS_$(notdir $(CURDIR)))
define binary_name
$(patsubst %.exe,%,$@)
endef
+define tst_src_name
+$(patsubst %_glibc,%,$(binary_name))
+endef
define diff_test
$(Q)\
- for x in "$(binary_name).out" "$(patsubst %_glibc,%,$(binary_name)).out" ; do \
+ for x in "$(binary_name).out" "$(tst_src_name).out" ; do \
test -e "$$x.good" && $(do_showdiff) "$(binary_name).out" "$$x.good" && exec diff -u "$(binary_name).out" "$$x.good" ; \
done ; \
true
endef
define uclibc_glibc_diff_test
$(Q)\
- test -z "$(DODIFF_$(patsubst %_glibc,%,$(binary_name)))" && exec true ; \
+ test -z "$(DODIFF_$(tst_src_name))" && exec true ; \
uclibc_out="$(binary_name).out" ; \
- glibc_out="$(patsubst %_glibc,%,$(binary_name)).out" ; \
+ glibc_out="$(tst_src_name).out" ; \
$(do_showdiff) $$uclibc_out $$glibc_out ; \
exec diff -u "$$uclibc_out" "$$glibc_out"
endef
define exec_test
$(showtest)
$(Q)\
- $(WRAPPER) $(WRAPPER_$(patsubst %_glibc,%,$(binary_name))) \
- ./$(binary_name) $(OPTS) $(OPTS_$(patsubst %_glibc,%,$(binary_name))) > "$(binary_name).out" 2>&1 ; \
+ $(WRAPPER) $(WRAPPER_$(tst_src_name)) \
+ ./$(binary_name) $(OPTS) $(OPTS_$(tst_src_name)) > "$(binary_name).out" 2>&1 ; \
ret=$$? ; \
- expected_ret="$(RET_$(patsubst %_glibc,%,$(binary_name)))" ; \
+ expected_ret="$(RET_$(tst_src_name))" ; \
test -z "$$expected_ret" && export expected_ret=0 ; \
if ! test $$ret -eq $$expected_ret ; then \
echo "ret == $$ret ; expected_ret == $$expected_ret" ; \
@@ -79,19 +83,19 @@ endif
compile: $(COMPILE_TARGETS)
-G_TARGET_SRCS := $(patsubst %,%.c,$(G_TARGETS))
-U_TARGET_SRCS := $(patsubst %,%.c,$(U_TARGETS))
+G_TARGET_SRCS := $(addsuffix .c,$(G_TARGETS))
+U_TARGET_SRCS := $(addsuffix .c,$(U_TARGETS))
$(MAKE_SRCS): Makefile $(TESTDIR)Makefile $(TESTDIR)Rules.mak $(TESTDIR)Test.mak
$(U_TARGETS): $(U_TARGET_SRCS) $(MAKE_SRCS)
$(showlink)
- $(Q)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -c $@.c -o $@.o
+ $(Q)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(notdir $(CURDIR))) $(CFLAGS_$@) -c $@.c -o $@.o
$(Q)$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$@)
$(G_TARGETS): $(U_TARGET_SRCS) $(MAKE_SRCS)
$(showlink)
- $(Q)$(HOSTCC) $(HOST_CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(patsubst %_glibc,%,$@)) -c $(patsubst %_glibc,%,$@).c -o $@.o
+ $(Q)$(HOSTCC) $(HOST_CFLAGS) $(CFLAGS_$(notdir $(CURDIR))) $(CFLAGS_$(patsubst %_glibc,%,$@)) -c $(patsubst %_glibc,%,$@).c -o $@.o
$(Q)$(HOSTCC) $(HOST_LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$(patsubst %_glibc,%,$@))