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

Revert 4547 "Isolate GYP target and .isolate files for tests"

Browse Source 
As this breaks the FYI bots in 
http://build.chromium.org/p/chromium.webrtc.fyi/waterfall
due to different path to isolate.gypi (which cannot easily
be resolved due to limitations in GYP)

> Isolate GYP target and .isolate files for tests
> 
> Implemented according to the instructions at
> http://www.chromium.org/developers/testing/isolated-testing
> 
> Workflow has been like this:
> 1. create _run GYP target
> 2. create a stripped down .isolate file
> 3. export GYP_DEFINES="$GYP_DEFINES test_isolation_mode=check"
> 4. runhooks
> 5. compile
> 6. test if the test would run (i.e. find it's dependencies) without
>    actually executing it:
>    tools/swarm_client/isolate.py run --isolated out/Release/testname.isolated
> 7. If failing, run the fix_test_cases.py script like this:
>    tools/swarm_client/fix_test_cases.py --isolated out/Release/testname.isolated
> 
> All tests that run on the bots for WebRTC has got _run target
> and .isolate file created.
> 
> "Normal tests" that run fine on any machine:
> * audio_decoder_unittests
> * common_audio_unittests
> * common_video_unittests
> * metrics_unittests
> * modules_integrationtests
> * modules_unittests
> * neteq_unittests
> * system_wrappers_unittests
> * test_support_unittests
> * tools_unittests
> * video_engine_core_unittests
> * voice_engine_unittests
> 
> Tests that requires bare-metal and audio/video devices:
> * audio_device_integrationtests
> * video_capture_integrationtests
> 
> I also added the isolate boilerplate code for the following
> tests that are not yet pure gtest binaries (which means they
> cannot run isolated yet):
> * video_render_integrationtests
> * vie_auto_test
> * voe_auto_test
> 
> TEST=running isolate.py as described above.
> BUG=1916
> R=tommi@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/1673004

TBR=kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4548 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2013-08-15 11:29:58 +00:00
parent d7a4d235d2
commit 4298f73031
38 changed files with 5 additions and 894 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -85,7 +85,6 @@
/tools/gyp
/tools/protoc_wrapper
/tools/python
/tools/swarm_client
/tools/valgrind
/tools/win
/webrtc/supplement.gypi

3
DEPS
View File

@ -101,9 +101,6 @@ deps = {
"tools/python":
Var("chromium_trunk") + "/src/tools/python@" + Var("chromium_revision"),
"tools/swarm_client":
Var("chromium_trunk") + "/tools/swarm_client@" + Var("chromium_revision"),
"tools/valgrind":
Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chromium_revision"),

3
PRESUBMIT.py
View File

@ -106,8 +106,7 @@ def _CommonChecks(input_api, output_api):
r'^tools/protoc_wrapper/.*\.py$',
r'^tools/python/.*\.py$',
r'^tools/python_charts/data/.*\.py$',
r'^tools/refactoring/.*\.py$',
r'^tools/swarm_client/.*\.py$',
r'^tools/refactoring.*\.py$',
# TODO(phoglund): should arguably be checked.
r'^tools/valgrind-webrtc/.*\.py$',
r'^tools/valgrind/.*\.py$',

20
webrtc/common_audio/common_audio.gyp
View File

@ -219,25 +219,7 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'common_audio_unittests_run',
'type': 'none',
'dependencies': [
'common_audio_unittests',
],
'includes': [
'../../build/isolate.gypi',
'common_audio_unittests.isolate',
],
'sources': [
'common_audio_unittests.isolate',
],
},
],
}],
],
]
}],
], # conditions
}

27
webrtc/common_audio/common_audio_unittests.isolate
View File

@ -1,27 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../testing/test_env.py',
'../../tools/swarm_client/run_isolated.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

18
webrtc/common_video/common_video.gyp
View File

@ -122,24 +122,6 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'common_video_unittests_run',
'type': 'none',
'dependencies': [
'common_video_unittests',
],
'includes': [
'../../build/isolate.gypi',
'common_video_unittests.isolate',
],
'sources': [
'common_video_unittests.isolate',
],
},
],
}],
],
}], # include_tests
],

29
webrtc/common_video/common_video_unittests.isolate
View File

@ -1,29 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../DEPS',
'../../resources/foreman_cif.yuv',
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'../../tools/swarm_client/run_isolated.py',
'../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

18
webrtc/modules/audio_coding/neteq/neteq.gypi
View File

@ -231,24 +231,6 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'neteq_unittests_run',
'type': 'none',
'dependencies': [
'neteq_unittests',
],
'includes': [
'../../../../build/isolate.gypi',
'neteq_unittests.isolate',
],
'sources': [
'neteq_unittests.isolate',
],
},
],
}],
],
}], # include_tests
], # conditions

35
webrtc/modules/audio_coding/neteq/neteq_unittests.isolate
View File

@ -1,35 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../../../testing/test_env.py',
'../../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/neteq_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_touched': [
'../../../../DEPS',
],
'isolate_dependency_tracked': [
'../../../../resources/audio_coding/neteq_network_stats.dat',
'../../../../resources/audio_coding/neteq_rtcp_stats.dat',
'../../../../resources/audio_coding/neteq_universal.rtp',
'../../../../resources/audio_coding/neteq_universal_ref.pcm',
'../../../../resources/audio_coding/testfile32kHz.pcm',
'../../../../testing/test_env.py',
'../../../../tools/swarm_client/run_isolated.py',
'../../../../tools/swarm_client/googletest/run_test_cases.py',
'../../../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/neteq_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

31
webrtc/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
View File

@ -1,31 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../../../testing/test_env.py',
'../../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_touched': [
'../../../../DEPS',
],
'isolate_dependency_tracked': [
'../../../../resources/audio_coding/testfile32kHz.pcm',
'../../../../testing/test_env.py',
'../../../../tools/swarm_client/run_isolated.py',
'../../../../tools/swarm_client/googletest/run_test_cases.py',
'../../../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

18
webrtc/modules/audio_coding/neteq4/neteq.gypi
View File

@ -204,24 +204,6 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'audio_decoder_unittests_run',
'type': 'none',
'dependencies': [
'audio_decoder_unittests',
],
'includes': [
'../../../../build/isolate.gypi',
'audio_decoder_unittests.isolate',
],
'sources': [
'audio_decoder_unittests.isolate',
],
},
],
}],
],
}], # include_tests
], # conditions

22
webrtc/modules/audio_device/audio_device.gypi
View File

@ -219,28 +219,8 @@
'test/func_test_manager.h',
],
},
], # targets
'conditions': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'audio_device_integrationtests_run',
'type': 'none',
'dependencies': [
'audio_device_integrationtests',
],
'includes': [
'../../../build/isolate.gypi',
'audio_device_integrationtests.isolate',
],
'sources': [
'audio_device_integrationtests.isolate',
],
},
],
}],
],
}], # include_tests
}],
],
}

27
webrtc/modules/audio_device/audio_device_integrationtests.isolate
View File

@ -1,27 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/audio_device_integrationtests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/run_isolated.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'../../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/audio_device_integrationtests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

27
webrtc/modules/audio_device/audio_device_test_api.isolate
View File

@ -1,27 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/audio_device_test_api<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/run_isolated.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'../../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/audio_device_test_api<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

32
webrtc/modules/modules.gyp
View File

@ -335,38 +335,6 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'modules_integrationtests_run',
'type': 'none',
'dependencies': [
'modules_integrationtests',
],
'includes': [
'../../build/isolate.gypi',
'modules_integrationtests.isolate',
],
'sources': [
'modules_integrationtests.isolate',
],
},
{
'target_name': 'modules_unittests_run',
'type': 'none',
'dependencies': [
'modules_unittests',
],
'includes': [
'../../build/isolate.gypi',
'modules_unittests.isolate',
],
'sources': [
'modules_unittests.isolate',
],
},
],
}],
],
}], # include_tests
], # conditions

32
webrtc/modules/modules_integrationtests.isolate
View File

@ -1,32 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/modules_integrationtests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../DEPS',
'../../resources/audio_coding/testfile32kHz.pcm',
'../../resources/audio_coding/teststereo32kHz.pcm',
'../../resources/foreman_cif.yuv',
'../../resources/paris_qcif.yuv',
'../../testing/test_env.py',
'../../tools/swarm_client/run_isolated.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/modules_integrationtests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

40
webrtc/modules/modules_unittests.isolate
View File

@ -15,43 +15,5 @@
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../data/voice_engine/audio_tiny48.wav',
'../../DEPS',
'../../resources/audio_coding/neteq_network_stats.dat',
'../../resources/audio_coding/neteq_rtcp_stats.dat',
'../../resources/audio_coding/neteq_universal_new.rtp',
'../../resources/audio_coding/neteq_universal_ref.pcm',
'../../resources/audio_coding/testfile32kHz.pcm',
'../../resources/deflicker_before_cif_short.yuv',
'../../resources/far16_stereo.pcm',
'../../resources/far32_stereo.pcm',
'../../resources/far8_stereo.pcm',
'../../resources/foremanColorEnhanced_cif_short.yuv',
'../../resources/foreman_cif.yuv',
'../../resources/foreman_cif_short.yuv',
'../../resources/near16_stereo.pcm',
'../../resources/near32_stereo.pcm',
'../../resources/near8_stereo.pcm',
'../../resources/video_coding/frame-ethernet-ii.pcap',
'../../resources/video_coding/frame-loopback.pcap',
'../../resources/video_coding/pltype103.rtp',
'../../resources/video_coding/ssrcs-2.pcap',
'../../resources/video_coding/ssrcs-3.pcap',
'../../testing/test_env.py',
'../../tools/swarm_client/run_isolated.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}
}

20
webrtc/modules/video_capture/video_capture.gypi
View File

@ -187,26 +187,6 @@
}], # OS!="mac"
] # conditions
},
], # targets
'conditions': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'video_capture_integrationtests_run',
'type': 'none',
'dependencies': [
'video_capture_integrationtests',
],
'includes': [
'../../../build/isolate.gypi',
'video_capture_integrationtests.isolate',
],
'sources': [
'video_capture_integrationtests.isolate',
],
},
],
}],
],
}],
],

27
webrtc/modules/video_capture/video_capture_integrationtests.isolate
View File

@ -1,27 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/video_capture_integrationtests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/run_isolated.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'../../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/video_capture_integrationtests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

27
webrtc/modules/video_capture/video_capture_module_test.isolate
View File

@ -1,27 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/vp8_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/run_isolated.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'../../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/vp8_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

20
webrtc/modules/video_render/video_render.gypi
View File

@ -200,26 +200,6 @@
] # conditions
}, # video_render_module_test
], # targets
'conditions': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'video_render_integrationtests_run',
'type': 'none',
'dependencies': [
'video_render_integrationtests',
],
'includes': [
'../../../build/isolate.gypi',
'video_render_integrationtests.isolate',
],
'sources': [
'video_render_integrationtests.isolate',
],
},
],
}],
],
}], # include_tests==0
], # conditions
}

27
webrtc/modules/video_render/video_render_integrationtests.isolate
View File

@ -1,27 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/video_render_integrationtests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/run_isolated.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'../../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/video_render_integrationtests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

27
webrtc/modules/video_render/video_render_module_test.isolate
View File

@ -1,27 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/video_render_module_test<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/run_isolated.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'../../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/video_render_module_test<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

18
webrtc/system_wrappers/source/system_wrappers_tests.gyp
View File

@ -73,24 +73,6 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'system_wrappers_unittests_run',
'type': 'none',
'dependencies': [
'system_wrappers_unittests',
],
'includes': [
'../../../build/isolate.gypi',
'system_wrappers_unittests.isolate',
],
'sources': [
'system_wrappers_unittests.isolate',
],
},
],
}],
],
}

27
webrtc/system_wrappers/source/system_wrappers_unittests.isolate
View File

@ -1,27 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/run_isolated.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

20
webrtc/test/metrics.gyp
View File

@ -52,7 +52,7 @@
}],
],
},
], # targets
],
'conditions': [
# TODO(henrike): remove build_with_chromium==1 when the bots are using
# Chromium's buildbots.
@ -67,23 +67,5 @@
},
],
}],
['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',
],
},
],
}],
],
}

29
webrtc/test/metrics_unittests.isolate
View File

@ -1,29 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/metrics_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../DEPS',
'../../resources/foreman_cif_short.yuv',
'../../testing/test_env.py',
'../../tools/swarm_client/run_isolated.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/metrics_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

18
webrtc/test/test.gyp
View File

@ -201,23 +201,5 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'test_support_unittests_run',
'type': 'none',
'dependencies': [
'test_support_unittests',
],
'includes': [
'../../build/isolate.gypi',
'test_support_unittests.isolate',
],
'sources': [
'test_support_unittests.isolate',
],
},
],
}],
],
}

28
webrtc/test/test_support_unittests.isolate
View File

@ -1,28 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../DEPS',
'../../testing/test_env.py',
'../../tools/swarm_client/run_isolated.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

18
webrtc/tools/tools.gyp
View File

@ -150,24 +150,6 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'tools_unittests_run',
'type': 'none',
'dependencies': [
'tools_unittests',
],
'includes': [
'../../build/isolate.gypi',
'tools_unittests.isolate',
],
'sources': [
'tools_unittests.isolate',
],
},
],
}],
],
}], # include_tests
], # conditions

29
webrtc/tools/tools_unittests.isolate
View File

@ -1,29 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../DEPS',
'../../resources/foreman_cif.yuv',
'../../testing/test_env.py',
'../../tools/swarm_client/run_isolated.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

20
webrtc/video_engine/test/auto_test/vie_auto_test.gypi
View File

@ -126,24 +126,4 @@
],
},
],
'conditions': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'vie_auto_test_run',
'type': 'none',
'dependencies': [
'vie_auto_test',
],
'includes': [
'../../../../build/isolate.gypi',
'vie_auto_test.isolate',
],
'sources': [
'vie_auto_test.isolate',
],
},
],
}],
],
}

30
webrtc/video_engine/test/auto_test/vie_auto_test.isolate
View File

@ -1,30 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../../../testing/test_env.py',
'../../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_touched': [
'../../../../DEPS',
],
'isolate_dependency_tracked': [
'../../../../testing/test_env.py',
'../../../../tools/swarm_client/run_isolated.py',
'../../../../tools/swarm_client/googletest/run_test_cases.py',
'../../../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

18
webrtc/video_engine/video_engine_core.gypi
View File

@ -182,24 +182,6 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'video_engine_core_unittests_run',
'type': 'none',
'dependencies': [
'video_engine_core_unittests',
],
'includes': [
'../../build/isolate.gypi',
'video_engine_core_unittests.isolate',
],
'sources': [
'video_engine_core_unittests.isolate',
],
},
],
}],
],
}], # include_tests
], # conditions

27
webrtc/video_engine/video_engine_core_unittests.isolate
View File

@ -1,27 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../testing/test_env.py',
'../../tools/swarm_client/run_isolated.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

27
webrtc/voice_engine/voe_auto_test.isolate
View File

@ -1,27 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../testing/test_env.py',
'../../tools/swarm_client/run_isolated.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

32
webrtc/voice_engine/voice_engine.gyp
View File

@ -320,38 +320,6 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'voice_engine_unittests_run',
'type': 'none',
'dependencies': [
'voice_engine_unittests',
],
'includes': [
'../../build/isolate.gypi',
'voice_engine_unittests.isolate',
],
'sources': [
'voice_engine_unittests.isolate',
],
},
{
'target_name': 'voe_auto_test_run',
'type': 'none',
'dependencies': [
'voe_auto_test',
],
'includes': [
'../../build/isolate.gypi',
'voe_auto_test.isolate',
],
'sources': [
'voe_auto_test.isolate',
],
},
],
}],
], # conditions
}], # include_tests
], # conditions

27
webrtc/voice_engine/voice_engine_unittests.isolate
View File

@ -1,27 +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=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../testing/test_env.py',
'../../tools/swarm_client/run_isolated.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'../../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}