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

Timestamp:

Apr 23, 2020 10:43:42 AM (5 years ago)

Author:

vboxsync

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

137496

Message:

ValKit: Make the load generator run in guests too. bugref:8489

Location:

trunk/src/VBox/ValidationKit

Files:

• Config.kmk (modified) (1 diff)
• utils/misc/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/ValidationKit/Config.kmk

@@ -110 +110 @@
 #
 # Template for building ring-3 programs for the Validation Kit.
-# These programs can run on the host and may take advantage of the support
-# driver when installed.
-#
-TEMPLATE_VBoxValidationKitR3Host = VBox Validation Kit ring-3 program, mainly host.
-TEMPLATE_VBoxValidationKitR3Host_EXTENDS = VBoxValidationKitR3Base
-TEMPLATE_VBoxValidationKitR3Host_EXTENDS_BY = appending
-TEMPLATE_VBoxValidationKitR3Host_INST = $(INST_VALIDATIONKIT)$(KBUILD_TARGET)/$(KBUILD_TARGET_ARCH)/
-TEMPLATE_VBoxValidationKitR3Host_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
-TEMPLATE_VBoxValidationKitR3Host_DEFS = IN_RT_R3 IN_SUP_R3
-TEMPLATE_VBoxValidationKitR3Host_LIBS.darwin = iconv
-TEMPLATE_VBoxValidationKitR3Host_LIBS.freebsd = iconv
-TEMPLATE_VBoxValidationKitR3Host_LIBS = \
-        $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB) \
+# When these programs run on the host they may take advantage of the
+# support driver if installed.
+#
+TEMPLATE_VBoxValidationKitR3SupDrv = VBox Validation Kit ring-3 program, mainly host.
+TEMPLATE_VBoxValidationKitR3SupDrv_EXTENDS = VBoxValidationKitR3
+TEMPLATE_VBoxValidationKitR3SupDrv_EXTENDS_BY = appending
+TEMPLATE_VBoxValidationKitR3SupDrv_DEFS = IN_SUP_R3
+TEMPLATE_VBoxValidationKitR3SupDrv_LIBS = \
         $(PATH_STAGE_LIB)/SUPR3Static$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
-ifeq ($(KBUILD_TARGET),solaris)
- TEMPLATE_VBoxValidationKitR3Host_LIBS += \
-        kstat \
-        nsl \
-        contract
- if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
-  TEMPLATE_VBoxValidationKitR3Host_LIBS += \
-        smbios
- endif
-endif
 
 #

trunk/src/VBox/ValidationKit/utils/misc/Makefile.kmk

@@ -29 +29 @@
 
 PROGRAMS += LoadGenerator
-LoadGenerator_TEMPLATE = VBoxValidationKitR3Host
+LoadGenerator_TEMPLATE = VBoxValidationKitR3SupDrv
 LoadGenerator_SOURCES  = loadgenerator.cpp