Changeset 94585 in vbox for trunk

Timestamp:

Apr 13, 2022 10:35:01 AM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/unit tests: Use a dedicated build template for statically linked unit tests and output those in the validationkit/testcase directory. This leaves the regular (host, non-static) unit tests untouched. Might be optimized later to reduce the overall size of the built Validation Kit .ISO. bugref:10195

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Runtime/testcase/Makefile.kmk (modified) (1 diff)
• src/VBox/ValidationKit/Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -6701 +6701 @@
 #
 TEMPLATE_VBOXR3TSTEXE  = VBox Ring 3 Testcase Exe
-if defined(VBOX_ONLY_VALIDATIONKIT) && defined(VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING)
- #
- # Needs 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_EXTENDS = VBoxGuestR3Exe
-else
- TEMPLATE_VBOXR3TSTEXE_EXTENDS = VBOXR3EXE
- TEMPLATE_VBOXR3TSTEXE_LIBS    = $(LIB_RUNTIME) $(TEMPLATE_VBOXR3EXE_LIBS)
-endif
+TEMPLATE_VBOXR3TSTEXE_EXTENDS = VBOXR3EXE
+TEMPLATE_VBOXR3TSTEXE_LIBS    = $(LIB_RUNTIME) $(TEMPLATE_VBOXR3EXE_LIBS)
 TEMPLATE_VBOXR3TSTEXE_INST    = $(INST_TESTCASE)
 ifdef VBOX_WITH_RUNPATH
@@ -6728 +6719 @@
         $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.x86)_LIB)/oldnames.lib
 endif
+
+#
+# Ring-3 testcase for 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_VBOXR3TSTEXE_VALKIT = VBox Ring 3 Testcase Exe for Validation Kit .ISO
+TEMPLATE_VBOXR3TSTEXE_VALKIT_EXTENDS = VBoxR3Static
+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/Runtime/testcase/Makefile.kmk

@@ -970 +970 @@
         tstTimer \
         tstRTZip
- PROGRAMS := $(filter-out $(VBOX_VALIDATIONKIT_UNITTESTS_SKIP),$(PROGRAMS))
-
- VBOX_VALIDATIONKIT_UNITTESTS_SKIP.win=\
-    ntGetTimerResolution
- PROGRAMS.win := $(filter-out $(VBOX_VALIDATIONKIT_UNITTESTS_SKIP.win),$(PROGRAMS.win))
-endif # VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING
+
+ VBOX_VALIDATIONKIT_UNITTESTS_SKIP.win +=\
+        ntGetTimerResolution
+
+ VBOX_VALIDATIONKIT_UNITTESTS := $(filter-out $(VBOX_VALIDATIONKIT_UNITTESTS_SKIP),$(PROGRAMS))
+
+ ## @todo There might be a more elegant want of copying a target's stuff. Works for now.
+ define def_unittest_valkit
+  $(unittest)_ValKit_TEMPLATE       := VBOXR3TSTEXE_VALKIT
+  $(unittest)_ValKit_SOURCES        += $$($(unittest)_SOURCES)
+  $(unittest)_ValKit_SOURCES.x86    += $$($(unittest)_SOURCES.x86)
+  $(unittest)_ValKit_SOURCES.amd64  += $$($(unittest)_SOURCES.amd64)
+  $(unittest)_ValKit_INCS           += $$($(unittest)_INCS)
+  $(unittest)_ValKit_INTERMEDIATES  += $$($(unittest)_INTERMEDIATES)
+  $(unittest)_ValKit_CLEAN          += $$($(unittest)_CLEAN)
+  $(unittest)_ValKit_NAME           := $(unittest)
+  PROGRAMS += $(unittest)_ValKit
+ endef
+
+ $(foreach unittest, $(VBOX_VALIDATIONKIT_UNITTESTS), \
+        $(eval $(call def_unittest_valkit)))
+
+endif # defined(VBOX_ONLY_VALIDATIONKIT) && defined(VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING)
 
 endif # VBOX_WITH_TESTCASES

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -292 +292 @@
 
 #
-# If enabled, this includes the unit tests located in the $(PATH_OUT)/testcase directory.
+# If enabled, this includes specially built unit tests (statically linked, for guests) located
+# in the $(VBOX_PATH_VALIDATIONKIT)/../../testcase/ directory.
+#
 # This is useful if we want to run those on platforms where we don't have / support
 # any host support anymore (like Windows XP, for instance).
@@ -328 +330 @@
 
 #
-# Included needed dependencies like VBoxRT (VBoxVMM?).
+# Note: We do not include VBoxRT and stuff here, as this wouldn't work because
+#       of CRTs on old / ancient guest OSes. See @bugref:10195.
+#
 # Needs careful checking for each and every testcase being run.
 # Try to get and include what we have by using wildcards.
@@ -334 +338 @@
 ## @todo Also include R0 and hardening stuff?
 #
-TMP_UNITTESTS_DEPS_LIB := \
-        VBoxRT
+TMP_UNITTESTS_DEPS_LIB :=
 
 define def_vbox_validationkit_unittests
-  TMP_UNITTESTS_PATH_BIN = $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/../../../bin
+  TMP_UNITTESTS_PATH_BIN = $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/../..
   VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \
         $(foreach test_whitelist, $(TMP_UNITTESTS_WHITELIST), \