diff options
author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-03 07:56:33 +0000 |
---|---|---|
committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-03 07:56:33 +0000 |
commit | c66aaaf921f0bab53721532bb2bf5ac76be6d860 (patch) | |
tree | fe6e8d36f225f56b72ed1988b64da9bf438be9cf /webrtc/modules | |
parent | 510dfad6365dafd49bd8c5f9b35ecc0967a90ecc (diff) | |
download | webrtc-c66aaaf921f0bab53721532bb2bf5ac76be6d860.tar.gz |
Rename unit_test.{cc,h} under module_unittest.
Squelches the following Windows trybot warning:
warning LNK4042: object specified more than once; extras ignored
BUG=
R=andrew@webrtc.org, stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1758004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4288 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules')
10 files changed, 13 insertions, 13 deletions
diff --git a/webrtc/modules/audio_processing/Android.mk b/webrtc/modules/audio_processing/Android.mk index 7e8775195a..327390819c 100644 --- a/webrtc/modules/audio_processing/Android.mk +++ b/webrtc/modules/audio_processing/Android.mk @@ -114,7 +114,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES:= \ $(call all-proto-files-under, test) \ - test/unit_test.cc + test/audio_processing_unittest.cc # Flags passed to both C and C++ files. LOCAL_CFLAGS := \ diff --git a/webrtc/modules/audio_processing/test/unit_test.cc b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc index ad53117107..ad53117107 100644 --- a/webrtc/modules/audio_processing/test/unit_test.cc +++ b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index 8e0297c427..33438b095c 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -143,7 +143,7 @@ 'audio_coding/neteq4/mock/mock_payload_splitter.h', 'audio_processing/aec/system_delay_unittest.cc', 'audio_processing/aec/echo_cancellation_unittest.cc', - 'audio_processing/test/unit_test.cc', + 'audio_processing/test/audio_processing_unittest.cc', 'audio_processing/utility/delay_estimator_unittest.cc', 'audio_processing/utility/ring_buffer_unittest.cc', 'bitrate_controller/bitrate_controller_unittest.cc', @@ -218,8 +218,8 @@ 'video_processing/main/test/unit_test/content_metrics_test.cc', 'video_processing/main/test/unit_test/deflickering_test.cc', 'video_processing/main/test/unit_test/denoising_test.cc', - 'video_processing/main/test/unit_test/unit_test.cc', - 'video_processing/main/test/unit_test/unit_test.h', + 'video_processing/main/test/unit_test/video_processing_unittest.cc', + 'video_processing/main/test/unit_test/video_processing_unittest.h', ], 'conditions': [ # Run screen/window capturer tests only on platforms where they are diff --git a/webrtc/modules/video_processing/main/test/unit_test/brightness_detection_test.cc b/webrtc/modules/video_processing/main/test/unit_test/brightness_detection_test.cc index 1a5b8f39ff..d17ade9696 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/brightness_detection_test.cc +++ b/webrtc/modules/video_processing/main/test/unit_test/brightness_detection_test.cc @@ -10,7 +10,7 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" -#include "webrtc/modules/video_processing/main/test/unit_test/unit_test.h" +#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h" using namespace webrtc; diff --git a/webrtc/modules/video_processing/main/test/unit_test/color_enhancement_test.cc b/webrtc/modules/video_processing/main/test/unit_test/color_enhancement_test.cc index f8129e3bdb..ea1ed41c49 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/color_enhancement_test.cc +++ b/webrtc/modules/video_processing/main/test/unit_test/color_enhancement_test.cc @@ -13,7 +13,7 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" -#include "webrtc/modules/video_processing/main/test/unit_test/unit_test.h" +#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h" #include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/video_processing/main/test/unit_test/content_metrics_test.cc b/webrtc/modules/video_processing/main/test/unit_test/content_metrics_test.cc index e73eaa32c2..26080da784 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/content_metrics_test.cc +++ b/webrtc/modules/video_processing/main/test/unit_test/content_metrics_test.cc @@ -11,7 +11,7 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/modules/video_processing/main/source/content_analysis.h" -#include "webrtc/modules/video_processing/main/test/unit_test/unit_test.h" +#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h" namespace webrtc { diff --git a/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc b/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc index 15082751ae..48afcf569d 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc +++ b/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc @@ -13,7 +13,7 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" -#include "webrtc/modules/video_processing/main/test/unit_test/unit_test.h" +#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h" #include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/video_processing/main/test/unit_test/denoising_test.cc b/webrtc/modules/video_processing/main/test/unit_test/denoising_test.cc index 8d6ea477db..71d133bdfc 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/denoising_test.cc +++ b/webrtc/modules/video_processing/main/test/unit_test/denoising_test.cc @@ -13,7 +13,7 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" -#include "webrtc/modules/video_processing/main/test/unit_test/unit_test.h" +#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h" #include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/video_processing/main/test/unit_test/unit_test.cc b/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.cc index eea8081fd3..66452603c0 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/unit_test.cc +++ b/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_processing/main/test/unit_test/unit_test.h" +#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h" #include <string> diff --git a/webrtc/modules/video_processing/main/test/unit_test/unit_test.h b/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h index 62c40398b4..db8841b5da 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/unit_test.h +++ b/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VPM_UNIT_TEST_H -#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VPM_UNIT_TEST_H +#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VIDEO_PROCESSING_UNITTEST_H +#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VIDEO_PROCESSING_UNITTEST_H #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" @@ -47,4 +47,4 @@ protected: } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VPM_UNIT_TEST_H +#endif // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VIDEO_PROCESSING_UNITTEST_H |