diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-13 12:48:05 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-13 12:48:05 +0000 |
| commit | f94ccd41be08c937f523b2749544f07011203905 (patch) | |
| tree | e31e5d3257cec0fdc135aa79daae9fc2eab937f5 /webrtc_tests.gypi | |
| parent | b70db6dbe962f01976f2e1e9a4141c1ee37e3801 (diff) | |
| download | webrtc-f94ccd41be08c937f523b2749544f07011203905.tar.gz | |
Move realtime tests to webrtc_perf_tests.
New binary not to be run on our VMs as they result in flaky tests. These
will instead be run on baremetal machines.
BUG=2710
R=kjellander@webrtc.org, mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/5679004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5283 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc_tests.gypi')
| -rw-r--r-- | webrtc_tests.gypi | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi index 69a5a7ba..d6104b64 100644 --- a/webrtc_tests.gypi +++ b/webrtc_tests.gypi @@ -13,6 +13,7 @@ 'dependencies': [ 'video_engine_tests', 'video_loopback', + 'webrtc_perf_tests', ], }, { @@ -33,8 +34,6 @@ 'type': '<(gtest_target_type)', 'sources': [ 'video/call_tests.cc', - 'video/full_stack.cc', - 'video/rampup_tests.cc', 'video/video_send_stream_tests.cc', 'test/common_unittest.cc', 'test/test_main.cc', @@ -47,6 +46,23 @@ 'webrtc', ], }, + { + 'target_name': 'webrtc_perf_tests', + 'type': '<(gtest_target_type)', + 'sources': [ + 'test/test_main.cc', + 'video/call_perf_tests.cc', + 'video/full_stack.cc', + 'video/rampup_tests.cc', + ], + 'dependencies': [ + '<(DEPTH)/testing/gtest.gyp:gtest', + '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', + 'modules/modules.gyp:rtp_rtcp', + 'test/webrtc_test_common.gyp:webrtc_test_common', + 'webrtc', + ], + }, ], 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are using @@ -60,6 +76,13 @@ '<(apk_tests_path):video_engine_tests_apk', ], }, + { + 'target_name': 'webrtc_perf_tests_apk_target', + 'type': 'none', + 'dependencies': [ + '<(apk_tests_path):webrtc_perf_tests_apk', + ], + }, ], }], ['test_isolation_mode != "noop"', { @@ -78,6 +101,20 @@ 'video_engine_tests.isolate', ], }, + { + 'target_name': 'webrtc_perf_tests_run', + 'type': 'none', + 'dependencies': [ + 'webrtc_perf_tests', + ], + 'includes': [ + 'build/isolate.gypi', + 'webrtc_perf_tests.isolate', + ], + 'sources': [ + 'webrtc_perf_tests.isolate', + ], + }, ], }], ], |