From ad0f3baf90d89211358080d446c2604a0415d051 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Mon, 3 Dec 2012 10:52:29 +0000 Subject: [PATCH] Removing redundant codec unittest targets. The following targets have been merged into audio_coding_unittests: * cng_unittests * g711_unittests * g722_unittests * isacfix_unittests * pcm16b_unittests Some of them were empty and were created with the assumption they were needed in order to get code coverage (which was actually not needed). The following test has been removed since it was empty: * audio_conference_mixer_unittests BUG=none TEST=trybots passing (well, except for the unittests that are removed, they're failing until the try server configuration is updated) Review URL: https://webrtc-codereview.appspot.com/971008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3222 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../modules/audio_coding/codecs/cng/cng.gypi | 18 ------------------ .../audio_coding/codecs/g711/g711.gypi | 12 ------------ .../audio_coding/codecs/g711/g711_unittest.cc | 17 ----------------- .../audio_coding/codecs/g722/g722.gypi | 12 ------------ .../audio_coding/codecs/g722/g722_unittest.cc | 17 ----------------- .../codecs/isac/isacfix_test.gypi | 14 -------------- .../audio_coding/codecs/pcm16b/pcm16b.gypi | 18 ------------------ .../codecs/pcm16b/pcm16b_unittest.cc | 17 ----------------- .../main/source/audio_coding_module.gypi | 6 ++++++ .../source/audio_conference_mixer.gypi | 19 ------------------- .../source/audio_conference_mixer_unittest.cc | 17 ----------------- .../utility/source/file_player_unittest.cc | 17 ----------------- webrtc/modules/utility/source/utility.gypi | 1 - 13 files changed, 6 insertions(+), 179 deletions(-) delete mode 100644 webrtc/modules/audio_coding/codecs/g711/g711_unittest.cc delete mode 100644 webrtc/modules/audio_coding/codecs/g722/g722_unittest.cc delete mode 100644 webrtc/modules/audio_coding/codecs/pcm16b/pcm16b_unittest.cc delete mode 100644 webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_unittest.cc delete mode 100644 webrtc/modules/utility/source/file_player_unittest.cc diff --git a/webrtc/modules/audio_coding/codecs/cng/cng.gypi b/webrtc/modules/audio_coding/codecs/cng/cng.gypi index ce83e29fbf..d44a7f413f 100644 --- a/webrtc/modules/audio_coding/codecs/cng/cng.gypi +++ b/webrtc/modules/audio_coding/codecs/cng/cng.gypi @@ -30,24 +30,6 @@ ], }, ], # targets - 'conditions': [ - ['include_tests==1', { - 'targets': [ - { - 'target_name': 'cng_unittests', - 'type': 'executable', - 'dependencies': [ - 'CNG', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/test/test.gyp:test_support_main', - ], - 'sources': [ - 'cng_unittest.cc', - ], - }, # CNG_unittests - ], # targets - }], # include_tests - ], # conditions } # Local Variables: diff --git a/webrtc/modules/audio_coding/codecs/g711/g711.gypi b/webrtc/modules/audio_coding/codecs/g711/g711.gypi index 66aa17a67e..ca330209f0 100644 --- a/webrtc/modules/audio_coding/codecs/g711/g711.gypi +++ b/webrtc/modules/audio_coding/codecs/g711/g711.gypi @@ -30,18 +30,6 @@ 'conditions': [ ['include_tests==1', { 'targets': [ - { - 'target_name': 'g711_unittests', - 'type': 'executable', - 'dependencies': [ - 'G711', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'g711_unittest.cc', - ], - }, { 'target_name': 'g711_test', 'type': 'executable', diff --git a/webrtc/modules/audio_coding/codecs/g711/g711_unittest.cc b/webrtc/modules/audio_coding/codecs/g711/g711_unittest.cc deleted file mode 100644 index c903bed77d..0000000000 --- a/webrtc/modules/audio_coding/codecs/g711/g711_unittest.cc +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -/* - * Empty test just to get code coverage metrics for this dir. - */ -#include "g711_interface.h" -#include "gtest/gtest.h" - -TEST(G711Test, EmptyTestToGetCodeCoverage) {} diff --git a/webrtc/modules/audio_coding/codecs/g722/g722.gypi b/webrtc/modules/audio_coding/codecs/g722/g722.gypi index 311b5a0fae..8dc3509991 100644 --- a/webrtc/modules/audio_coding/codecs/g722/g722.gypi +++ b/webrtc/modules/audio_coding/codecs/g722/g722.gypi @@ -30,18 +30,6 @@ 'conditions': [ ['include_tests==1', { 'targets': [ - { - 'target_name': 'g722_unittests', - 'type': 'executable', - 'dependencies': [ - 'G722', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'g722_unittest.cc', - ], - }, { 'target_name': 'G722Test', 'type': 'executable', diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_unittest.cc b/webrtc/modules/audio_coding/codecs/g722/g722_unittest.cc deleted file mode 100644 index a828eddbe5..0000000000 --- a/webrtc/modules/audio_coding/codecs/g722/g722_unittest.cc +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -/* - * Empty test just to get code coverage metrics for this dir. - */ -#include "g722_interface.h" -#include "gtest/gtest.h" - -TEST(G722Test, EmptyTestToGetCodeCoverage) {} diff --git a/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi b/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi index 04bdecdcf1..e1e13114f7 100644 --- a/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi +++ b/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi @@ -23,20 +23,6 @@ './fix/test/kenny.c', ], }, - { - 'target_name': 'isacfix_unittests', - 'type': 'executable', - 'dependencies': [ - 'iSACFix', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/test/test.gyp:test_support_main', - ], - 'sources': [ - 'fix/source/filters_unittest.cc', - 'fix/source/filterbanks_unittest.cc', - 'fix/source/lpc_masking_model_unittest.cc', - ], - }, ], } diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi index 9e196b802a..6f6eea658d 100644 --- a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi +++ b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi @@ -25,24 +25,6 @@ ], }, ], # targets - 'conditions': [ - ['include_tests==1', { - 'targets': [ - { - 'target_name': 'pcm16b_unittests', - 'type': 'executable', - 'dependencies': [ - 'PCM16B', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'pcm16b_unittest.cc', - ], - }, # PCM16B_unittests - ], # targets - }], # include_tests - ], # conditions } # Local Variables: diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b_unittest.cc b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b_unittest.cc deleted file mode 100644 index eb910b363e..0000000000 --- a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b_unittest.cc +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -/* - * Empty test just to get code coverage metrics for this dir. - */ -#include "pcm16b.h" -#include "gtest/gtest.h" - -TEST(Pcm16bTest, EmptyTestToGetCodeCoverage) {} diff --git a/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi b/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi index 2ee2baf574..53d2ea0ea5 100644 --- a/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi +++ b/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi @@ -147,6 +147,8 @@ 'type': 'executable', 'dependencies': [ 'audio_coding_module', + 'CNG', + 'iSACFix', 'NetEq', '<(webrtc_root)/common_audio/common_audio.gyp:vad', '<(DEPTH)/testing/gtest.gyp:gtest', @@ -155,6 +157,10 @@ ], 'sources': [ 'acm_neteq_unittest.cc', + '../../codecs/cng/cng_unittest.cc', + '../../codecs/isac/fix/source/filters_unittest.cc', + '../../codecs/isac/fix/source/filterbanks_unittest.cc', + '../../codecs/isac/fix/source/lpc_masking_model_unittest.cc', ], }, # audio_coding_unittests ], diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer.gypi b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer.gypi index c00885b604..75fc2dd83e 100644 --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer.gypi +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer.gypi @@ -43,25 +43,6 @@ ], }, ], # targets - 'conditions': [ - ['include_tests==1', { - 'targets': [ - { - 'target_name': 'audio_conference_mixer_unittests', - 'type': 'executable', - 'dependencies': [ - 'audio_conference_mixer', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - ], - 'sources': [ - 'audio_conference_mixer_unittest.cc', - ], - }, # audio_conference_mixer_unittests - ], # targets - }], # include_tests - ], # conditions } # Local Variables: diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_unittest.cc b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_unittest.cc deleted file mode 100644 index f895fbd6e2..0000000000 --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_unittest.cc +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -/* - * Empty test just to get code coverage metrics for this dir. - */ -#include "audio_conference_mixer.h" -#include "gtest/gtest.h" - -TEST(AudioConferenceMixerTest, EmptyTestToGetCodeCoverage) {} diff --git a/webrtc/modules/utility/source/file_player_unittest.cc b/webrtc/modules/utility/source/file_player_unittest.cc deleted file mode 100644 index 2e76905d86..0000000000 --- a/webrtc/modules/utility/source/file_player_unittest.cc +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -/* - * Empty test just to get code coverage metrics for this dir. - */ -#include "file_player.h" -#include "gtest/gtest.h" - -TEST(FilePlayerTest, EmptyTestToGetCodeCoverage) {} diff --git a/webrtc/modules/utility/source/utility.gypi b/webrtc/modules/utility/source/utility.gypi index 308dd9e1d5..d4f2f193a5 100644 --- a/webrtc/modules/utility/source/utility.gypi +++ b/webrtc/modules/utility/source/utility.gypi @@ -80,7 +80,6 @@ ], 'sources': [ 'audio_frame_operations_unittest.cc', - 'file_player_unittest.cc', ], }, # webrtc_utility_unittests ], # targets