Changeset 94049 in vbox

Timestamp:

Mar 1, 2022 7:18:38 PM (3 years ago)

Author:

vboxsync

Message:

Validation Kit: Addendum to r150100: Also include required testcase dependencies, use a white list for tests to include and try to get which (white listed) tests are available for all specified platforms. Tests now also can run directly off the Validation Kit .ISO. ​bugref:10195

File:

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

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -57 +57 @@
 # The current target is enabled by default.
 VBOX_WITH_VALIDATIONKIT_PACKING.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = 1
-
+ifdef VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING
+ VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = 1
+endif
 
 #
@@ -162 +164 @@
         $(VBOX_PATH_VALIDATIONKIT)/bootsectors/bootsector-shutdown.img
 endif
+
+VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS =
 
 # Generate VBOX_PATH_VALIDATIONKIT.os.arch variables.
@@ -286 +290 @@
 
 #
-# If enabled, this includes the unit tests located in the out/testcase directory.
+# If enabled, this includes the unit tests located in the $(PATH_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).
@@ -296 +300 @@
 #
 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, os2 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
-
+
+# Only include testcases being on the whitelist. Wilcard (*) implicit.
+TMP_UNITTESTS_WHITELIST := \
+        tstFile \
+        tstFileLock \
+        tstRTLocalIpc \
+        tstRTPathQueryInfo \
+        tstRTPipe \
+        tstRTProcCreateEx \
+        tstRTProcCreatePrf \
+        tstRTProcIsRunningByName \
+        tstRTProcQueryUsername \
+        tstRTProcWait \
+        tstTime-2 \
+        tstTime-3 \
+        tstTime-4 \
+        tstTimer \
+        tstThread-1 \
+        tstUtf
+
+#
+# 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?
+#
+TMP_UNITTESTS_DEPS_LIB := \
+        VBoxRT
+
+define def_vbox_validationkit_unittests
+  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 += \
+        $(foreach file_dep, $(TMP_UNITTESTS_DEPS_LIB), \
+        $$(wildcard $(TMP_UNITTESTS_PATH_BIN)/$(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)) \
+))
+endif # VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING
 
 #
@@ -341 +386 @@
                                                    $(subst =, $(SP), $(spec)), \
                                                    $(subst /$(INST_VALIDATIONKIT), ,$(spec))))) \
+                $(foreach spec,$(filter-out %.txt %.dll %.xml %.reg %.img, $(VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS)) \
+                        ,--chmod=a+x:/$(lastword $(if $(findstring =,$(spec)), \
+                                                   $(subst =, $(SP), $(spec)), \
+                                                   $(subst $(PATH_OUT_BASE), testcase,$(spec))))) \
                 --volume-id "VBOXVALK_$(VBOX_SVN_REV)_$(VBOX_VERSION_STRING_RAW)" \
                 --name-setup joliet \