VirtualBox

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


Ignore:
Timestamp:
May 17, 2021 1:55:14 PM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
144438
Message:

ValKit: Attempt at fixing iso packing and AudioTest build selection. bugref:10008

Location:
trunk/src/VBox/ValidationKit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/ValidationKit/Makefile.kmk

    r89083 r89097  
    170170 ifdef VBOX_WITH_VALIDATIONKIT_PACKING.$(os).$(arch)
    171171  VBOX_VALIDATIONKIT_FILESPEC += \
    172         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/exceptionsR3$(TMP_SUFF_EXE) \
    173         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/cpu-alloc-all-mem$(TMP_SUFF_EXE) \
    174         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/cpu-numa$(TMP_SUFF_EXE) \
    175         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/FsPerf$(TMP_SUFF_EXE) \
    176         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/IoPerf$(TMP_SUFF_EXE) \
    177         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/NetPerf$(TMP_SUFF_EXE) \
    178         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/LoadGenerator$(TMP_SUFF_EXE) \
    179         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/loadgeneratorR0.r0 \
    180         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/SerialTest$(TMP_SUFF_EXE) \
    181         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/TestExecService$(TMP_SUFF_EXE) \
    182         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/vts_rm$(TMP_SUFF_EXE) \
    183         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/vts_shutdown$(TMP_SUFF_EXE) \
    184         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/vts_tar$(TMP_SUFF_EXE) \
    185         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/xmmsaving$(TMP_SUFF_EXE)
    186   ifdef VBOX_WITH_AUDIO_VALIDATIONKIT
     172        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/exceptionsR3$(TMP_SUFF_EXE) \
     173        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/cpu-alloc-all-mem$(TMP_SUFF_EXE) \
     174        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/cpu-numa$(TMP_SUFF_EXE) \
     175        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/FsPerf$(TMP_SUFF_EXE) \
     176        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/IoPerf$(TMP_SUFF_EXE) \
     177        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/NetPerf$(TMP_SUFF_EXE) \
     178        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/LoadGenerator$(TMP_SUFF_EXE) \
     179        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/loadgeneratorR0.r0 \
     180        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/SerialTest$(TMP_SUFF_EXE) \
     181        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/TestExecService$(TMP_SUFF_EXE) \
     182        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/vts_rm$(TMP_SUFF_EXE) \
     183        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/vts_shutdown$(TMP_SUFF_EXE) \
     184        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/vts_tar$(TMP_SUFF_EXE) \
     185        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/xmmsaving$(TMP_SUFF_EXE)
     186  ifn1of ($(os), os2 solaris) ## must match utils/audio/Makefile.kmk
    187187   VBOX_VALIDATIONKIT_FILESPEC += \
    188         $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/AudioTest$(TMP_SUFF_EXE)
     188        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/AudioTest$(TMP_SUFF_EXE)
    189189  endif
    190190 endif
  • trunk/src/VBox/ValidationKit/utils/Makefile.kmk

    r89083 r89097  
    3232#
    3333include $(PATH_SUB_CURRENT)/TestExecServ/Makefile.kmk
     34include $(PATH_SUB_CURRENT)/audio/Makefile.kmk
    3435include $(PATH_SUB_CURRENT)/cpu/Makefile.kmk
    3536include $(PATH_SUB_CURRENT)/fs/Makefile.kmk
    3637include $(PATH_SUB_CURRENT)/misc/Makefile.kmk
    3738include $(PATH_SUB_CURRENT)/network/Makefile.kmk
    38 include $(PATH_SUB_CURRENT)/serial/Makefile.kmk
    39 include $(PATH_SUB_CURRENT)/storage/Makefile.kmk
    4039ifeq ($(KBUILD_TARGET),win)
    4140 include $(PATH_SUB_CURRENT)/nt/Makefile.kmk
    4241endif
     42include $(PATH_SUB_CURRENT)/serial/Makefile.kmk
     43include $(PATH_SUB_CURRENT)/storage/Makefile.kmk
    4344ifeq ($(KBUILD_TARGET),linux)
    4445 include $(PATH_SUB_CURRENT)/usb/Makefile.kmk
    45 endif
    46 
    47 ifdef VBOX_WITH_AUDIO_VALIDATIONKIT
    48  include $(PATH_SUB_CURRENT)/audio/Makefile.kmk
    4946endif
    5047
  • trunk/src/VBox/ValidationKit/utils/audio/Makefile.kmk

    r89090 r89097  
    3131# Utility to play sine wave to Default Audio Device.
    3232#
    33 if 0 # Disabled for now; does not work without WinMM.dll.
     33if 0 # Disabled for now; does not work without WinMM.dll import validator files.
    3434 PROGRAMS.win += ntPlayToneWaveX
    3535 ntPlayToneWaveX_TEMPLATE = VBoxValidationKitR3
     
    4444VKAT_PATH_AUDIO = $(PATH_ROOT)/src/VBox/Devices/Audio
    4545
     46ifn1of ($(KBUILD_TARGET), os2 solaris)
    4647PROGRAMS += AudioTest
     48endif
    4749AudioTest_TEMPLATE = VBoxValidationKitR3
    4850AudioTest_VBOX_IMPORT_CHECKER.win.x86 = nt4
     
    7981endif
    8082
    81 ifeq ($(KBUILD_TARGET),win)
    82   AudioTest_SOURCES += \
     83AudioTest_SOURCES.win += \
    8384        $(VKAT_PATH_AUDIO)/DrvHostAudioDSound.cpp \
    8485        $(VKAT_PATH_AUDIO)/DrvHostAudioWasApi.cpp
    85  ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
    86    AudioTest_DEFS    += VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
    87    AudioTest_SOURCES += \
    88         $(VKAT_PATH_AUDIO)/DrvHostAudioDSoundMMNotifClient.cpp
    89  endif
     86ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
     87 AudioTest_DEFS.win    += VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
     88 AudioTest_SOURCES.win += \
     89        $(VKAT_PATH_AUDIO)/DrvHostAudioDSoundMMNotifClient.cpp
    9090endif
    9191
     
    101101
    102102include $(FILE_KBUILD_SUB_FOOTER)
     103
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette