Add isolate configuration for Android for all tests.
In https://code.google.com/p/webrtc/source/detail?r=4407
henrike@ added the path to the WebRTC resources and
data directories for Android that are required in order to
use isolate for test execution on Android.
This CL adds similar entries to the rest of the .isolate
files added in
https://code.google.com/p/webrtc/source/detail?r=4590.
It also removes three accidentally added .isolate files that originated
from old test names:
* audio_device_test_api
* video_capture_module_test
* video_render_module_test
BUG=1882,1916
TEST=trybots passing.
R=tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2107004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4627 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/common_audio/common_audio_unittests.isolate b/common_audio/common_audio_unittests.isolate
index 7eedcd7..e6b1db6 100644
--- a/common_audio/common_audio_unittests.isolate
+++ b/common_audio/common_audio_unittests.isolate
@@ -7,6 +7,16 @@
# 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': [
diff --git a/common_video/common_video_unittests.isolate b/common_video/common_video_unittests.isolate
index f173ff7..e96645a 100644
--- a/common_video/common_video_unittests.isolate
+++ b/common_video/common_video_unittests.isolate
@@ -7,6 +7,16 @@
# 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': [
diff --git a/modules/audio_coding/neteq/neteq_unittests.isolate b/modules/audio_coding/neteq/neteq_unittests.isolate
index a2c0613..78d805c 100644
--- a/modules/audio_coding/neteq/neteq_unittests.isolate
+++ b/modules/audio_coding/neteq/neteq_unittests.isolate
@@ -7,6 +7,16 @@
# 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': [
diff --git a/modules/audio_coding/neteq4/audio_decoder_unittests.isolate b/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
index 33c4a4b..6317780 100644
--- a/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
+++ b/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
@@ -7,6 +7,16 @@
# 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': [
+ '../../../../../resources/',
+ '../../../../../data/',
+ ],
+ },
+ }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
diff --git a/modules/audio_device/audio_device_test_api.isolate b/modules/audio_device/audio_device_test_api.isolate
deleted file mode 100644
index ec04929..0000000
--- a/modules/audio_device/audio_device_test_api.isolate
+++ /dev/null
@@ -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)',
- ],
- },
- }],
- ],
-}
diff --git a/modules/audio_device/audio_device_tests.isolate b/modules/audio_device/audio_device_tests.isolate
index 65b1b06..38b397f 100644
--- a/modules/audio_device/audio_device_tests.isolate
+++ b/modules/audio_device/audio_device_tests.isolate
@@ -7,6 +7,16 @@
# 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': [
diff --git a/modules/modules_tests.isolate b/modules/modules_tests.isolate
index 36eb446..a473720 100644
--- a/modules/modules_tests.isolate
+++ b/modules/modules_tests.isolate
@@ -7,6 +7,16 @@
# 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': [
@@ -20,7 +30,7 @@
'../../resources/audio_coding/teststereo32kHz.pcm',
'../../resources/foreman_cif.yuv',
'../../resources/paris_qcif.yuv',
- '../../testing/test_env.py',
+ '../../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',
diff --git a/modules/modules_unittests.isolate b/modules/modules_unittests.isolate
index 353c24e..43e659c 100644
--- a/modules/modules_unittests.isolate
+++ b/modules/modules_unittests.isolate
@@ -8,10 +8,12 @@
{
'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': [
- '../../../resources/',
'../../../data/',
+ '../../../resources/',
],
},
}],
diff --git a/modules/video_capture/video_capture_module_test.isolate b/modules/video_capture/video_capture_module_test.isolate
deleted file mode 100644
index 1c3a4b5..0000000
--- a/modules/video_capture/video_capture_module_test.isolate
+++ /dev/null
@@ -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)',
- ],
- },
- }],
- ],
-}
diff --git a/modules/video_capture/video_capture_tests.isolate b/modules/video_capture/video_capture_tests.isolate
index fd4ed0e..bafbd8b 100644
--- a/modules/video_capture/video_capture_tests.isolate
+++ b/modules/video_capture/video_capture_tests.isolate
@@ -7,6 +7,16 @@
# 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': [
diff --git a/modules/video_render/video_render_module_test.isolate b/modules/video_render/video_render_module_test.isolate
deleted file mode 100644
index 6157b6d..0000000
--- a/modules/video_render/video_render_module_test.isolate
+++ /dev/null
@@ -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)',
- ],
- },
- }],
- ],
-}
diff --git a/modules/video_render/video_render_tests.isolate b/modules/video_render/video_render_tests.isolate
index ffc875d..bd596be 100644
--- a/modules/video_render/video_render_tests.isolate
+++ b/modules/video_render/video_render_tests.isolate
@@ -7,6 +7,16 @@
# 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': [
diff --git a/system_wrappers/source/system_wrappers_unittests.isolate b/system_wrappers/source/system_wrappers_unittests.isolate
index 84672c7..c13ad88 100644
--- a/system_wrappers/source/system_wrappers_unittests.isolate
+++ b/system_wrappers/source/system_wrappers_unittests.isolate
@@ -8,6 +8,16 @@
{
'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': [
+ '../../../../resources/',
+ '../../../../data/',
+ ],
+ },
+ }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
diff --git a/test/metrics_unittests.isolate b/test/metrics_unittests.isolate
index 5254df0..52287e3 100644
--- a/test/metrics_unittests.isolate
+++ b/test/metrics_unittests.isolate
@@ -7,6 +7,16 @@
# 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': [
diff --git a/test/test_support_unittests.isolate b/test/test_support_unittests.isolate
index d60dce4..3384ab8 100644
--- a/test/test_support_unittests.isolate
+++ b/test/test_support_unittests.isolate
@@ -7,6 +7,16 @@
# 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': [
diff --git a/test/testsupport/metrics/video_metrics_unittest.cc b/test/testsupport/metrics/video_metrics_unittest.cc
index 2803322..21f86aa 100644
--- a/test/testsupport/metrics/video_metrics_unittest.cc
+++ b/test/testsupport/metrics/video_metrics_unittest.cc
@@ -140,4 +140,11 @@
&psnr_result_, &ssim_result_));
}
+// Dummy test to get at least one test in this executable for Android
+// (otherwise gtest will fail execution on Android).
+// TODO(kjellander): Remove when the other tests have been fixed for
+// Android.
+TEST_F(VideoMetricsTest, DummyTest) {
+}
+
} // namespace webrtc
diff --git a/tools/tools_unittests.isolate b/tools/tools_unittests.isolate
index 60c2231..14bd899 100644
--- a/tools/tools_unittests.isolate
+++ b/tools/tools_unittests.isolate
@@ -7,6 +7,16 @@
# 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': [
diff --git a/video_engine/test/auto_test/vie_auto_test.isolate b/video_engine/test/auto_test/vie_auto_test.isolate
index fb3b930..44418bf 100644
--- a/video_engine/test/auto_test/vie_auto_test.isolate
+++ b/video_engine/test/auto_test/vie_auto_test.isolate
@@ -7,6 +7,16 @@
# 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': [
diff --git a/video_engine/video_engine_core_unittests.isolate b/video_engine/video_engine_core_unittests.isolate
index 28f5151..a82611b 100644
--- a/video_engine/video_engine_core_unittests.isolate
+++ b/video_engine/video_engine_core_unittests.isolate
@@ -7,6 +7,16 @@
# 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': [
diff --git a/voice_engine/voe_auto_test.isolate b/voice_engine/voe_auto_test.isolate
index 465ec1a..3401e3f 100644
--- a/voice_engine/voe_auto_test.isolate
+++ b/voice_engine/voe_auto_test.isolate
@@ -7,6 +7,16 @@
# 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': [
diff --git a/voice_engine/voice_engine_unittests.isolate b/voice_engine/voice_engine_unittests.isolate
index d90fa3c..4c17afa 100644
--- a/voice_engine/voice_engine_unittests.isolate
+++ b/voice_engine/voice_engine_unittests.isolate
@@ -7,6 +7,16 @@
# 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': [