Update

[l4.git] / kernel / fiasco / src / Makerules.UNITTEST

diff --git a/kernel/fiasco/src/Makerules.UNITTEST b/kernel/fiasco/src/Makerules.UNITTEST
index d6ce5b0a385fffbbda36a6b4684d761d4c2fc8ed..4830689e8cbf9823f74b13e9d08440c40aa5069e 100644 (file)
--- a/kernel/fiasco/src/Makerules.UNITTEST
+++ b/kernel/fiasco/src/Makerules.UNITTEST
@@ -73,7 +73,7 @@ include .Unittest.deps
 endif
 
 # List of subsystems on which KERNEL depends 
-$(ALL_TESTS): $(ABI) $(JABI) $(DRIVERS) $(LIBK) $(LIBAMM) $(CXXLIB)
+$(ALL_TESTS): $(ABI) $(JABI) $(DRIVERS) $(LIBK) $(LIBAMM)
 $(ALL_TESTS): kernel.ux.lds
 
 # XXX Hacks
@@ -87,12 +87,13 @@ $(ALL_TESTS): %: %.o
        @echo "Linking test $@"
        $(VERBOSE)$(CXX) -m32 -Wl,-Tkernel.ux.lds,--gc-sections \
          -static $(CXXFLAGS) $(LDFLAGS) $(PROF_FLAGS) $(OPT_CXXFLAGS) \
-         $(filter-out kernel.ux.lds,$^) -o $@ $(TEST_LIB)
+         $(filter-out kernel.ux.lds,$^) -o $@ $(TEST_LIB) -lutil
 
 %.ok: %
-ifeq ($(SYSTEM_TARGET)$(CONFIG_XARCH),ux)      # Test execution for non-cross UX builds
+ifeq ($(CROSS_COMPILE)$(CONFIG_XARCH),ux)      # Test execution for non-cross UX builds
        @echo -n "Running test $* ... "
-       @./$< --test --quiet > $*.out
+       @./$< --test --quiet > $*.out.full
+       @grep "^\[UTEST\]" $*.out.full > $*.out
 ifeq ($(RECREATE_OUTPUT),1)
        @cp $*.out $(srcdir)/test/unit/$*.out.verify.$(CONFIG_ABI)
 endif # RECREATE_OUTPUT