Changeset 94971 in vbox

Timestamp:

May 9, 2022 5:32:49 PM (3 years ago)

Author:

vboxsync

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

151382

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) [build fix]. bugref:10195

File:

• trunk/src/VBox/Runtime/testcase/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -27 +27 @@
 SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
+
+ifdef VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING
+ # Include the Validation Kit configuration to make use of build templates needed for testcases to be included
+ # on the Validation Kit .ISO.
+ include $(PATH_ROOT)/src/VBox/ValidationKit/Config.kmk
+endif
 
 ifdef VBOX_WITH_TESTCASES
@@ -996 +1002 @@
   ## @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_TEMPLATE       := VBoxValidationKitR3TstExe
    $(unittest)_ValKit_SOURCES        += $$($(unittest)_SOURCES)
    $(unittest)_ValKit_SOURCES.x86    += $$($(unittest)_SOURCES.x86)