update

[l4.git] / l4 / pkg / uclibc / lib / contrib / uclibc / test / Test.mak

diff --git a/l4/pkg/uclibc/lib/contrib/uclibc/test/Test.mak b/l4/pkg/uclibc/lib/contrib/uclibc/test/Test.mak
index ce890620812bf670cee343c52bbde4b5aa9ee477..dd3fcc38705105e61498a58e78ffd771717f64b6 100644 (file)
--- a/l4/pkg/uclibc/lib/contrib/uclibc/test/Test.mak
+++ b/l4/pkg/uclibc/lib/contrib/uclibc/test/Test.mak
@@ -21,6 +21,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,12 +33,12 @@ TARGETS   += $(G_TARGETS)
 endif
 
 CLEAN_TARGETS := $(U_TARGETS) $(G_TARGETS)
-CLEAN_TARGETS += $(TESTS_DISABLED) $(addsuffix _glibc,$(TESTS_DISABLED))
+CLEAN_TARGETS += $(TESTS_DISABLED) $(addsuffix _glibc,$(TESTS_DISABLED)) $(GLIBC_TESTS_DISABLED)
 COMPILE_TARGETS :=  $(TARGETS)
 RUN_TARGETS := $(addsuffix .exe,$(TARGETS))
 # provide build rules even for disabled tests:
 U_TARGETS += $(TESTS_DISABLED)
-G_TARGETS += $(addsuffix _glibc,$(TESTS_DISABLED))
+G_TARGETS += $(addsuffix _glibc,$(TESTS_DISABLED)) $(GLIBC_TESTS_DISABLED)
 TARGETS += $(SHELL_TESTS)
 CFLAGS += $(CFLAGS_$(notdir $(CURDIR)))
 
@@ -70,15 +74,16 @@ define exec_test
                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 failed test is:"; \
+               cat "$(binary_name).out"; \
                exit 1 ; \
        fi
        $(SCAT) "$(binary_name).out"
 endef
 
 test check all: run
-run: $(RUN_TARGETS) compile
-
-$(RUN_TARGETS): $(TARGETS)
+run: $(RUN_TARGETS)
+$(RUN_TARGETS):
        $(exec_test)
        $(diff_test)
 ifeq ($(UCLIBC_ONLY),)