Changeset 96246 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Aug 17, 2022 8:53:53 AM (2 years ago)

Author:

vboxsync

Message:

IPRT,ValKit: Moved the whitelist to ValKit/Config.kmk so the IPRT testcase Makefile.kmk can use it to only build the necessary testcases and not waste time building anything irrelevant. Stripped down the stuff a bit too. bugref:10195

Location:

trunk/src/VBox/ValidationKit

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/ValidationKit/Config.kmk

@@ -239 +239 @@
 endef
 endif
+
+
+#
+# List of IPRT testcases that will be included in the ValKit.
+#
+ifdef VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING
+ VALKIT_UNITTESTS_WHITELIST_IPRT := \
+        tstFile \
+        tstFileLock \
+        tstRTPathQueryInfo \
+        tstRTPipe \
+        tstRTProcCreateEx \
+        tstRTProcCreatePrf \
+        tstRTProcQueryUsername \
+        tstThread-1 \
+        tstUtf8
+
+ VALKIT_UNITTESTS_WHITELIST_IPRT.linux += \
+        tstRTProcWait \
+        tstRTProcIsRunningByName
+
+ VALKIT_UNITTESTS_WHITELIST_IPRT.win += \
+        tstRTProcWait
+
+endif # VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING
+

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -308 +308 @@
 #
 ifdef VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING
-
-# Only include testcases being on the whitelist.
-VALKIT_UNITTESTS_WHITELIST_IPRT := \
-        tstFile \
-        tstFileLock \
-        tstRTPathQueryInfo \
-        tstRTPipe \
-        tstRTProcCreateEx \
-        tstRTProcCreatePrf \
-        tstRTProcQueryUsername \
-        tstThread-1 \
-        tstUtf8
-
-VALKIT_UNITTESTS_WHITELIST_IPRT.linux += \
-        tstRTProcWait \
-        tstRTProcIsRunningByName
-
-VALKIT_UNITTESTS_WHITELIST_IPRT.win += \
-        tstRTProcWait
-
-#
-# 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.
-#
-## @todo Also include R0 and hardening stuff?
-#
-TMP_UNITTESTS_DEPS_LIB :=
-
-define def_vbox_validationkit_unittests
+ define def_vbox_validationkit_unittests
   VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \
-        $(foreach whitelisted, $(VALKIT_UNITTESTS_WHITELIST_IPRT) $(VALKIT_UNITTESTS_WHITELIST_IPRT).$(os), \
+        $(foreach whitelisted, $(VALKIT_UNITTESTS_WHITELIST_IPRT) $(VALKIT_UNITTESTS_WHITELIST_IPRT.$(os)), \
                 $$(wildcard $(VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch))/$(whitelisted)$(TMP_SUFF_EXE)))
-  VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \
-        $(foreach file_dep, $(TMP_UNITTESTS_DEPS_LIB), \
-                $$(wildcard $(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/$(file_dep)$(TMP_SUFF_LIB)))
-endef
-
-TMP_SUFF_EXE=.exe
-TMP_SUFF_LIB=.dll
-$(foreach os, win,$(foreach arch, x86 amd64, \
-        $(eval $(def_vbox_validationkit_unittests)) \
-))
-TMP_SUFF_EXE=
-TMP_SUFF_LIB=.so
-$(foreach os, freebsd linux solaris,$(foreach arch, x86 amd64, \
-        $(eval $(def_vbox_validationkit_unittests)) \
-))
-TMP_SUFF_EXE=
-TMP_SUFF_LIB=.dylib
-$(foreach os, darwin,$(foreach arch, amd64, \
-        $(eval $(def_vbox_validationkit_unittests)) \
-))
+ endef
+
+ TMP_SUFF_EXE=.exe
+ $(foreach os, win,$(foreach arch, x86 amd64, \
+        $(eval $(def_vbox_validationkit_unittests)) \
+ ))
+ TMP_SUFF_EXE=
+ $(foreach os, darwin freebsd linux solaris,$(foreach arch, x86 amd64, \
+        $(eval $(def_vbox_validationkit_unittests)) \
+ ))
+
 endif # VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING