From e2ed5baf47efade9936bcbcccc2692c1752ac278 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Fri, 20 Jan 2012 19:06:38 +0000 Subject: [PATCH] Enable audioproc_unittest on all platforms. But, for the time being, limit the bit-exact test to 64-bit Linux debug. TEST=build and run all configs on Linux, and standard configs on Win and Mac. Review URL: https://webrtc-codereview.appspot.com/343005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1500 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_processing/test/unit_test.cc | 6 +++++ tools/continuous_build/master.cfg | 22 ++++++++-------- .../continuous_build/webrtc_buildbot/utils.py | 25 ++++++++----------- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/modules/audio_processing/test/unit_test.cc b/src/modules/audio_processing/test/unit_test.cc index 6fe59059e1..fe7f8e29d8 100644 --- a/src/modules/audio_processing/test/unit_test.cc +++ b/src/modules/audio_processing/test/unit_test.cc @@ -998,6 +998,9 @@ TEST_F(ApmTest, DebugDump) { #endif // WEBRTC_AUDIOPROC_DEBUG_DUMP } +// TODO(andrew): Make this test more robust such that it can be run on multiple +// platforms. It currently requires bit-exactness. +#if defined(WEBRTC_LINUX) && defined(WEBRTC_ARCH_X86_64) && !defined(NDEBUG) TEST_F(ApmTest, Process) { GOOGLE_PROTOBUF_VERIFY_VERSION; webrtc::audioproc::OutputData output_data; @@ -1237,6 +1240,9 @@ TEST_F(ApmTest, Process) { WriteMessageLiteToFile(output_filename, output_data); } } +#endif // defined(WEBRTC_LINUX) && defined(WEBRTC_ARCH_X86_64) && + // !defined(NDEBUG) + } // namespace int main(int argc, char** argv) { diff --git a/tools/continuous_build/master.cfg b/tools/continuous_build/master.cfg index a9782a3dcf..545b52bb07 100755 --- a/tools/continuous_build/master.cfg +++ b/tools/continuous_build/master.cfg @@ -106,6 +106,7 @@ DEFAULT_LINUX_TESTS = ["audio_coding_module_test", "audio_conference_mixer_unittests", "audio_device_test_api", "audio_device_test_func", + "audioproc_unittest", "cng_unittests", "g711_unittests", "g722_unittests", @@ -118,8 +119,8 @@ DEFAULT_LINUX_TESTS = ["audio_coding_module_test", "signal_processing_unittests", "system_wrappers_unittests", "test_bwe", - "test_fec", - "udp_transport_unittests", + "test_fec", + "udp_transport_unittests", "vad_unittests", "video_coding_unittests", "video_processing_unittests", @@ -130,6 +131,7 @@ DEFAULT_MACOS_TESTS = ["audio_coding_module_test", "audio_conference_mixer_unittests", "audio_device_test_api", "audio_device_test_func", + "audioproc_unittest", "cng_unittests", "g711_unittests", "g722_unittests", @@ -142,15 +144,16 @@ DEFAULT_MACOS_TESTS = ["audio_coding_module_test", "signal_processing_unittests", "system_wrappers_unittests", "test_bwe", - "test_fec", - "udp_transport_unittests", + "test_fec", + "udp_transport_unittests", "vad_unittests", "video_coding_unittests", "video_processing_unittests", "voice_engine_unittests", "vp8_unittests", "webrtc_utility_unittests"] -DEFAULT_WIN_TESTS = ["libyuv_unittests", +DEFAULT_WIN_TESTS = ["audioproc_unittest", + "libyuv_unittests", "neteq_unittests", "resampler_unittests", "system_wrappers_unittests", @@ -158,16 +161,14 @@ DEFAULT_WIN_TESTS = ["libyuv_unittests", "voice_engine_unittests", "vp8_unittests"] -HEADLESS_LINUX = ["audio_device_test_api" +HEADLESS_LINUX = ["audio_device_test_api", "audio_device_test_func", - "audioproc_unittest", "test_fec", "video_processing_unittests"] -HEADLESS_MACOS = ["audio_device_test_api" +HEADLESS_MACOS = ["audio_device_test_api", "audio_device_test_func", - "audioproc_unittest", "video_processing_unittests"] -HEADLESS_WIN = ["audio_device_test_api" +HEADLESS_WIN = ["audio_device_test_api", "audio_device_test_func"] ############# Linux Builders ####################################### @@ -204,6 +205,7 @@ linux_clang = utils.WebRTCLinuxFactory() linux_clang.EnableBuild(clang=True) linux_clang.EnableHeadLess(HEADLESS_LINUX) linux_clang.EnableTests(DEFAULT_LINUX_TESTS) + ############# Mac Builders ####################################### mac_factory = utils.WebRTCMacFactory() mac_factory.EnableBuild(build_type="both") diff --git a/tools/continuous_build/webrtc_buildbot/utils.py b/tools/continuous_build/webrtc_buildbot/utils.py index d18251e721..397e2ff94a 100755 --- a/tools/continuous_build/webrtc_buildbot/utils.py +++ b/tools/continuous_build/webrtc_buildbot/utils.py @@ -210,7 +210,7 @@ class WebRTCLinuxFactory(WebRTCFactory): name="make_%s" % make_descriptor)) def AddCommonGYPStep(self, gyp_file, gyp_params=[], descriptor="gyp"): - cmd = ["./build/gyp_chromium", "--depth=.", gyp_file] + cmd = ["./build/gyp_chromium", "--depth=.", gyp_file] cmd += gyp_params + self.gyp_params self.addStep(shell.ShellCommand(command=cmd, workdir="build/trunk", description=[descriptor, "running..."], @@ -225,7 +225,7 @@ class WebRTCLinuxFactory(WebRTCFactory): self.AddCommonStep(['lcov', '--extract', 'webrtc.info', '*/src/*', '--output', 'test.info'], workdir="build/trunk", descriptor="LCOV_Extract") - self.AddCommonStep(["lcov", "--remove", "test.info", "*/usr/include/*", + self.AddCommonStep(["lcov", "--remove", "test.info", "*/usr/include/*", "/third*", "/testing/*", "--output", "final.info"], workdir="build/trunk", descriptor="LCOV_Filter") @@ -235,10 +235,10 @@ class WebRTCLinuxFactory(WebRTCFactory): def AddCommonTestSteps(self, test): """Add common steps for test. - + test: test to be run. """ - self.AddCommonMakeStep(test, descriptor="_test") + self.AddCommonMakeStep(test, descriptor="_test") self.AddCommonTestRunStep(test, descriptor="_test") def EnableTest(self, test): @@ -247,18 +247,13 @@ class WebRTCLinuxFactory(WebRTCFactory): test: test to be run. """ if test == "audioproc_unittest": - self.AddCommonMakeStep(test, descriptor="_test") - self.AddCommonTestRunStep(test, - cmd=["../../../out/Debug/audioproc_unittest"], - workdir="build/trunk/test/data/audio_processing") + self.AddCommonTestRunStep(test) # Fixed point run: - self.AddCommonGYPStep("src/modules/modules.gyp", + self.AddCommonGYPStep("webrtc.gyp", gyp_params=["-Dprefer_fixed_point=1"], - descriptor="tests_fp") - self.AddCommonMakeStep(test, "_test_(FP)") - self.AddCommonTestRunStep(test, descriptor="_(FP)", - cmd=["../../../out/Debug/audioproc_unittest"], - workdir="build/trunk/test/data/audio_processing") + descriptor="fixed_point") + self.AddCommonMakeStep(test, descriptor="_fixed_point") + self.AddCommonTestRunStep(test, descriptor="_fixed_point") elif test == "signal_processing_unittests": self.AddCommonTestRunStep(test, descriptor="_test") elif test == "resampler_unittests": @@ -274,7 +269,7 @@ class WebRTCLinuxFactory(WebRTCFactory): elif test == "audio_device_test_api": self.AddCommonTestRunStep(test, descriptor="_test") elif test == "audio_device_test_func": - self.AddCommonTestRunStep(test, descriptor="_test") + self.AddCommonTestRunStep(test, descriptor="_test") elif test == "audio_coding_module_test": self.AddCommonTestRunStep(test, descriptor="_test") elif test == "video_processing_unittests":