Changeset 94467 in vbox

Timestamp:

Apr 5, 2022 12:38:44 PM (2 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

Files:

• VBox/Runtime/Makefile.kmk (modified) (1 diff)
• VBox/Runtime/testcase/Makefile.kmk (modified) (4 diffs)
• libs/Makefile.kmk (modified) (2 diffs)
• libs/libxml2-2.9.4/Makefile.kmk (modified) (2 diffs)
• libs/openssl-1.1.1l/crypto/Makefile.kmk (modified) (2 diffs)
• libs/openssl-3.0.2/crypto/Makefile.kmk (modified) (3 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)
-

trunk/src/libs/Makefile.kmk

@@ -48 +48 @@
  && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) \
  && !defined(VBOX_ONLY_SDK) \
- && !defined(VBOX_ONLY_VALIDATIONKIT) \
+ && !defined(VBOX_ONLY_VALIDATIONKIT) || defined(VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING) \
  && "$(SDK_VBOX_LIBCURL_INCS)" == "$(PATH_ROOT)/src/libs/curl-7.64.0/include"
  include $(PATH_SUB_CURRENT)/curl-7.64.0/Makefile.kmk
@@ -124 +124 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
-

trunk/src/libs/libxml2-2.9.4/Makefile.kmk

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-ifndef VBOX_ONLY_VALIDATIONKIT
+if !defined(VBOX_ONLY_VALIDATIONKIT) || defined(VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING) # Needed for VBoxRT for Validation Kit unit tests.
  LIBRARIES += VBox-libxml2
 endif
@@ -104 +104 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
-

trunk/src/libs/openssl-1.1.1l/crypto/Makefile.kmk

@@ -21 +21 @@
 #
 VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS := $(LIBRARIES)
-if defined(VBOX_ONLY_VALIDATIONKIT)
+if defined(VBOX_ONLY_VALIDATIONKIT) && !defined(VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING)
  include $(VBOX_PATH_CRYPTO)/sha/Makefile.kmk
 else
@@ -159 +159 @@
         $(QUIET)$(APPEND) $@ '  "$(VBox-libcrypto_CFLAGS)";'
         $(QUIET)$(APPEND) $@ '#endif'
-

trunk/src/libs/openssl-3.0.2/crypto/Makefile.kmk

@@ -26 +26 @@
 #
 VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS := $(LIBRARIES)
-if defined(VBOX_ONLY_VALIDATIONKIT)
+if defined(VBOX_ONLY_VALIDATIONKIT) && !defined(VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING)
  include $(VBOX_PATH_CRYPTO)/sha/Makefile.kmk
-else
+else # Validation Kit unit tests need this.
  include $(sort $(wildcard $(VBOX_PATH_CRYPTO)/*/Makefile.kmk))
 endif
@@ -128 +128 @@
 
 
-ifdef VBOX_NEED_EXTPACK_OPENSSL
+if defined(VBOX_NEED_EXTPACK_OPENSSL) && !defined(VBOX_ONLY_VALIDATIONKIT) # Not needed for Validation Kit.
 #
 # The extension pack libcrypto.
@@ -192 +192 @@
         $(QUIET)$(APPEND) $@ '  "$(VBox-libcrypto_CFLAGS)";'
         $(QUIET)$(APPEND) $@ '#endif'
-