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
This commit is contained in:
parent
510dfad636
commit
c66aaaf921
@ -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 := \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -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 {
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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
|
||||
Loading…
x
Reference in New Issue
Block a user