Update isolate files for Android APK tests.
This should speed up test execution on Android since only
the files needed by the test will be processed (instead
of the whole data + resources directories).
A few files for modules_unittests had to be explicitly added
for Android, since they were previously a part of the
add-whole-directories entries for the resources and data
directories.
BUG=webrtc:3741
TEST=Passing android+android_rel trybots.
R=phoglund@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/22559004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7694 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/common_audio/common_audio_unittests.isolate b/webrtc/common_audio/common_audio_unittests.isolate
index 80eb0fc..3bc26d5 100644
--- a/webrtc/common_audio/common_audio_unittests.isolate
+++ b/webrtc/common_audio/common_audio_unittests.isolate
@@ -7,14 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
- 'variables': {
- 'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
- ],
- },
- }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
diff --git a/webrtc/common_video/common_video_unittests.isolate b/webrtc/common_video/common_video_unittests.isolate
index 7082365..7201883 100644
--- a/webrtc/common_video/common_video_unittests.isolate
+++ b/webrtc/common_video/common_video_unittests.isolate
@@ -7,11 +7,10 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
+ ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', {
'variables': {
'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
+ '<(DEPTH)/resources/foreman_cif.yuv',
],
},
}],
@@ -23,7 +22,6 @@
],
'files': [
'<(DEPTH)/DEPS',
- '<(DEPTH)/resources/foreman_cif.yuv',
'<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)',
],
diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate
index ed7599d..c559d54 100644
--- a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate
+++ b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate
@@ -7,11 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
+ ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', {
'variables': {
'files': [
- '<(DEPTH)/resources/',
- '<(DEPTH)/data/',
+ '<(DEPTH)/resources/audio_coding/music_stereo_48kHz.pcm',
+ '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm',
+ '<(DEPTH)/resources/audio_coding/speech_mono_32_48kHz.pcm',
],
},
}],
@@ -23,9 +24,6 @@
],
'files': [
'<(DEPTH)/DEPS',
- '<(DEPTH)/resources/audio_coding/music_stereo_48kHz.pcm',
- '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm',
- '<(DEPTH)/resources/audio_coding/speech_mono_32_48kHz.pcm',
'<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/audio_codec_speed_tests<(EXECUTABLE_SUFFIX)',
],
diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate b/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate
index f10b327..bec68f1 100644
--- a/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate
@@ -7,11 +7,10 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
+ ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', {
'variables': {
'files': [
- '<(DEPTH)/resources/',
- '<(DEPTH)/data/',
+ '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm',
],
},
}],
@@ -23,7 +22,6 @@
],
'files': [
'<(DEPTH)/DEPS',
- '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm',
'<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
],
diff --git a/webrtc/modules/audio_device/audio_device_tests.isolate b/webrtc/modules/audio_device/audio_device_tests.isolate
index a3550b7..f5a0c18 100644
--- a/webrtc/modules/audio_device/audio_device_tests.isolate
+++ b/webrtc/modules/audio_device/audio_device_tests.isolate
@@ -7,14 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
- 'variables': {
- 'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
- ],
- },
- }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
diff --git a/webrtc/modules/modules_tests.isolate b/webrtc/modules/modules_tests.isolate
index c29c65b..20234c3 100644
--- a/webrtc/modules/modules_tests.isolate
+++ b/webrtc/modules/modules_tests.isolate
@@ -7,11 +7,13 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
+ ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', {
'variables': {
'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
+ '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm',
+ '<(DEPTH)/resources/audio_coding/teststereo32kHz.pcm',
+ '<(DEPTH)/resources/foreman_cif.yuv',
+ '<(DEPTH)/resources/paris_qcif.yuv',
],
},
}],
@@ -23,10 +25,6 @@
],
'files': [
'<(DEPTH)/DEPS',
- '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm',
- '<(DEPTH)/resources/audio_coding/teststereo32kHz.pcm',
- '<(DEPTH)/resources/foreman_cif.yuv',
- '<(DEPTH)/resources/paris_qcif.yuv',
'<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)',
],
diff --git a/webrtc/modules/modules_unittests.isolate b/webrtc/modules/modules_unittests.isolate
index 967ff32..c5a0a28 100644
--- a/webrtc/modules/modules_unittests.isolate
+++ b/webrtc/modules/modules_unittests.isolate
@@ -10,19 +10,13 @@
['OS=="android"', {
'variables': {
'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
+ '<(DEPTH)/data/audio_processing/output_data_fixed.pb',
],
},
}],
- ['OS=="linux" or OS=="mac" or OS=="win"', {
+ ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', {
'variables': {
- 'command': [
- '<(DEPTH)/testing/test_env.py',
- '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
- ],
'files': [
- '<(DEPTH)/DEPS',
'<(DEPTH)/data/audio_processing/output_data_float.pb',
'<(DEPTH)/data/voice_engine/audio_tiny48.wav',
'<(DEPTH)/resources/att-downlink.rx',
@@ -36,7 +30,10 @@
'<(DEPTH)/resources/audio_coding/neteq_rtcp_stats.dat',
'<(DEPTH)/resources/audio_coding/neteq_universal_new.rtp',
'<(DEPTH)/resources/audio_coding/neteq_universal_ref.pcm',
+ '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm',
+ '<(DEPTH)/resources/audio_coding/speech_mono_32_48kHz.pcm',
'<(DEPTH)/resources/audio_coding/testfile32kHz.pcm',
+ '<(DEPTH)/resources/audio_coding/teststereo32kHz.pcm',
'<(DEPTH)/resources/deflicker_before_cif_short.yuv',
'<(DEPTH)/resources/far16_stereo.pcm',
'<(DEPTH)/resources/far32_stereo.pcm',
@@ -96,6 +93,17 @@
'<(DEPTH)/resources/video_coding/pltype103.rtp',
'<(DEPTH)/resources/video_coding/ssrcs-2.pcap',
'<(DEPTH)/resources/video_coding/ssrcs-3.pcap',
+ ],
+ },
+ }],
+ ['OS=="linux" or OS=="mac" or OS=="win"', {
+ 'variables': {
+ 'command': [
+ '<(DEPTH)/testing/test_env.py',
+ '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
+ ],
+ 'files': [
+ '<(DEPTH)/DEPS',
'<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
],
diff --git a/webrtc/modules/video_capture/video_capture_tests.isolate b/webrtc/modules/video_capture/video_capture_tests.isolate
index be10437..a0668e7 100644
--- a/webrtc/modules/video_capture/video_capture_tests.isolate
+++ b/webrtc/modules/video_capture/video_capture_tests.isolate
@@ -7,14 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
- 'variables': {
- 'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
- ],
- },
- }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
diff --git a/webrtc/modules/video_render/video_render_tests.isolate b/webrtc/modules/video_render/video_render_tests.isolate
index 12bfecf..ca59a8c 100644
--- a/webrtc/modules/video_render/video_render_tests.isolate
+++ b/webrtc/modules/video_render/video_render_tests.isolate
@@ -7,14 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
- 'variables': {
- 'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
- ],
- },
- }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
diff --git a/webrtc/system_wrappers/source/system_wrappers_unittests.isolate b/webrtc/system_wrappers/source/system_wrappers_unittests.isolate
index 0a56470..ec81664 100644
--- a/webrtc/system_wrappers/source/system_wrappers_unittests.isolate
+++ b/webrtc/system_wrappers/source/system_wrappers_unittests.isolate
@@ -8,14 +8,6 @@
{
'conditions': [
- ['OS=="android"', {
- 'variables': {
- 'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
- ],
- },
- }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
diff --git a/webrtc/test/test_support_unittests.isolate b/webrtc/test/test_support_unittests.isolate
index c1419e7..3fd89d6 100644
--- a/webrtc/test/test_support_unittests.isolate
+++ b/webrtc/test/test_support_unittests.isolate
@@ -7,14 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
- 'variables': {
- 'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
- ],
- },
- }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
diff --git a/webrtc/tools/tools_unittests.isolate b/webrtc/tools/tools_unittests.isolate
index bf1fd01..ebe4714 100644
--- a/webrtc/tools/tools_unittests.isolate
+++ b/webrtc/tools/tools_unittests.isolate
@@ -7,11 +7,10 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
+ ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', {
'variables': {
'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
+ '<(DEPTH)/resources/foreman_cif.yuv',
],
},
}],
@@ -23,7 +22,6 @@
],
'files': [
'<(DEPTH)/DEPS',
- '<(DEPTH)/resources/foreman_cif.yuv',
'<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)',
],
diff --git a/webrtc/video_engine/test/auto_test/vie_auto_test.isolate b/webrtc/video_engine/test/auto_test/vie_auto_test.isolate
index da09a6e..2579a20 100644
--- a/webrtc/video_engine/test/auto_test/vie_auto_test.isolate
+++ b/webrtc/video_engine/test/auto_test/vie_auto_test.isolate
@@ -7,14 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
- 'variables': {
- 'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
- ],
- },
- }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
diff --git a/webrtc/video_engine/video_engine_core_unittests.isolate b/webrtc/video_engine/video_engine_core_unittests.isolate
index b95d84c..c8d2fc9 100644
--- a/webrtc/video_engine/video_engine_core_unittests.isolate
+++ b/webrtc/video_engine/video_engine_core_unittests.isolate
@@ -7,14 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
- 'variables': {
- 'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
- ],
- },
- }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
diff --git a/webrtc/video_engine_tests.isolate b/webrtc/video_engine_tests.isolate
index fc84082..5aa9623 100644
--- a/webrtc/video_engine_tests.isolate
+++ b/webrtc/video_engine_tests.isolate
@@ -7,11 +7,10 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
+ ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', {
'variables': {
'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
+ '<(DEPTH)/resources/foreman_cif_short.yuv',
],
},
}],
@@ -22,7 +21,6 @@
],
'files': [
'<(DEPTH)/DEPS',
- '<(DEPTH)/resources/foreman_cif_short.yuv',
'<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)',
],
},
diff --git a/webrtc/voice_engine/voe_auto_test.isolate b/webrtc/voice_engine/voe_auto_test.isolate
index c13110e..e89620d 100644
--- a/webrtc/voice_engine/voe_auto_test.isolate
+++ b/webrtc/voice_engine/voe_auto_test.isolate
@@ -7,14 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
- 'variables': {
- 'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
- ],
- },
- }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
diff --git a/webrtc/voice_engine/voice_engine_unittests.isolate b/webrtc/voice_engine/voice_engine_unittests.isolate
index 4cd1f90..0d55515 100644
--- a/webrtc/voice_engine/voice_engine_unittests.isolate
+++ b/webrtc/voice_engine/voice_engine_unittests.isolate
@@ -7,14 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
- 'variables': {
- 'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
- ],
- },
- }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
diff --git a/webrtc/webrtc_perf_tests.isolate b/webrtc/webrtc_perf_tests.isolate
index 2c547be..24014af 100644
--- a/webrtc/webrtc_perf_tests.isolate
+++ b/webrtc/webrtc_perf_tests.isolate
@@ -7,11 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
- ['OS=="android"', {
+ ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', {
'variables': {
'files': [
- '<(DEPTH)/data/',
- '<(DEPTH)/resources/',
+ '<(DEPTH)/resources/foreman_cif.yuv',
+ '<(DEPTH)/resources/paris_qcif.yuv',
+ '<(DEPTH)/resources/voice_engine/audio_long16.pcm',
],
},
}],
@@ -22,9 +23,6 @@
],
'files': [
'<(DEPTH)/DEPS',
- '<(DEPTH)/resources/foreman_cif.yuv',
- '<(DEPTH)/resources/paris_qcif.yuv',
- '<(DEPTH)/resources/voice_engine/audio_long16.pcm',
'<(PRODUCT_DIR)/webrtc_perf_tests<(EXECUTABLE_SUFFIX)',
],
},