summaryrefslogtreecommitdiff
path: root/test/Test.mak
diff options
context:
space:
mode:
Diffstat (limited to 'test/Test.mak')
-rw-r--r--test/Test.mak30
1 files changed, 17 insertions, 13 deletions
diff --git a/test/Test.mak b/test/Test.mak
index e4f4835e1..0c5629144 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" ; \
@@ -78,19 +82,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,%,$@))