Changeset 94861 in vbox

Timestamp:

May 5, 2022 5:08:34 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151261

Message:

Validation Kit: Moved TEMPLATE_VBOXVALIDATIONKITR3BASE to main Config.kmk and derive TEMPLATE_VBOXR3TSTEXE_VALKIT from it instead of TEMPLATE_VBoxR3Static. That way it's easier to maintain and not forgotten when we need to do more widespread changes (e.g. see r151253). bugref:​10195

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -6728 +6728 @@
 endif
 
-#
-# Ring-3 testcase for the Validation Kit .ISO.
+
+#
+# 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).
@@ -6735 +6765 @@
 # See @bugref:10195.
 #
-TEMPLATE_VBOXR3TSTEXE_VALKIT = VBox Ring 3 Testcase Exe for Validation Kit .ISO
-TEMPLATE_VBOXR3TSTEXE_VALKIT_EXTENDS = VBoxR3Static
+TEMPLATE_VBOXR3TSTEXE_VALKIT         = VBox Ring 3 Testcase Exe for Validation Kit .ISO
+TEMPLATE_VBOXR3TSTEXE_VALKIT_EXTENDS = VBOXVALIDATIONKITR3BASE
 TEMPLATE_VBOXR3TSTEXE_VALKIT_INST    =  $(INST_VALIDATIONKIT)/testcase/
-ifn1of ($(KBUILD_TARGET), darwin solaris win)
- TEMPLATE_VBOXR3TSTEXE_VALKIT_CFLAGS          = $(filter-out -static, $(TEMPLATE_VBoxR3Static_CFLAGS))
- TEMPLATE_VBOXR3TSTEXE_VALKIT_CXXFLAGS        = $(filter-out -static, $(TEMPLATE_VBoxR3Static_CXXFLAGS))
- TEMPLATE_VBOXR3TSTEXE_VALKIT_OBJCFLAGS       = $(filter-out -static, $(TEMPLATE_VBoxR3Static_OBJCFLAGS))
- TEMPLATE_VBOXR3TSTEXE_VALKIT_LDFLAGS         = $(filter-out -static, $(TEMPLATE_VBoxR3Static_LDFLAGS))
-endif
-TEMPLATE_VBOXR3TSTEXE_VALKIT_DEFS = $(filter-out VBOX_WITH_DTRACE,$(TEMPLATE_VBoxR3Static_DEFS))
-TEMPLATE_VBOXR3TSTEXE_VALKIT_LIBS = $(TEMPLATE_VBoxR3Static_LIBS)
-if1of ($(KBUILD_TARGET), linux)
- if $(VBOX_GCC_VERSION_CXX) < 40800
-  TEMPLATE_VBOXR3TSTEXE_VALKIT_LIBS += supc++
-  TEMPLATE_VBOXR3TSTEXE_VALKIT_LDTOOL = $(subst GXX,GCC,$(TEMPLATE_VBoxR3Static_TOOL))
- endif
-endif
-TEMPLATE_VBOXR3TSTEXE_VALKIT_LDFLAGS.darwin = $(TEMPLATE_VBoxR3Static_LDFLAGS.darwin) -framework IOKit
+
 
 #

trunk/src/VBox/ValidationKit/Config.kmk

@@ -39 +39 @@
 
 #
-# Base template 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
-
-#
-# Template for building ring-3 progams for the Validation Kit.
+# Template for building ring-3 programs for the Validation Kit.
 # These programs can run on any host or guest.
 #
 TEMPLATE_VBoxValidationKitR3 = VBox Validation Kit ring-3 program, both guest and host.
-TEMPLATE_VBoxValidationKitR3_EXTENDS = VBoxValidationKitR3Base
+TEMPLATE_VBoxValidationKitR3_EXTENDS = VBOXVALIDATIONKITR3BASE
 TEMPLATE_VBoxValidationKitR3_EXTENDS_BY = appending
 TEMPLATE_VBoxValidationKitR3_INST = $(INST_VALIDATIONKIT)$(KBUILD_TARGET)/$(KBUILD_TARGET_ARCH)/
@@ -102 +78 @@
         -Section:.bss,RW!K
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
- TEMPLATE_VBoxValidationKitR3_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out)$$(NLTAB))$(TEMPLATE_VBoxValidationKitR3Base_POST_CMDS)$$(NLTAB)
+ TEMPLATE_VBoxValidationKitR3_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out)$$(NLTAB))$(TEMPLATE_VBOXVALIDATIONKITR3BASE_POST_CMDS)$$(NLTAB)
 endif
 TEMPLATE_VBoxValidationKitR3_LNK_DEPS.win.x86  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION))
@@ -225 +201 @@
 endef
 endif
-