From 3d13d9f0a07f8d7e01679490b89fd3b93a96dd0c Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Wed, 30 Jan 2013 21:39:10 +0000 Subject: [PATCH] Fix audio_e2e_test command line arguments The changes in r1068 that moved over to the webrtc/test/buildbot_tests.py launch script was not properly tested on the real machine for the audio_e2e_test. Due to that it contained a few syntax errors and paths that were not resolved as expected. This CL fixes this and has been tested more thorougly. BUG=none TEST=Ran, standing in the checkout dir: out/Release/buildbot_tests.py -t audio_e2e_test with successful result. Review URL: https://webrtc-codereview.appspot.com/1070012 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3438 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/test/buildbot_tests.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/webrtc/test/buildbot_tests.py b/webrtc/test/buildbot_tests.py index a8d8e71cf4..65db525633 100755 --- a/webrtc/test/buildbot_tests.py +++ b/webrtc/test/buildbot_tests.py @@ -24,6 +24,9 @@ import os import subprocess import sys +_CURRENT_DIR = os.path.abspath(os.path.dirname(__file__)) +_HOME = os.environ.get('HOME', '') + _VIE_AUTO_TEST_CMD_LIST = [ 'vie_auto_test', '--automated', @@ -52,8 +55,9 @@ _LINUX_TESTS = { '--input=../../resources/e2e_audio_in.pcm', '--output=/tmp/e2e_audio_out.pcm', '--codec=L16', - '--compare="~/bin/compare-audio +16000 +wb"', - r'--regexp="(\d\.\d{3})"'], + '--harness=%s/audio_e2e_harness' % _CURRENT_DIR, + '--compare=%s/bin/compare-audio +16000 +wb' % _HOME, + '--regexp=(\d\.\d{3})'], 'audioproc_perf': ['audioproc', '-aecm', '-ns', '-agc', '--fixed_digital', '--perf', '-pb', '../../resources/audioproc.aecdump'], @@ -61,7 +65,6 @@ _LINUX_TESTS = { '32000', '../../resources/speech_and_misc_wb.pcm', 'isac_speech_and_misc_wb.pcm'], } -_CURRENT_DIR = os.path.abspath(os.path.dirname(__file__)) def main():