[PATCH] Config.mk: remove CONFIG_TESTS

[PATCH] Config.mk: remove CONFIG_TESTS

[Wei Liu]

It only controls whether two "tests" directories are built or not, but
doesn't actually run any test.

Remove it and always build the tests.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 Config.mk            | 5 -----
 tools/Makefile       | 2 +-
 tools/ocaml/Makefile | 3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Config.mk b/Config.mk
index b5ca57ce90..aa3805cbc8 100644
--- a/Config.mk
+++ b/Config.mk
@@ -301,8 +301,3 @@ QEMU_TRADITIONAL_LOC ?= $(call or,$(wildcard $(QEMU_TRADITIONAL_INTREE)),\
 
 QEMU_UPSTREAM_LOC ?= $(call or,$(wildcard $(QEMU_UPSTREAM_INTREE)),\
                                $(QEMU_UPSTREAM_URL))
-
-# Short answer -- do not enable this unless you know what you are
-# doing and are prepared for some pain.
-
-CONFIG_TESTS       ?= y
diff --git a/tools/Makefile b/tools/Makefile
index ab7a01ee1b..34771005db 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -39,7 +39,7 @@ SUBDIRS-y += helpers
 SUBDIRS-$(CONFIG_X86) += xenpaging
 SUBDIRS-$(CONFIG_X86) += debugger/gdbsx
 SUBDIRS-$(CONFIG_X86) += debugger/kdd
-SUBDIRS-$(CONFIG_TESTS) += tests
+SUBDIRS-y += tests
 
 # These don't cross-compile
 ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
diff --git a/tools/ocaml/Makefile b/tools/ocaml/Makefile
index 66f2d6b131..6a4fb9eea3 100644
--- a/tools/ocaml/Makefile
+++ b/tools/ocaml/Makefile
@@ -3,10 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS := libs
 SUBDIRS += xenstored
-
-ifeq ($(CONFIG_TESTS),y)
 SUBDIRS += test
-endif
 
 .NOTPARALLEL:
 # targets here must be run in order, otherwise we can try
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] Config.mk: remove CONFIG_TESTS

[Jan Beulich]

>>> Wei Liu <wei.liu2@citrix.com> 03/27/18 8:52 PM >>>
>--- a/Config.mk
>+++ b/Config.mk
>@@ -301,8 +301,3 @@ QEMU_TRADITIONAL_LOC ?= $(call or,$(wildcard $(QEMU_TRADITIONAL_INTREE)),\
 >
>QEMU_UPSTREAM_LOC ?= $(call or,$(wildcard $(QEMU_UPSTREAM_INTREE)),\
>$(QEMU_UPSTREAM_URL))
>-
>-# Short answer -- do not enable this unless you know what you are
>-# doing and are prepared for some pain.
>-
>-CONFIG_TESTS       ?= y

On one hand this suggests that tests were built already anyway, unless
someone changed that line locally (and other than what the comment
suggests). Otoh I know that the x86 emulator test didn't get built by
default so far. This needs to remain that way, as a far newer gcc than
what we document is required to successfully build this subdir. Can you
confirm this to be the case with your change, as I can't derive how its
building is avoided (as said, with or without your change)?

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] Config.mk: remove CONFIG_TESTS

[Wei Liu]

On Wed, Mar 28, 2018 at 12:02:11AM -0600, Jan Beulich wrote:
> >>> Wei Liu <wei.liu2@citrix.com> 03/27/18 8:52 PM >>>
> >--- a/Config.mk
> >+++ b/Config.mk
> >@@ -301,8 +301,3 @@ QEMU_TRADITIONAL_LOC ?= $(call or,$(wildcard $(QEMU_TRADITIONAL_INTREE)),\
>  >
> >QEMU_UPSTREAM_LOC ?= $(call or,$(wildcard $(QEMU_UPSTREAM_INTREE)),\
> >$(QEMU_UPSTREAM_URL))
> >-
> >-# Short answer -- do not enable this unless you know what you are
> >-# doing and are prepared for some pain.
> >-
> >-CONFIG_TESTS       ?= y
> 
> On one hand this suggests that tests were built already anyway, unless
> someone changed that line locally (and other than what the comment
> suggests). Otoh I know that the x86 emulator test didn't get built by
> default so far.

Hmm... I thought x86 emulator was gated by CONFIG_TESTS and then
CONFIG_X86, which meant it always was built. But in fact it isn't the
case. Let me check why it is like that.

Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel