Changeset 93882 in vbox for trunk

Timestamp:

Feb 22, 2022 9:48:43 AM (3 years ago)

Author:

vboxsync

Message:

Validation Kit: Include unit tests (testcases) on the Validation Kit .ISO if VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING is set. bugref:10195

File:

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

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -285 +285 @@
 endif
 
+# If enabled, this includes the unit tests located in the out/testcase directory.
+# This is useful if we want to run those on platforms where we don't have / support
+# any host support anymore (like Windows XP, for instance).
+#
+# Note that executing the tests require an additional component (tdUnitTest test driver)
+# which runs as part of the Validation Kit.
+#
+# See @bugref{10195}
+ifdef VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING
+ define def_vbox_validationkit_unittests
+  VBOX_VALIDATIONKIT_PATH_UNITTESTS:=$(PATH_OUT_BASE)/$(os).$(arch)/$(KBUILD_TYPE)/bin
+  VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += $$(wildcard $(VBOX_VALIDATIONKIT_PATH_UNITTESTS)/testcase/tst*$(TMP_SUFF_EXE))
+ 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
 
 #
@@ -299 +322 @@
         $(QUIET)$(ECHO) VBOX_VALIDATIONKIT_FILESPEC $(VBOX_VALIDATIONKIT_FILESPEC)
 endif
+        $(QUIET)$(ECHO) VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS $(VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS)
         $(VBOX_RTISOMAKER) \
                 --output $@ \
@@ -305 +329 @@
                 --joliet \
                 --rational-attribs \
-               --random-order-verification 2048 \
+                --random-order-verification 2048 \
                 $(foreach spec,$(VBOX_VALIDATIONKIT_FILESPEC) \
                         ,$(if $(findstring =,$(spec)), $(spec), /$(lastword $(subst /$(INST_VALIDATIONKIT), ,$(spec))=$(spec))) ) \
+                $(foreach spec,$(VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS) \
+                        ,$(if $(findstring =,$(spec)), $(spec), /$(lastword $(subst $(PATH_OUT_BASE), testcase,$(spec))=$(spec))) ) \
                 $(foreach spec,$(filter-out %.txt %.dll %.xml %.reg %.img, $(VBOX_VALIDATIONKIT_FILESPEC)) \
                         ,--chmod=a+x:/$(lastword $(if $(findstring =,$(spec)), \
@@ -313 +339 @@
                                                    $(subst /$(INST_VALIDATIONKIT), ,$(spec))))) \
                 --volume-id "VBOXVALK_$(VBOX_SVN_REV)_$(VBOX_VERSION_STRING_RAW)" \
-               --name-setup joliet \
+                --name-setup joliet \
                 --volume-id "VBoxValK $(VBOX_SVN_REV)"