h8300: O_DIRECT and O_DIRECTIRY swapping.

[uclinux-h8/uclibc-ng.git] / test / Test.mak

diff --git a/test/Test.mak b/test/Test.mak
index 0c56291..a82505f 100644 (file)
--- a/test/Test.mak
+++ b/test/Test.mak
@@ -4,6 +4,8 @@
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 
+shellescape='$(subst ','\'',$(1))'
+
 ifeq ($(TESTS),)
 TESTS := $(patsubst %.c,%,$(wildcard *.c))
 endif
@@ -21,6 +23,10 @@ endif
 U_TARGETS := $(TESTS)
 G_TARGETS := $(addsuffix _glibc,$(U_TARGETS))
 
+ifneq ($(GLIBC_TESTS_DISABLED),)
+G_TARGETS := $(filter-out $(GLIBC_TESTS_DISABLED),$(G_TARGETS))
+endif
+
 ifeq ($(GLIBC_ONLY),)
 TARGETS   += $(U_TARGETS)
 endif
@@ -29,10 +35,19 @@ TARGETS   += $(G_TARGETS)
 endif
 
 CLEAN_TARGETS := $(U_TARGETS) $(G_TARGETS)
+CLEAN_TARGETS += $(TESTS_DISABLED) $(addsuffix _glibc,$(TESTS_DISABLED)) $(GLIBC_TESTS_DISABLED)
 COMPILE_TARGETS :=  $(TARGETS)
-RUN_TARGETS := $(addsuffix .exe,$(TARGETS))
+# We sort the targets so uClibc and host-libc tests are run adjacent
+RUN_TARGETS := $(sort $(addsuffix .exe,$(TARGETS)))
+COMPILE_TARGETS :=  $(sort $(COMPILE_TARGETS))
+# provide build rules even for disabled tests:
+U_TARGETS += $(TESTS_DISABLED)
+G_TARGETS += $(addsuffix _glibc,$(TESTS_DISABLED)) $(GLIBC_TESTS_DISABLED)
 TARGETS += $(SHELL_TESTS)
-CFLAGS+=$(CFLAGS_$(notdir $(CURDIR)))
+CFLAGS += $(CFLAGS_$(notdir $(CURDIR)))
+ifeq (1,$(UCLIBCNG_GENERATE_TESTRUNNER))
+UCLIBCNG_TEST_SUBDIR ?= $(patsubst $(realpath $(TESTDIR))/%,%,$(CURDIR))
+endif
 
 define binary_name
 $(patsubst %.exe,%,$@)
@@ -59,13 +74,15 @@ endef
 define exec_test
        $(showtest)
        $(Q)\
-       $(WRAPPER) $(WRAPPER_$(tst_src_name)) \
+       $(SIMULATOR) $(WRAPPER) $(WRAPPER_$(tst_src_name)) \
        ./$(binary_name) $(OPTS) $(OPTS_$(tst_src_name)) > "$(binary_name).out" 2>&1 ; \
                ret=$$? ; \
                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" ; \
+               echo "The output of the failed test is:"; \
+               cat "$(binary_name).out"; \
                exit 1 ; \
        fi
        $(SCAT) "$(binary_name).out"
@@ -73,12 +90,26 @@ endef
 
 test check all: run
 run: $(RUN_TARGETS)
+
+$(addsuffix .exe,$(U_TARGETS)): SIMULATOR:=$(SIMULATOR_uclibc)
+$(addsuffix .exe,$(G_TARGETS)): SIMULATOR:=$(SIMULATOR_glibc)
 $(RUN_TARGETS):
+ifeq (1,$(UCLIBCNG_GENERATE_TESTRUNNER))
+       $(Q)\
+       expected_ret="$(RET_$(tst_src_name))"; echo \
+           "$${expected_ret:-0}" \
+           $(call shellescape,$(tst_src_name)) \
+           $(call shellescape,$(binary_name)) \
+           $(call shellescape,$(UCLIBCNG_TEST_SUBDIR)) \
+           $(call shellescape,$(WRAPPER) $(WRAPPER_$(tst_src_name)) ./$(binary_name) $(OPTS) $(OPTS_$(tst_src_name))) \
+           >>$(top_builddir)/test/uclibcng-testrunner.in
+else
        $(exec_test)
        $(diff_test)
 ifeq ($(UCLIBC_ONLY),)
        $(uclibc_glibc_diff_test)
 endif
+endif
 
 compile: $(COMPILE_TARGETS)
 
@@ -89,25 +120,31 @@ $(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_$(notdir $(CURDIR))) $(CFLAGS_$@) -c $@.c -o $@.o
+       $(Q)$(CC) $(filter-out $(CFLAGS-OMIT-$@),$(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) $(CFLAGS_$(notdir $(CURDIR))) $(CFLAGS_$(patsubst %_glibc,%,$@)) -c $(patsubst %_glibc,%,$@).c -o $@.o
-       $(Q)$(HOSTCC) $(HOST_LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$(patsubst %_glibc,%,$@))
+       $(Q)$(HOSTCC) $(filter-out $(HOST_CFLAGS-OMIT-$(patsubst %_glibc,%,$@)),$(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,%,$@)) $(LDFLAGS_$@)
 
 
 shell_%:
        $(showtest)
+       $(Q)$(if $(PRE_RUN_$(@)),$(PRE_RUN_$(@)))
        $(Q)$(SHELL) $(patsubst shell_%,%.sh,$(binary_name))
+       $(Q)$(if $(POST_RUN_$(@)),$(POST_RUN_$(@)))
 
 %.so: %.c
        $(showlink)
        $(Q)$(CC) \
-               $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(patsubst %_glibc,%,$@)) \
+               $(filter-out $(CFLAGS-OMIT-$<),$(CFLAGS)) $(EXTRA_CFLAGS) \
+               $(CFLAGS_$(patsubst %_glibc,%,$@)) \
                -fPIC -shared $< -o $@ -Wl,-soname,$@ \
-               $(LDFLAGS) $(EXTRA_LIBS) $(LDFLAGS_$(patsubst %_glibc,%,$@))
+               $(filter-out $(LDFLAGS-OMIT-$<),$(LDFLAGS)) $(EXTRA_LIBS) \
+               $(LDFLAGS_$(patsubst %_glibc,%,$@))
 
 clean:
        $(showclean)