diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-13 14:31:47 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-13 14:31:47 +0000 |
| commit | f64791ec06a97d445bd72a265e1794bb9be6ebe9 (patch) | |
| tree | 14db6403b4ce5233caf186223945f7ced52f11ff | |
| parent | f94ccd41be08c937f523b2749544f07011203905 (diff) | |
| download | webrtc-f64791ec06a97d445bd72a265e1794bb9be6ebe9.tar.gz | |
Merge metrics_unittests into video_engine_tests.
metrics_unittests will be removed as soon as trybots catch up with LKGR,
that way we don't have to break any tryjobs during.
BUG=1843
R=kjellander@webrtc.org, mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/5789004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5284 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | video_engine_tests.isolate | 1 | ||||
| -rw-r--r-- | webrtc_tests.gypi | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/video_engine_tests.isolate b/video_engine_tests.isolate index 959759be..c8ec481e 100644 --- a/video_engine_tests.isolate +++ b/video_engine_tests.isolate @@ -25,6 +25,7 @@ ], 'isolate_dependency_tracked': [ '../DEPS', + '../resources/foreman_cif_short.yuv', '../testing/test_env.py', '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)', ], diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi index d6104b64..17ff23ec 100644 --- a/webrtc_tests.gypi +++ b/webrtc_tests.gypi @@ -36,12 +36,14 @@ 'video/call_tests.cc', 'video/video_send_stream_tests.cc', 'test/common_unittest.cc', + 'test/testsupport/metrics/video_metrics_unittest.cc', 'test/test_main.cc', ], 'dependencies': [ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', 'modules/modules.gyp:rtp_rtcp', + 'test/metrics.gyp:metrics', 'test/webrtc_test_common.gyp:webrtc_test_common', 'webrtc', ], |