Adds isolate for rtc_unittests and moves sound's unittests to rtc_unittest.
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
diff --git a/webrtc/rtc_unittests.isolate b/webrtc/rtc_unittests.isolate
new file mode 100644
index 0000000..7bcfc85
--- /dev/null
+++ b/webrtc/rtc_unittests.isolate
@@ -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/',
+ ],
+ },
+ }],
+ ],
+}
diff --git a/webrtc/sound/sound_tests.gyp b/webrtc/sound/sound_tests.gyp
index 3fe3574..fbbb410 100644
--- a/webrtc/sound/sound_tests.gyp
+++ b/webrtc/sound/sound_tests.gyp
@@ -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',
- ],
- },
- ],
- }],
- ],
}
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index 1d862c6..6def87b 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -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',
],
},
@@ -156,6 +158,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',
'dependencies': [
