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

Add APK and isolate target for video_engine_tests

Browse Source 
Add .isolate file and _run target for video_engine_tests.

Move tools/swarm_client to be untracked in all .isolate file,
so refactorings in swarm_client doesn't require us updating
all our .isolate files (similar to the changes for the
Chromium tests done in:
https://src.chromium.org/viewvc/chrome?view=rev&revision=218844)

Update modules_unittests.isolate with new NetEq4 reference files
needed.

TEST=trybots passing
I also setup a Chromium workspace where I patched third_party/webrtc
with the changes in this CL, followed by compiling with the settings
described in
https://code.google.com/p/webrtc/issues/detail?id=1882#c11
I then verified that the video_engine_tests_apk dir was created
in the output folder.
BUG=1916,2462
R=andrew@webrtc.org, henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4925 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2013-10-04 18:20:38 +00:00
parent 6c264cc92e
commit 3f9288f987
21 changed files with 147 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/build/apk_tests.gyp
View File

@ -173,6 +173,20 @@
],
},
{
'target_name': 'video_engine_tests_apk',
'type': 'none',
'variables': {
'test_suite_name': 'video_engine_tests',
'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)video_engine_tests<(SHARED_LIB_SUFFIX)',
},
'dependencies': [
'<(webrtc_root)/video_engine/video_engine.gyp:video_engine_tests',
],
'includes': [
'../../../build/apk_test.gypi',
],
},
{
'target_name': 'voice_engine_unittests_apk',
'type': 'none',
'variables': {
@ -185,7 +199,7 @@
'includes': [
'../../../build/apk_test.gypi',
],
},
},
],
}

4
webrtc/build/apk_tests_noop.gyp
View File

@ -53,6 +53,10 @@
'target_name': 'video_engine_core_unittests_apk',
'type': 'none',
},
{
'target_name': 'video_engine_tests_apk',
'type': 'none',
},
{
'target_name': 'voice_engine_unittests_apk',
'type': 'none',

6
webrtc/common_audio/common_audio_unittests.isolate
View File

@ -26,11 +26,11 @@
],
'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)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
],
},
}],
],

6
webrtc/common_video/common_video_unittests.isolate
View File

@ -28,11 +28,11 @@
'../../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)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
],
},
}],
],

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

@ -34,11 +34,11 @@
'../../../../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)',
],
'isolate_dependency_untracked': [
'../../../../tools/swarm_client/',
],
},
}],
],

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

@ -30,11 +30,11 @@
'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)',
],
'isolate_dependency_untracked': [
'../../../../tools/swarm_client/',
],
},
}],
],

6
webrtc/modules/audio_device/audio_device_tests.isolate
View File

@ -26,11 +26,11 @@
],
'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_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../../tools/swarm_client/',
],
},
}],
],

6
webrtc/modules/modules_tests.isolate
View File

@ -31,11 +31,11 @@
'../../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_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
],
},
}],
],

11
webrtc/modules/modules_unittests.isolate
View File

@ -25,8 +25,11 @@
'<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../data/voice_engine/audio_tiny48.wav',
'../../DEPS',
'../../data/voice_engine/audio_tiny48.wav',
'../../resources/audio_coding/neteq4_network_stats.dat',
'../../resources/audio_coding/neteq4_rtcp_stats.dat',
'../../resources/audio_coding/neteq4_universal_ref.pcm',
'../../resources/audio_coding/neteq_network_stats.dat',
'../../resources/audio_coding/neteq_rtcp_stats.dat',
'../../resources/audio_coding/neteq_universal_new.rtp',
@ -48,11 +51,11 @@
'../../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)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
],
},
}],
],

6
webrtc/modules/video_capture/video_capture_tests.isolate
View File

@ -26,11 +26,11 @@
],
'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_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../../tools/swarm_client/',
],
},
}],
],

6
webrtc/modules/video_render/video_render_tests.isolate
View File

@ -26,11 +26,11 @@
],
'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_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../../tools/swarm_client/',
],
},
}],
],

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

@ -13,8 +13,8 @@
# of a Chromium checkout, this is one level above the standalone build.
'variables': {
'isolate_dependency_untracked': [
'../../../../resources/',
'../../../../data/',
'../../../../resources/',
],
},
}],
@ -27,10 +27,11 @@
],
'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)',
],
'isolate_dependency_untracked': [
'../../../tools/swarm_client/',
],
},
}],
],

6
webrtc/test/metrics_unittests.isolate
View File

@ -28,11 +28,11 @@
'../../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)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
],
},
}],
],

6
webrtc/test/test_support_unittests.isolate
View File

@ -27,11 +27,11 @@
'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)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
],
},
}],
],

6
webrtc/tools/tools_unittests.isolate
View File

@ -28,11 +28,11 @@
'../../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)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
],
},
}],
],

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

@ -29,11 +29,11 @@
],
'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)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
],
},
}],
],

37
webrtc/video_engine/test/tests.gypi
View File

@ -132,7 +132,7 @@
},
{
'target_name': 'video_engine_tests',
'type': 'executable',
'type': '<(gtest_target_type)',
'sources': [
'call_tests.cc',
'full_stack.cc',
@ -146,5 +146,38 @@
'video_tests_common',
],
},
],
], # targets
'conditions': [
# TODO(henrike): remove build_with_chromium==1 when the bots are using
# Chromium's buildbots.
['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', {
'targets': [
{
'target_name': 'video_engine_tests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):video_engine_tests_apk',
],
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'video_engine_tests_run',
'type': 'none',
'dependencies': [
'video_engine_tests',
],
'includes': [
'../../build/isolate.gypi',
'video_engine_tests.isolate',
],
'sources': [
'video_engine_tests.isolate',
],
},
],
}],
], # conditions
}

37
webrtc/video_engine/test/video_engine_tests.isolate Normal file
View File

@ -0,0 +1,37 @@
# 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=="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': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../../../testing/test_env.py',
'<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../../tools/swarm_client/',
],
},
}],
],
}

6
webrtc/video_engine/video_engine_core_unittests.isolate
View File

@ -26,11 +26,11 @@
],
'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)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
],
},
}],
],

6
webrtc/voice_engine/voe_auto_test.isolate
View File

@ -26,11 +26,11 @@
],
'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)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
],
},
}],
],

6
webrtc/voice_engine/voice_engine_unittests.isolate
View File

@ -26,11 +26,11 @@
],
'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)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
],
},
}],
],