From 953953cc5aaf59876521db5f60c010615941c0c7 Mon Sep 17 00:00:00 2001 From: Andres Lagar-Cavilla Date: Mon, 6 Feb 2012 13:12:58 -0800 Subject: [PATCH] Tools: build tests Build tests as part of the tools build. It is enabled with CONFIG_TESTS in Config.mk Currently disabled build of tests/regressions and tests/xen-access (in 32-bit mode) as they fail. Signed-off-by: Andres Lagar-Cavilla Acked-by: Ian Campbell Committed-by: Keir Fraser --- Config.mk | 1 + tools/Makefile | 1 + tools/tests/Makefile | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 tools/tests/Makefile diff --git a/Config.mk b/Config.mk index d55530d68d..1bbea43588 100644 --- a/Config.mk +++ b/Config.mk @@ -243,6 +243,7 @@ OCAML_TOOLS ?= y CONFIG_MINITERM ?= n CONFIG_LOMOUNT ?= n CONFIG_SYSTEM_LIBAIO ?= y +CONFIG_TESTS ?= y ifeq ($(OCAML_TOOLS),y) OCAML_TOOLS := $(shell ocamlopt -v > /dev/null 2>&1 && echo "y" || echo "n") diff --git a/tools/Makefile b/tools/Makefile index 03ac66f855..54522f44f2 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -45,6 +45,7 @@ SUBDIRS-y += remus SUBDIRS-$(CONFIG_X86) += xenpaging SUBDIRS-$(CONFIG_X86) += debugger/gdbsx SUBDIRS-$(CONFIG_X86) += debugger/kdd +SUBDIRS-$(CONFIG_TESTS) += tests # These don't cross-compile ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH)) diff --git a/tools/tests/Makefile b/tools/tests/Makefile new file mode 100644 index 0000000000..f4f1169229 --- /dev/null +++ b/tools/tests/Makefile @@ -0,0 +1,21 @@ +XEN_ROOT = $(CURDIR)/../.. +include $(XEN_ROOT)/tools/Rules.mk + +CFLAGS += $(CFLAGS_libxenctrl) +LDLIBS += $(LDLIBS_libxenctrl) + +SUBDIRS-y := +SUBDIRS-y += mce-test +SUBDIRS-y += mem-sharing +ifeq ($(XEN_TARGET_ARCH),__fixme__) +SUBDIRS-y += regression +endif +SUBDIRS-y += x86_emulator +ifneq ($(XEN_TARGET_ARCH),x86_32) +SUBDIRS-y += xen-access +endif + +.PHONY: all clean install distclean +all clean distclean: %: subdirs-% + +install: -- 2.30.2