Changeset 94941 in vbox

Timestamp:

May 9, 2022 9:18:30 AM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/unit tests: Some more black box debugging wrt finding the Validation Kit unit tests. bugref:10195

File:

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

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -175 +175 @@
 $(foreach os, darwin freebsd linux os2 solaris win,$(foreach arch, x86 amd64, \
         $(eval VBOX_PATH_VALIDATIONKIT.$(os).$(arch) = $(PATH_OUT_BASE)/$(os).$(arch)/$(KBUILD_TYPE)/$(INST_VALIDATIONKIT)$(os)/$(arch)) \
+        $(eval VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch) = $(abspath $(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/../../testcase/$(os)/$(arch)/testcase)) \
 ))
 
@@ -341 +342 @@
   VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \
         $(foreach test_whitelist, $(TMP_UNITTESTS_WHITELIST), \
-        $(wildcard $(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/../../testcase/$(os)/$(arch)/$(test_whitelist)$(TMP_SUFF_EXE)))
+                $$(wildcard $(VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch))/$(test_whitelist)$(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)))
+                $$(wildcard $(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/$(file_dep)$(TMP_SUFF_LIB)))
 endef
 
@@ -409 +410 @@
 endif
 ifdef VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING
-        $(QUIET)$(ECHO) VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS $(VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS)
+        $(foreach os, darwin linux solaris win,$(foreach arch, x86 amd64, \
+                $(call MSG_L1, VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch): $(VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch))) \
+        ))
+        $(call MSG_L1, VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS $(VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS))
 endif
         $(VBOX_RTISOMAKER) \