Changeset 94968 in vbox

Timestamp:

May 9, 2022 5:01:28 PM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/unit tests: Cleaned up build templates by moving the Validation Kit-specific ones to ValidationKit/Config.kmk + derive TEMPLATE_VBoxValidationKitR3TstExe from VBoxValidationKitR3, as loader trickery is also needed here for older guests (XP and friends). bugref:10195

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/ValidationKit/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -6736 +6736 @@
 
 #
-# Base template for Validation Kit R3 programs that drops the -static flag since we only want to use the
-# static version of our own libraries and not the system libs.
-#
-# Note: In main Config.kmk, as this is needed by VBOXR3TSTEXE_VALKIT below.
-#
-TEMPLATE_VBOXVALIDATIONKITR3BASE = VBox Validation Kit ring-3 program base, both guest and host.
-TEMPLATE_VBOXVALIDATIONKITR3BASE_EXTENDS = VBoxR3Static
-ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_VBOXVALIDATIONKITR3BASE_LDFLAGS         = $(filter-out -IntegrityCheck, $(TEMPLATE_VBoxR3Static_LDFLAGS))
-else ifn1of ($(KBUILD_TARGET), darwin solaris win)
- TEMPLATE_VBOXVALIDATIONKITR3BASE_CFLAGS          = $(filter-out -static, $(TEMPLATE_VBoxR3Static_CFLAGS))
- TEMPLATE_VBOXVALIDATIONKITR3BASE_CXXFLAGS        = $(filter-out -static, $(TEMPLATE_VBoxR3Static_CXXFLAGS))
- TEMPLATE_VBOXVALIDATIONKITR3BASE_OBJCFLAGS       = $(filter-out -static, $(TEMPLATE_VBoxR3Static_OBJCFLAGS))
- TEMPLATE_VBOXVALIDATIONKITR3BASE_LDFLAGS         = $(filter-out -static, $(TEMPLATE_VBoxR3Static_LDFLAGS))
-endif
-TEMPLATE_VBOXVALIDATIONKITR3BASE_DEFS = $(filter-out VBOX_WITH_DTRACE,$(TEMPLATE_VBoxR3Static_DEFS))
-TEMPLATE_VBOXVALIDATIONKITR3BASE_LIBS = $(TEMPLATE_VBoxR3Static_LIBS)
-if1of ($(KBUILD_TARGET), linux)
- if $(VBOX_GCC_VERSION_CXX) < 40800
-  TEMPLATE_VBOXVALIDATIONKITR3BASE_LIBS += supc++
-  TEMPLATE_VBOXVALIDATIONKITR3BASE_LDTOOL = $(subst GXX,GCC,$(TEMPLATE_VBoxR3Static_TOOL))
- endif
-endif
-TEMPLATE_VBOXVALIDATIONKITR3BASE_LDFLAGS.darwin = $(TEMPLATE_VBoxR3Static_LDFLAGS.darwin) -framework IOKit
-
-
-#
-# Template for ring-3 testcase for the Validation Kit .ISO.
-#
-# Note: In main Config.kmk, as this also is needed by the IPRT testcases, which are part of the Validation Kit .ISO testcases.
-#
-# Needed for running the ring-3 testcases on older guests (like NT4 / XP).
-# Those testcases then run as part of the Validation Kit and are included on the Validation Kit .ISO.
-# See @bugref:10195.
-#
-TEMPLATE_VBOXR3TSTEXE_VALKIT         = VBox Ring 3 Testcase Exe for Validation Kit .ISO
-TEMPLATE_VBOXR3TSTEXE_VALKIT_EXTENDS = VBOXVALIDATIONKITR3BASE
-TEMPLATE_VBOXR3TSTEXE_VALKIT_INST    = $(INST_VALIDATIONKIT)/testcase/$(KBUILD_TARGET)/$(KBUILD_TARGET_ARCH)/testcase/
-
-
-
-#
 # Ring-3 testcase (no -pedantic)
 #

trunk/src/VBox/ValidationKit/Config.kmk

@@ -36 +36 @@
 #
 VBOX_PATH_VALIDATIONKIT_SRC := $(PATH_ROOT)/src/VBox/ValidationKit
+
+
+#
+# Base template for Validation Kit R3 programs that drops the -static flag since we only want to use the
+# static version of our own libraries and not the system libs.
+#
+#
+TEMPLATE_VBOXVALIDATIONKITR3BASE = VBox Validation Kit ring-3 program base, both guest and host.
+TEMPLATE_VBOXVALIDATIONKITR3BASE_EXTENDS = VBoxR3Static
+ifeq ($(KBUILD_TARGET),win)
+ TEMPLATE_VBOXVALIDATIONKITR3BASE_LDFLAGS         = $(filter-out -IntegrityCheck, $(TEMPLATE_VBoxR3Static_LDFLAGS))
+else ifn1of ($(KBUILD_TARGET), darwin solaris win)
+ TEMPLATE_VBOXVALIDATIONKITR3BASE_CFLAGS          = $(filter-out -static, $(TEMPLATE_VBoxR3Static_CFLAGS))
+ TEMPLATE_VBOXVALIDATIONKITR3BASE_CXXFLAGS        = $(filter-out -static, $(TEMPLATE_VBoxR3Static_CXXFLAGS))
+ TEMPLATE_VBOXVALIDATIONKITR3BASE_OBJCFLAGS       = $(filter-out -static, $(TEMPLATE_VBoxR3Static_OBJCFLAGS))
+ TEMPLATE_VBOXVALIDATIONKITR3BASE_LDFLAGS         = $(filter-out -static, $(TEMPLATE_VBoxR3Static_LDFLAGS))
+endif
+TEMPLATE_VBOXVALIDATIONKITR3BASE_DEFS = $(filter-out VBOX_WITH_DTRACE,$(TEMPLATE_VBoxR3Static_DEFS))
+TEMPLATE_VBOXVALIDATIONKITR3BASE_LIBS = $(TEMPLATE_VBoxR3Static_LIBS)
+if1of ($(KBUILD_TARGET), linux)
+ if $(VBOX_GCC_VERSION_CXX) < 40800
+  TEMPLATE_VBOXVALIDATIONKITR3BASE_LIBS += supc++
+  TEMPLATE_VBOXVALIDATIONKITR3BASE_LDTOOL = $(subst GXX,GCC,$(TEMPLATE_VBoxR3Static_TOOL))
+ endif
+endif
+TEMPLATE_VBOXVALIDATIONKITR3BASE_LDFLAGS.darwin = $(TEMPLATE_VBoxR3Static_LDFLAGS.darwin) -framework IOKit
 
 
@@ -90 +116 @@
 
 #
+# Template for ring-3 testcases to be included on the Validation Kit .ISO.
+#
+# Needed for running the ring-3 testcases on older guests (like NT4 / XP).
+# Those testcases then run as part of the Validation Kit and are included on the Validation Kit .ISO.
+# See @bugref:10195.
+#
+TEMPLATE_VBoxValidationKitR3TstExe         = VBox Ring 3 Testcase Exe for Validation Kit .ISO
+TEMPLATE_VBoxValidationKitR3TstExe_EXTENDS = VBoxValidationKitR3
+TEMPLATE_VBoxValidationKitR3TstExe_INST    = $(INST_VALIDATIONKIT)/testcase/$(KBUILD_TARGET)/$(KBUILD_TARGET_ARCH)/testcase/
+
+
+#
 # Template for building ring-3 programs for the Validation Kit.
 # When these programs run on the host they may take advantage of the