Changeset 94574 in vbox for trunk

Timestamp:

Apr 12, 2022 5:13:39 PM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/unit tests: Use the VBoxGuestR3Exe template for building static versions of the unit tests included on the Validation Kit .ISO (and skip those which currently don't build yet). ​bugref:10195

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -6701 +6701 @@
 #
 TEMPLATE_VBOXR3TSTEXE  = VBox Ring 3 Testcase Exe
-TEMPLATE_VBOXR3TSTEXE_EXTENDS = VBOXR3EXE
+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_INST    = $(INST_TESTCASE)
-TEMPLATE_VBOXR3TSTEXE_LIBS    = $(LIB_RUNTIME) $(TEMPLATE_VBOXR3EXE_LIBS)
 ifdef VBOX_WITH_RUNPATH
  TEMPLATE_VBOXR3TSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_VBOXR3EXE_LDFLAGS)

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

@@ -80 +80 @@
         tstRTHeapOffset \
         tstRTHeapSimple \
+        tstRTInlineAsm \
         tstIprtList \
         tstIprtMiniString \
@@ -89 +90 @@
         tstRTLockValidator \
         tstLog \
+        tstRTMath \
         tstRTMemEf \
         tstRTMemCache \
@@ -154 +156 @@
         tstVector \
         tstRTVfs \
-        tstRTZip \
         tstRTJson \
         tstRTShMem
@@ -169 +170 @@
         tstRTProcWait \
         tstRTProcIsRunningByName \
-        tstRTBitOperationsPIC3
+        tstRTBitOperationsPIC3 \
+        tstRTInlineAsmPIC \
+        tstRTInlineAsmPIC3
 PROGRAMS.solaris += \
         tstRTCoreDump
@@ -180 +183 @@
         tstRTCRest-1 \
         tstRTS3
-endif
-ifndef VBOX_ONLY_VALIDATIONKIT
- # Stuff which does not build yet with the Validation Kit unit tests enabled. Skip those for now.
- PROGRAMS += \
-        tstRTInlineAsm \
-        tstRTMath
- PROGRAMS.linux += \
-        tstRTInlineAsmPIC \
-        tstRTInlineAsmPIC3
 endif
 
@@ -939 +933 @@
 ntGetTimerResolution_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
 
+#
+# Filter out testcases which don't yet work when statically linked as Guest Additions R3 programs.
+#
+# We currently do this for running those via the Validation Kit on old / ancient guests. 
+# Note that we not necessarily run all unit tests available (white list).
+#
+# See @bugref:10195.
+#
+if defined(VBOX_ONLY_VALIDATIONKIT) && defined(VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING)
+ VBOX_VALIDATIONKIT_UNITTESTS_SKIP=\
+        tstIprtList \
+        tstIprtMiniString \
+        tstLdr \
+        tstLdrLoad \
+        tstRTBigNum \
+    tstRTCRest-1 \
+        tstRTCrPkix-1 \
+        tstRTCrX509-1 \
+    tstRTS3 \
+    tstRTHttp-1 \
+        tstRTLdrVerifyPeImage \
+        tstRTMemSafer \
+        tstRTMp-1 \
+        tstRTNtPath-1 \
+        tstRTSemEvent \
+        tstRTSemEventMulti \
+        tstRTSystemQueryDmi \
+        tstRTSystemQueryFirmware \
+        tstRTSystemQueryOsInfo \
+        tstRTTime \
+        tstRTTimerLR \
+        tstTime-2 \
+        tstTime-3 \
+        tstTime-4 \
+        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
+
 endif # VBOX_WITH_TESTCASES