Skip to contentSkip to conversation

Config.mk: remove CONFIG_TESTS

PATCH In review Wei Liu 2 participants 3 messages Mar 27, 2018 – Mar 28, 2018

lore
Share & tools
lore

Wei Liu

author
#0 lore raw

PATCH 1/1 Config.mk: remove CONFIG_TESTS

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.

---
 Config.mk            | 5 -----
 tools/Makefile       | 2 +-
 tools/ocaml/Makefile | 3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)
Config.mk +0 -5
index b5ca57ce90..aa3805cbc8 100644
@@ -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
tools/Makefile +1 -1
index ab7a01ee1b..34771005db 100644
@@ -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))
tools/ocaml/Makefile +0 -3
index 66f2d6b131..6a4fb9eea3 100644
@@ -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
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#1 lore raw

Config.mk QEMU_TRADITIONAL_LOC ?= $(call or,$(wildcard $(QEMU_TRADITIONAL_INTREE)),\ · line 308

Quoted 12 lines
Quoted 1 line
Quoted 1 line

Wei Liu <[email protected]> 03/27/18 8:52 PM >>>

Config.mk +0 -5
@@ -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
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

author
#2 lore raw
Quoted 5 lines · Jan Beulich
Quoted 5 lines
Quoted 1 line
Quoted 1 line

Wei Liu <[email protected]> 03/27/18 8:52 PM >>>

Config.mk +0 -0
@@ -301,8 +301,3 @@ QEMU_TRADITIONAL_LOC ?= $(call or,$(wildcard $(QEMU_TRADITIONAL_INTREE)),\
 
Quoted 12 lines

Config.mk QEMU_TRADITIONAL_LOC ?= $(call or,$(wildcard $(QEMU_TRADITIONAL_INTREE)),\ · line 308

Quoted 7 lines
Config.mk +0 -5
 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
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel