generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove metrics_unittests

Browse Source 
This target has been merged into video_engine_tests in r5284.

BUG=webrtc:1843
R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6129004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5319 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2013-12-18 13:27:37 +00:00
parent 8a54417968
commit 5fe2d65c43
4 changed files with 0 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/build/apk_tests.gyp
View File

@ -60,20 +60,6 @@
'../../../build/apk_test.gypi', '../../../build/apk_test.gypi',
], ],
}, },
{
'target_name': 'metrics_unittests_apk',
'type': 'none',
'variables': {
'test_suite_name': 'metrics_unittests',
'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)metrics_unittests<(SHARED_LIB_SUFFIX)',
},
'dependencies': [
'<(webrtc_root)/test/metrics.gyp:metrics_unittests',
],
'includes': [
'../../../build/apk_test.gypi',
],
},
{ {
'target_name': 'modules_tests_apk', 'target_name': 'modules_tests_apk',
'type': 'none', 'type': 'none',

4
webrtc/build/apk_tests_noop.gyp
View File

@ -21,10 +21,6 @@
'target_name': 'common_video_unittests_apk', 'target_name': 'common_video_unittests_apk',
'type': 'none', 'type': 'none',
}, },
{
'target_name': 'metrics_unittests',
'type': 'none',
},
{ {
'target_name': 'modules_tests_apk', 'target_name': 'modules_tests_apk',
'type': 'none', 'type': 'none',

54
webrtc/test/metrics.gyp
View File

@ -28,59 +28,5 @@
'testsupport/metrics/video_metrics.cc', 'testsupport/metrics/video_metrics.cc',
], ],
}, },
{
'target_name': 'metrics_unittests',
'type': '<(gtest_target_type)',
'dependencies': [
'metrics',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'testsupport/metrics/video_metrics_unittest.cc',
],
'conditions': [
# TODO(henrike): remove build_with_chromium==1 when the bots are
# using Chromium's buildbots.
['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', {
'dependencies': [
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
],
}],
],
},
], # targets ], # targets
'conditions': [
# TODO(henrike): remove build_with_chromium==1 when the bots are using
# Chromium's buildbots.
['include_tests==1 and build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', {
'targets': [
{
'target_name': 'metrics_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):metrics_unittests_apk',
],
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'metrics_unittests_run',
'type': 'none',
'dependencies': [
'metrics_unittests',
],
'includes': [
'../build/isolate.gypi',
'metrics_unittests.isolate',
],
'sources': [
'metrics_unittests.isolate',
],
},
],
}],
],
} }

38
webrtc/test/metrics_unittests.isolate
View File

@ -1,38 +0,0 @@
# Copyright (c) 2013 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.
{
'conditions': [
['OS=="android"', {
# When doing Android builds, the WebRTC code is put in third_party/webrtc
# of a Chromium checkout, this is one level above the standalone build.
'variables': {
'isolate_dependency_untracked': [
'../../../data/',
'../../../resources/',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/metrics_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../DEPS',
'../../resources/foreman_cif_short.yuv',
'../../testing/test_env.py',
'<(PRODUCT_DIR)/metrics_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarming_client/',
],
},
}],
],
}