generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This change make PulseAudio only start for the tests on the LinuxLargeTests bot.

Browse Source 
I put back the --daemonize flag too, since the audio_e2e_test didn't find the pulseaudio daemon otherwise.

TBR=phoglund@webrtc.org
BUG=None
TEST=Tested locally on LinuxLargeTests bot.

Review URL: https://webrtc-codereview.appspot.com/635009

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2395 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2012-06-12 08:07:30 +00:00
parent 5e7ca608d5
commit 5f9f1db12a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/continuous_build/build_internal/scripts/webrtc_buildbot/utils.py
View File

@ -594,7 +594,6 @@ class WebRTCLinuxFactory(WebRTCFactory):
self.compile_for_memory_tooling = compile_for_memory_tooling
self.release = release
self._AddStartPulseAudioStep()
self.AddSmartCleanStep()
self.AddGclientSyncStep()
@ -761,6 +760,7 @@ class WebRTCLinuxFactory(WebRTCFactory):
cmd = MakeCommandToRunTestInXvfb(['out/Debug/video_render_module_test'])
self.AddCommonTestRunStep(test=test, cmd=cmd)
elif test == 'voe_auto_test':
self._AddStartPulseAudioStep()
# Set up the regular test run.
binary = 'out/Debug/voe_auto_test'
cmd = [binary, '--automated', '--gtest_filter=-RtpFuzzTest.*']
@ -772,6 +772,7 @@ class WebRTCLinuxFactory(WebRTCFactory):
'++gtest_filter=RtpFuzzTest*']
self.AddCommonFyiStep(cmd=cmd, descriptor='voe_auto_test (fuzz tests)')
elif test == 'audio_e2e_test':
self._AddStartPulseAudioStep()
output_file = '/tmp/e2e_audio_out.pcm'
cmd = ('python tools/e2e_quality/audio/run_audio_test.py '
'--input=/home/webrtc-cb/data/e2e_audio_in.pcm '
@ -788,10 +789,11 @@ class WebRTCLinuxFactory(WebRTCFactory):
def _AddStartPulseAudioStep(self):
# Ensure a PulseAudio daemon is running. Options:
# --start runs it as a daemon.
# --high-priority succeeds due to changes in /etc/security/limits.conf.
# -vvvv gives us fully verbose logs.
cmd = ('/usr/bin/pulseaudio --start --high-priority -vvvv')
# --start starts the daemon if it is not running
# --daemonize daemonize after startup
# --high-priority succeeds due to changes in /etc/security/limits.conf.
# -vvvv gives us fully verbose logs.
cmd = ('/usr/bin/pulseaudio --start --daemonize --high-priority -vvvv')
self.AddCommonStep(cmd=cmd, descriptor='Start PulseAudio')
class WebRTCMacFactory(WebRTCFactory):