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

Timestamp:

May 6, 2022 12:58:06 PM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/unit tests: Match the testcase/ directory structure with the linux/ directory one (e.g. testcase/$(os)/$(arch)/). bugref:​10195

File:

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

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -312 +312 @@
         tstFile \
         tstFileLock \
-        tstRTLocalIpc \
         tstRTPathQueryInfo \
         tstRTPipe \
@@ -318 +317 @@
         tstRTProcCreatePrf \
         tstRTProcQueryUsername \
-        tstTime-2 \
-        tstTime-3 \
-        tstTime-4 \
-        tstTimer \
         tstThread-1 \
         tstUtf8
@@ -344 +339 @@
 
 define def_vbox_validationkit_unittests
-  TMP_UNITTESTS_PATH_BIN = $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/../..
   VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \
         $(foreach test_whitelist, $(TMP_UNITTESTS_WHITELIST), \
-        $$(wildcard $(TMP_UNITTESTS_PATH_BIN)/testcase/$(test_whitelist)$(TMP_SUFF_EXE)))
+        $(wildcard $(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/../../testcase/$(os)/$(arch)/$(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)))
+        $(wildcard $(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/$(file_dep)$(TMP_SUFF_LIB)))
 endef
 
@@ -387 +381 @@
                         ,$(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))) ) \
+                        ,$(if $(findstring =,$(spec)), $(spec), /$(lastword $(subst /$(INST_VALIDATIONKIT), ,$(spec))=$(spec))) ) \
                 $(foreach spec,$(filter-out %.txt %.dll %.xml %.reg %.img, $(VBOX_VALIDATIONKIT_FILESPEC)) \
                         ,--chmod=a+x:/$(lastword $(if $(findstring =,$(spec)), \
@@ -395 +389 @@
                         ,--chmod=a+x:/$(lastword $(if $(findstring =,$(spec)), \
                                                    $(subst =, $(SP), $(spec)), \
-                                                   $(subst $(PATH_OUT_BASE), testcase,$(spec))))) \
+                                                   $(subst $(INST_VALIDATIONKIT), ,$(spec))))) \
                 '--volume-id="VBOXVALK_$(VBOX_SVN_REV)_$(VBOX_VERSION_STRING_RAW)"' \
                 '--name-setup=joliet' \