Do not build tests by default in platform libs.

"make tests" can be specified explicitly.  It will build and run
the tests.

diff --git a/platform/baremetal/Makefile b/platform/baremetal/Makefile
index ec317ecf65c0032ca9515e98aeebf09cd0ddd3ea..4b82b40625ad90f698d068c6fea0924671ec0ace 100644 (file)
--- a/platform/baremetal/Makefile
+++ b/platform/baremetal/Makefile
@@ -34,7 +34,7 @@ ifeq (${CONFIG_SYSPROXY},yes)
 LIBS_SYSPROXY= -lrumpkern_sysproxy
 endif
 
-all: app-tools include/bmk/machine rumprun.o commonlibs buildtest tests
+all: app-tools include/bmk/machine rumprun.o commonlibs buildtest
 
 OBJS_BMK-y+=           intr.o clock.o kernel.o undefs.o
 OBJS_BMK-y+=           rumpuser.o rumpconfig.o
@@ -126,11 +126,11 @@ buildtest: ../../tests/hello/hello.c rumprun.o commonlibs app-tools
        $(APP_TOOLS_CC) -DRUMPRUN_TESTER_JUSTMAIN -o $@ $<
 
 tests: rumprun.o commonlibs app-tools
-       $(APP_TOOLS_MAKE) -C ../../tests
+       RUMPRUN_PLATFORM=bmk ../../tests/buildtests.sh
+       ../../tests/runtests.sh qemu
 
 clean: app-tools_clean
        rm -f ${OBJS} include/bmk/machine buildtest
-       $(MAKE) -C ../../tests clean
        ( cd ${BASEDIR} && ${RUMPMAKE} MAKEOBJDIR=baremetal cleandir )
        ( cd ${COREDIR} && ${RUMPMAKE} MAKEOBJDIR=baremetal cleandir )
        ( cd ${RUMPUSERDIR} && ${RUMPMAKE} MAKEOBJDIR=baremetal cleandir )
@@ -142,3 +142,4 @@ cleanrump: clean
 
 distcleanrump: cleanrump
        rm -f config.mk
+       $(MAKE) -C ../../tests clean

diff --git a/platform/xen/Makefile b/platform/xen/Makefile
index b0714d7c3e3e8f33f90639a89285697c293e186b..bd7defd42dfcb7e78166bc8bc429865776fc120d 100644 (file)
--- a/platform/xen/Makefile
+++ b/platform/xen/Makefile
@@ -67,7 +67,7 @@ $(OBJ_DIR)/%.o: %.c $(HDRS) $(EXTRA_DEPS)
        $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 .PHONY: default
-default: prepare mini-os commonlibs rumprun app-tools tests buildtest
+default: prepare mini-os commonlibs rumprun app-tools buildtest
 
 .PHONY: prepare
 prepare:
@@ -115,18 +115,16 @@ APP_TOOLS_DIR= $(abspath ../../app-tools)
 
 include $(APP_TOOLS_DIR)/Makefile.app-tools
 
-# New demos each have their own Makefile under ../../tests/ and are built using
-# app-tools.
 .PHONY: tests
 tests:
-       $(APP_TOOLS_MAKE) -C ../../tests
+       RUMPRUN_PLATFORM=xen ../../tests/buildtests.sh
+       ../../tests/runtests.sh xen
 
 .PHONY: clean arch_clean app-tools_clean
 
 clean: app-tools_clean
        $(MAKE) -C xen OBJ_DIR=$(OBJ_DIR)/xen clean
        rm -f $(OBJ_DIR)/*.o $(OBJ_DIR)/lib/*.o buildtest
-       $(MAKE) -C ../../tests clean
        ( cd ${BASEDIR} && ${RUMPMAKE} MAKEOBJDIR=xen cleandir )
        ( cd ${COREDIR} && ${RUMPMAKE} MAKEOBJDIR=xen cleandir )
        ( cd ${RUMPUSERDIR} && ${RUMPMAKE} MAKEOBJDIR=xen cleandir )
@@ -136,3 +134,4 @@ cleanrump: clean
 
 distcleanrump: cleanrump
        rm -f config.mk
+       $(MAKE) -C ../../tests clean