Changeset 89317 in vbox for trunk/src/VBox

Timestamp:

May 27, 2021 12:41:23 PM (4 years ago)

Author:

vboxsync

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

144664

Message:

Audio/ValKit: Renamed AudioTest binary to vkat (Validation Kit Audio Test), to make it more clear what is meant when referring to it. bugref:10008

Location:

trunk/src/VBox/ValidationKit

Files:

• Makefile.kmk (modified) (2 diffs)
• tests/audio/tdAudioTest.py (modified) (2 diffs)
• utils/audio/Makefile.kmk (modified) (7 diffs)

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -190 +190 @@
   ifn1of ($(os), os2 freebsd netbsd openbsd) ## must match utils/audio/Makefile.kmk
    VBOX_VALIDATIONKIT_FILESPEC += \
-        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/AudioTest$(TMP_SUFF_EXE)
+        $$(VBOX_PATH_VALIDATIONKIT.$(os).$(arch))/vkat$(TMP_SUFF_EXE)
   endif
  endif
@@ -314 +314 @@
 .PHONY: validationkit-iso
 validationkit-iso: $(VBOX_PATH_VALIDATIONKIT)/VBoxValidationKit.iso
-

trunk/src/VBox/ValidationKit/tests/audio/tdAudioTest.py

@@ -83 +83 @@
         if not fSkip:
             reporter.testStart('Waiting for TXS');
-            sPathAutoTestExe = '${CDROM}/vboxvalidationkit/${OS/ARCH}/AudioTest${EXESUFF}';
+            sPathAutoTestExe = '${CDROM}/vboxvalidationkit/${OS/ARCH}/vkat${EXESUFF}';
             oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(oTestVm.sVmName,
                                                                     fCdWait = True,
@@ -100 +100 @@
                 reporter.log("Audio test tag is %s'" % (sTag));
 
-                reporter.testStart('Running AudioTest');
-                fRc = self.txsRunTest(oTxsSession, 'AudioTest', 5 * 60 * 1000,
+                reporter.testStart('Running vkat (Validation Kit Audio Test)');
+                fRc = self.txsRunTest(oTxsSession, 'vkat', 5 * 60 * 1000,
                                       self.getGuestSystemShell(oTestVm),
                                       (self.getGuestSystemShell(oTestVm),

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

@@ -45 +45 @@
 
 ifn1of ($(KBUILD_TARGET), os2 freebsd netbsd openbsd)
-PROGRAMS += AudioTest
+PROGRAMS += vkat
 endif
-AudioTest_TEMPLATE = VBoxValidationKitR3
-AudioTest_VBOX_IMPORT_CHECKER.win.x86 = nt4
-AudioTest_DEFS     = VBOX_AUDIO_VKAT IN_VMM_R3 IN_VMM_STATIC
-AudioTest_INCS     = \
+vkat_TEMPLATE = VBoxValidationKitR3
+vkat_VBOX_IMPORT_CHECKER.win.x86 = nt4
+vkat_DEFS     = VBOX_AUDIO_VKAT IN_VMM_R3 IN_VMM_STATIC
+vkat_INCS     = \
         $(PATH_ROOT)/src/VBox/Devices/build
-AudioTest_SOURCES  = \
+vkat_SOURCES  = \
         vkat.cpp \
         $(VKAT_PATH_AUDIO)/AudioTest.cpp \
@@ -63 +63 @@
 
 # Self-test stuff.
-AudioTest_DEFS     += VBOX_WITH_AUDIO_VALIDATIONKIT
-AudioTest_SOURCES  += \
+vkat_DEFS     += VBOX_WITH_AUDIO_VALIDATIONKIT
+vkat_SOURCES  += \
         $(VKAT_PATH_AUDIO)/DrvHostAudioValidationKit.cpp \
         $(VKAT_PATH_AUDIO)/AudioTestService.cpp \
@@ -72 +72 @@
 
 ifdef VBOX_WITH_AUDIO_PULSE
- AudioTest_DEFS    += VBOX_WITH_AUDIO_PULSE
- AudioTest_SOURCES += \
+ vkat_DEFS    += VBOX_WITH_AUDIO_PULSE
+ vkat_SOURCES += \
         $(VKAT_PATH_AUDIO)/DrvHostAudioPulseAudioStubs.cpp \
         $(VKAT_PATH_AUDIO)/DrvHostAudioPulseAudio.cpp
@@ -79 +79 @@
 
 ifdef VBOX_WITH_AUDIO_ALSA
- AudioTest_DEFS    += VBOX_WITH_AUDIO_ALSA
- AudioTest_SOURCES += \
+ vkat_DEFS    += VBOX_WITH_AUDIO_ALSA
+ vkat_SOURCES += \
         $(VKAT_PATH_AUDIO)/DrvHostAudioAlsa.cpp \
         $(VKAT_PATH_AUDIO)/DrvHostAudioAlsaStubs.cpp
@@ -86 +86 @@
 
 ifdef VBOX_WITH_AUDIO_OSS
- AudioTest_DEFS    += VBOX_WITH_AUDIO_OSS
- AudioTest_SOURCES += \
+ vkat_DEFS    += VBOX_WITH_AUDIO_OSS
+ vkat_SOURCES += \
         $(VKAT_PATH_AUDIO)/DrvHostAudioOss.cpp
 endif
 
-AudioTest_SOURCES.win += \
+vkat_SOURCES.win += \
         $(VKAT_PATH_AUDIO)/DrvHostAudioDSound.cpp \
         $(VKAT_PATH_AUDIO)/DrvHostAudioWasApi.cpp
 ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
- AudioTest_DEFS.win    += VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
- AudioTest_SOURCES.win += \
+ vkat_DEFS.win    += VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
+ vkat_SOURCES.win += \
         $(VKAT_PATH_AUDIO)/DrvHostAudioDSoundMMNotifClient.cpp
 endif
 
-AudioTest_SOURCES.darwin = \
+vkat_SOURCES.darwin = \
         $(VKAT_PATH_AUDIO)/DrvHostAudioCoreAudio.cpp \
         $(VKAT_PATH_AUDIO)/DrvHostAudioCoreAudioAuth.mm
-AudioTest_LDFLAGS.darwin = \
+vkat_LDFLAGS.darwin = \
         -framework CoreAudio \
         -framework AudioUnit \
@@ -109 +109 @@
         -framework Foundation
 ifn1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.4 10.5 10.6)
- AudioTest_LDFLAGS.darwin += \
+ vkat_LDFLAGS.darwin += \
         -framework AVFoundation
 endif
@@ -115 +115 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
-