Changeset 94430 in vbox

Timestamp:

Apr 1, 2022 10:09:35 AM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/unit tests: Don't use wildcards anymore when including the unit tests. ​​bugref:10195

File:

• trunk/src/VBox/ValidationKit/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -301 +301 @@
 ifdef VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING
 
-# Only include testcases being on the whitelist. Wilcard (*) implicit.
+# Only include testcases being on the whitelist.
 TMP_UNITTESTS_WHITELIST := \
         tstFile \
@@ -318 +318 @@
         tstTimer \
         tstThread-1 \
-        tstUtf
+        tstUtf8
 
 #
 # Included needed dependencies like VBoxRT (VBoxVMM?).
 # 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?
@@ -331 +330 @@
 
 define def_vbox_validationkit_unittests
-  TMP_UNITTESTS_PATH_BIN                 = $(PATH_OUT_BASE)/$(os).$(arch)/$(KBUILD_TYPE)/bin
-  VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \
+  ifdef VBOX_WITH_VALIDATIONKIT_PACKING.$(os).$(arch)
+   TMP_UNITTESTS_PATH_BIN                 = $(PATH_OUT_BASE)/$(os).$(arch)/$(KBUILD_TYPE)/bin
+   VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \
         $(foreach test_whitelist, $(TMP_UNITTESTS_WHITELIST), \
-        $$(wildcard $(TMP_UNITTESTS_PATH_BIN)/testcase/$(test_whitelist)$(TMP_SUFF_EXE)))
-  VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \
+        $$(TMP_UNITTESTS_PATH_BIN)/testcase/$(test_whitelist)$(TMP_SUFF_EXE))
+   VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \
         $(foreach file_dep, $(TMP_UNITTESTS_DEPS_LIB), \
-        $$(wildcard $(TMP_UNITTESTS_PATH_BIN)/$(file_dep)$(TMP_SUFF_LIB)))
+        $$(TMP_UNITTESTS_PATH_BIN)/$(file_dep)$(TMP_SUFF_LIB))
+ endif
 endef