Changeset 94467 in vbox for trunk/src/VBox/Runtime

Timestamp:

Apr 5, 2022 12:38:44 PM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/unit tests: More Makefile fun for IPRT and friends. Probably needs more optimization later when things turn to work out to keep build time low. ​bugref:10195

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• testcase/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -56 +56 @@
  LIBRARIES.win.x86 += RuntimeR3VccTricks
  include $(PATH_SUB_CURRENT)/tools/Makefile.kmk
- if defined(VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING) && "$(KBUILD_TARGET)" != "os2" ## breaks validationkit, figure out later.
+ if defined(VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING)
+  DLLS += VBoxRT
   include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
  endif

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

@@ -185 +185 @@
         tstRTS3
 endif
-ifdef VBOX_WITH_R0_MODULES
+if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_ONLY_VALIDATIONKIT) # Not needed for the Validation Kit (yet).
  PROGRAMS += \
         tstLdr-2 \
@@ -200 +200 @@
         tstRTR0ThreadDriverHardened
   DLLS     += \
-        tstRTR0MemUserKernelDriver \
+        tstRTR0MemUserKernelDriver \
         tstRTR0SemMutexDriver \
         tstRTR0TimerDriver \
@@ -207 +207 @@
  else
   PROGRAMS += \
-        tstRTR0MemUserKernelDriver \
+        tstRTR0MemUserKernelDriver \
         tstRTR0SemMutexDriver \
         tstRTR0TimerDriver \
@@ -936 +936 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
-