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

Adds isolate for rtc_unittests and moves sound's unittests to rtc_unittest.

Browse Source 
BUG=N/A
R=andrew@webrtc.org, kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7336 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-09-30 14:21:10 +00:00
parent 875206196c
commit 792d1a0541
3 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/rtc_unittests.isolate Normal file
View File

@ -0,0 +1,24 @@
# Copyright (c) 2014 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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'<(PRODUCT_DIR)/rtc_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/rtc_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'<(DEPTH)/tools/swarming_client/',
],
},
}],
],
}

40
webrtc/sound/sound_tests.gyp
View File

@ -10,40 +10,14 @@
'includes': [ '../build/common.gypi', ],
'targets': [
{
'target_name': 'rtc_sound_unittest',
'type': 'executable',
'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(webrtc_root)/sound/sound.gyp:rtc_sound',
],
'cflags_cc!': [
'-Wnon-virtual-dtor',
],
'sources': [
'automaticallychosensoundsystem_unittest.cc',
],
'target_name': 'rtc_sound_tests',
'type': 'none',
'direct_dependent_settings': {
'sources': [
'automaticallychosensoundsystem_unittest.cc',
],
},
},
],
'conditions': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'rtc_sound_unittest_run',
'type': 'none',
'dependencies': [
'rtc_sound_unittest',
],
'includes': [
'../build/isolate.gypi',
'rtc_sound_unittest.isolate',
],
'sources': [
'rtc_sound_unittest.isolate',
],
},
],
}],
],
}

16
webrtc/webrtc_tests.gypi
View File

@ -14,6 +14,8 @@
'base/base.gyp:rtc_base',
'base/base_tests.gyp:rtc_base_tests_utils',
'base/base_tests.gyp:rtc_base_tests',
'sound/sound.gyp:rtc_sound',
'sound/sound_tests.gyp:rtc_sound_tests',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
},
@ -155,6 +157,20 @@
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'rtc_unittests_run',
'type': 'none',
'dependencies': [
'rtc_unittests',
],
'includes': [
'build/isolate.gypi',
'rtc_unittests.isolate',
],
'sources': [
'rtc_unittests.isolate',
],
},
{
'target_name': 'video_engine_tests_run',
'type': 'none',