Changeset 98923 in vbox

Timestamp:

Mar 12, 2023 5:21:20 PM (21 months ago)

Author:

vboxsync

Message:

ValidationKit: Include arm64 (incomplete, no bootsector testcases), bugref:9898

File:

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

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -119 +119 @@
         # Note: Exclude packing the testcase directory into .zip, as that directory only needs to be
         #       included in VBoxValidationKit.iso.
-        $(foreach os, darwin freebsd linux os2 solaris win,$(foreach arch, x86 amd64 \
+        $(foreach os, darwin freebsd linux os2 solaris win,$(foreach arch, x86 amd64 arm64\
         ,$(if-expr defined(VBOX_WITH_VALIDATIONKIT_PACKING.$(os).$(arch))\
                 ,$(NLTAB)$(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE)/$(os).$(arch)/$(KBUILD_TYPE)/ \
@@ -134 +134 @@
         $(call MSG_L1,Packing the TestBox Script files to $@)
         $(QUIET)$(RM) -f $@
-        $(foreach os, darwin freebsd linux os2 solaris win,$(foreach arch, x86 amd64 \
+        $(foreach os, darwin freebsd linux os2 solaris win,$(foreach arch, x86 amd64 arm64\
         ,$(if-expr defined(VBOX_WITH_VALIDATIONKIT_PACKING.$(os).$(arch))\
                 ,$(NLTAB)$(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE)/$(os).$(arch)/$(KBUILD_TYPE)/ \
@@ -183 +183 @@
 
 # Generate VBOX_PATH_VALIDATIONKIT.os.arch variables.
-$(foreach os, darwin freebsd linux os2 solaris win,$(foreach arch, x86 amd64, \
+$(foreach os, darwin freebsd linux os2 solaris win,$(foreach arch, x86 amd64 arm64, \
         $(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)) \
@@ -192 +192 @@
  ifdef VBOX_WITH_VALIDATIONKIT_PACKING.$(os).$(arch)
   VBOX_VALIDATIONKIT_FILESPEC += \
-        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/exceptionsR3$(TMP_SUFF_EXE) \
         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/cpu-alloc-all-mem$(TMP_SUFF_EXE) \
         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/cpu-numa$(TMP_SUFF_EXE) \
@@ -203 +202 @@
         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/vts_rm$(TMP_SUFF_EXE) \
         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/vts_shutdown$(TMP_SUFF_EXE) \
-        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/vts_tar$(TMP_SUFF_EXE) \
-        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/xmmsaving$(TMP_SUFF_EXE)
+        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/vts_tar$(TMP_SUFF_EXE)
   if1of ($(arch), amd64) ## HACK ALERT! This mirrors VBOX_WITH_R0_MODULES logic in /Config.kmk.
    VBOX_VALIDATIONKIT_FILESPEC += \
         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/loadgeneratorR0.r0
   endif
-  ifn1of ($(os), os2) ## not compiling bootsectors, no yasm.  could fix this better.
+  ifn1of ($(os).$(arch), os2.x86 os2.amd64 darwin.arm64) ## not compiling bootsectors, no yasm.  could fix this better.
    VBOX_VALIDATIONKIT_FILESPEC += \
         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/bs3-timing-1$(TMP_SUFF_EXE)
@@ -217 +215 @@
         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/vkat$(TMP_SUFF_EXE)
   endif
+  ifn1of ($(arch), arm64)
+   VBOX_VALIDATIONKIT_FILESPEC += \
+        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/exceptionsR3$(TMP_SUFF_EXE) \
+        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/xmmsaving$(TMP_SUFF_EXE)
+  endif
  endif
 endef
@@ -225 +228 @@
 ))
 TMP_SUFF_EXE =
-$(foreach os, darwin freebsd linux solaris,$(foreach arch, x86 amd64, \
+$(foreach os, darwin freebsd linux solaris,$(foreach arch, x86 amd64 arm64, \
         $(eval $(def_vbox_validationkit_common_files)) \
 ))
@@ -334 +337 @@
  ))
  TMP_SUFF_EXE =
- $(foreach os, darwin freebsd linux solaris,$(foreach arch, x86 amd64, \
+ $(foreach os, darwin freebsd linux solaris,$(foreach arch, x86 amd64 arm64, \
         $(eval $(def_vbox_validationkit_unittests)) \
  ))
@@ -385 +388 @@
 endif
 ifdef VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING
-        $(foreach os, darwin linux solaris win,$(foreach arch, x86 amd64, \
+        $(foreach os, darwin linux solaris win,$(foreach arch, x86 amd64 arm64, \
                 $(call MSG_L1, VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch): $(VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch))) \
         ))