3365422c41
This is a re-land attempt of http://review.webrtc.org/1673004/ It now includes a build/isolate.gypi in WebRTC that includes the same file as the one that would be included when WebRTC is used in a Chromium checkout. It is needed since it is not possible to use variables in GYP's includes sections. 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/googletest/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_tests * 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_tests * video_capture_tests 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_tests * vie_auto_test * voe_auto_test TEST=running isolate.py as described above. WebRTC trybots passing. Created a Chromium checkout with third_party/webrtc ToT and this patch applied, passing the runhooks step. BUG=1916 R=henrike@webrtc.org, tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2056004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4590 4adac7df-926f-26a2-2b94-8c16560cd09d
90 lines
2.8 KiB
Python
90 lines
2.8 KiB
Python
# Copyright (c) 2011 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.
|
|
|
|
{
|
|
'includes': [
|
|
'../build/common.gypi',
|
|
],
|
|
'targets': [
|
|
{
|
|
# The metrics code must be kept in its own GYP file in order to
|
|
# avoid a circular dependency error due to the dependency on libyuv.
|
|
# If the code would be put in test.gyp a circular dependency error during
|
|
# GYP generation would occur, because the libyuv.gypi unittest target
|
|
# depends on test_support_main. See issue #160 for more info.
|
|
'target_name': 'metrics',
|
|
'type': 'static_library',
|
|
'dependencies': [
|
|
'<(webrtc_root)/common_video/common_video.gyp:common_video',
|
|
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
|
],
|
|
'include_dirs': [
|
|
'.',
|
|
],
|
|
'sources': [
|
|
'testsupport/metrics/video_metrics.h',
|
|
'testsupport/metrics/video_metrics.cc',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'metrics_unittests',
|
|
'type': '<(gtest_target_type)',
|
|
'dependencies': [
|
|
'metrics',
|
|
'<(webrtc_root)/test/test.gyp:test_support_main',
|
|
'<(DEPTH)/testing/gtest.gyp:gtest',
|
|
],
|
|
'sources': [
|
|
'testsupport/metrics/video_metrics_unittest.cc',
|
|
],
|
|
'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"', {
|
|
'dependencies': [
|
|
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
|
|
],
|
|
}],
|
|
],
|
|
},
|
|
], # targets
|
|
'conditions': [
|
|
# TODO(henrike): remove build_with_chromium==1 when the bots are using
|
|
# Chromium's buildbots.
|
|
['include_tests==1 and build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', {
|
|
'targets': [
|
|
{
|
|
'target_name': 'metrics_unittests_apk_target',
|
|
'type': 'none',
|
|
'dependencies': [
|
|
'<(apk_tests_path):metrics_unittests_apk',
|
|
],
|
|
},
|
|
],
|
|
}],
|
|
['test_isolation_mode != "noop"', {
|
|
'targets': [
|
|
{
|
|
'target_name': 'metrics_unittests_run',
|
|
'type': 'none',
|
|
'dependencies': [
|
|
'<(import_isolate_path):import_isolate_gypi',
|
|
'metrics_unittests',
|
|
],
|
|
'includes': [
|
|
'metrics_unittests.isolate',
|
|
],
|
|
'sources': [
|
|
'metrics_unittests.isolate',
|
|
],
|
|
},
|
|
],
|
|
}],
|
|
],
|
|
}
|