Changeset 94448 in vbox

Timestamp:

Apr 2, 2022 9:19:38 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150778

Message:

Validation Kit/unit tests: Use a recipe file for RTIsoMaker and feed it in, instead of passing everything via command line. Needed when also including the unit tests, as the command line gets too long and will exceed the maximum allowed length on some OSes. bugref:10195

File:

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

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -151 +151 @@
 
 
-
+VBOX_VALIDATIONKIT_ISO_RSP = $(PATH_TARGET)/VBoxValidationKitISO.rsp
+OTHERS                    += $(VBOX_VALIDATIONKIT_ISO_RSP)
+OTHERS_CLEAN              += $(VBOX_VALIDATIONKIT_ISO_RSP)
 
 #
@@ -302 +304 @@
 
 # Only include testcases being on the whitelist.
-#TMP_UNITTESTS_WHITELIST := \
-#       tstFile \
-#       tstFileLock \
-#       tstRTLocalIpc \
-#       tstRTPathQueryInfo \
-#       tstRTPipe \
-#       tstRTProcCreateEx \
-#       tstRTProcCreatePrf \
-#       tstRTProcQueryUsername \
-#       tstTime-2 \
-#       tstTime-3 \
-#       tstTime-4 \
-#       tstTimer \
-#       tstThread-1 \
-#       tstUtf8
-#
-#TMP_UNITTESTS_WHITELIST.linux += \
-#       tstRTProcWait \
-#       tstRTProcIsRunningByName
-#
-#TMP_UNITTESTS_WHITELIST.win += \
-#       tstRTProcWait
-
 TMP_UNITTESTS_WHITELIST := \
-        tstFile
+        tstFile \
+        tstFileLock \
+        tstRTLocalIpc \
+        tstRTPathQueryInfo \
+        tstRTPipe \
+        tstRTProcCreateEx \
+        tstRTProcCreatePrf \
+        tstRTProcQueryUsername \
+        tstTime-2 \
+        tstTime-3 \
+        tstTime-4 \
+        tstTimer \
+        tstThread-1 \
+        tstUtf8
+
+TMP_UNITTESTS_WHITELIST.linux += \
+        tstRTProcWait \
+        tstRTProcIsRunningByName
+
+TMP_UNITTESTS_WHITELIST.win += \
+        tstRTProcWait
 
 #
@@ -370 +369 @@
 
 #
-# Build the Validation Kit guest ISO.
-#
-$(VBOX_PATH_VALIDATIONKIT)/VBoxValidationKit.iso: \
-                $(filter-out %=deleteme=, $(subst =,=deleteme= , $(VBOX_VALIDATIONKIT_FILESPEC))) \
-                $(VBOX_SVN_REV_KMK) \
-                $(VBOX_PATH_VALIDATIONKIT_SRC)/Makefile.kmk \
-                | $(if-expr defined(VBOX_USE_RTISOMAKER),$(VBOX_RTISOMAKER),)
-        $(call MSG_TOOL,RTIsoMaker,,$@)
-        $(QUIET)$(MKDIR) -p $(@D)
-ifneq ($(KBUILD_TARGET),os2)
-        $(QUIET)$(ECHO) VBOX_VALIDATIONKIT_FILESPEC $(VBOX_VALIDATIONKIT_FILESPEC)
-endif
-ifdef VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING
-        $(QUIET)$(ECHO) VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS $(VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS)
-endif
-        $(VBOX_RTISOMAKER) \
-                --output $@ \
+# Build the Validation Kit guest ISO recipe consumed by RTIsoMaker.
+#
+# We need this recipe file because passing all those arguments to RTIsoMaker will blow up
+# the maximum command line length on some OSes.
+#
+$(VBOX_VALIDATIONKIT_ISO_RSP): | $$(dir $$@)
+        $(call MSG_L1,Creating Validation Kit guest ISO recipe $@)
+        $(APPEND) -nt $@ \
                 --iso-level 3 \
                 --rock-ridge \
@@ -404 +394 @@
                                                    $(subst =, $(SP), $(spec)), \
                                                    $(subst $(PATH_OUT_BASE), testcase,$(spec))))) \
-                --volume-id "VBOXVALK_$(VBOX_SVN_REV)_$(VBOX_VERSION_STRING_RAW)" \
+                --volume-id \"VBOXVALK_$(VBOX_SVN_REV)_$(VBOX_VERSION_STRING_RAW)\" \
                 --name-setup joliet \
-                --volume-id "VBoxValK $(VBOX_SVN_REV)"
+                --volume-id \"VBoxValK $(VBOX_SVN_REV)\"
+
+#
+# Build the Validation Kit guest ISO.
+#
+$(VBOX_PATH_VALIDATIONKIT)/VBoxValidationKit.iso: \
+                $(filter-out %=deleteme=, $(subst =,=deleteme= , $(VBOX_VALIDATIONKIT_FILESPEC))) \
+                $(VBOX_SVN_REV_KMK) \
+                $(VBOX_PATH_VALIDATIONKIT_SRC)/Makefile.kmk \
+                $(VBOX_VALIDATIONKIT_ISO_RSP) \
+                | $(if-expr defined(VBOX_USE_RTISOMAKER),$(VBOX_RTISOMAKER),)
+        $(call MSG_TOOL,RTIsoMaker,,$@)
+        $(QUIET)$(MKDIR) -p $(@D)
+ifneq ($(KBUILD_TARGET),os2)
+        $(QUIET)$(ECHO) VBOX_VALIDATIONKIT_FILESPEC $(VBOX_VALIDATIONKIT_FILESPEC)
+endif
+        $(QUIET)$(ECHO) VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS $(VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS)
+        $(VBOX_RTISOMAKER) \
+                @$(VBOX_VALIDATIONKIT_ISO_RSP) \
+                --output $@
+
+
 
 # Alias for creating the iso.
-.PHONY: validationkit-iso
+.PHONY: $(QUIET)$(RM) -f $(VBOX_VALIDATIONKIT_ISO_RSP) validationkit-iso
 validationkit-iso: $(VBOX_PATH_VALIDATIONKIT)/VBoxValidationKit.iso