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

Roll chromium_revision 232627:238260

Browse Source 
This brings us the updated swarming_client
that has moved out from Chromium into a standalone
project.
Because of this, all .isolate files needed to be
updated as well, similar to the changes in
https://codereview.chromium.org/29993003

TEST=trybots passing
BUG=none
R=andrew@webrtc.org, perkj@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5260 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2013-12-11 13:37:12 +00:00
parent 2656cf9f4c
commit f9bdbe3619
32 changed files with 43 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -86,8 +86,7 @@
/tools/gyp
/tools/protoc_wrapper
/tools/python
/tools/sharding_supervisor
/tools/swarm_client
/tools/swarming_client
/tools/valgrind
/tools/win
/webrtc/modules/audio_device/android/test/bin/

9
DEPS
View File

@ -11,7 +11,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
"chromium_revision": "232627",
"chromium_revision": "238260",
# A small subset of WebKit is needed for the Android Python test framework.
"webkit_trunk": "http://src.chromium.org/blink/trunk",
@ -104,11 +104,8 @@ deps = {
"tools/python":
Var("chromium_trunk") + "/src/tools/python@" + Var("chromium_revision"),
"tools/sharding_supervisor":
Var("chromium_trunk") + "/src/tools/sharding_supervisor@" + Var("chromium_revision"),
"tools/swarm_client":
Var("chromium_trunk") + "/tools/swarm_client@" + Var("chromium_revision"),
"tools/swarming_client":
From("chromium_deps", "src/tools/swarming_client"),
"tools/valgrind":
Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chromium_revision"),

2
PRESUBMIT.py
View File

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

10
talk/build/isolate.gypi
View File

@ -71,9 +71,9 @@
'extension': 'isolate',
'inputs': [
# Files that are known to be involved in this step.
'<(DEPTH)/tools/swarm_client/isolate.py',
'<(DEPTH)/tools/swarm_client/run_isolated.py',
'<(DEPTH)/tools/swarm_client/googletest/run_test_cases.py',
'<(DEPTH)/tools/swarming_client/isolate.py',
'<(DEPTH)/tools/swarming_client/run_isolated.py',
'<(DEPTH)/tools/swarming_client/googletest/run_test_cases.py',
# Disable file tracking by the build driver for now. This means the
# project must have the proper build-time dependency for their runtime
@ -94,7 +94,7 @@
["test_isolation_outdir==''", {
'action': [
'python',
'<(DEPTH)/tools/swarm_client/isolate.py',
'<(DEPTH)/tools/swarming_client/isolate.py',
'<(test_isolation_mode)',
# GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot
# be provided twice. To work around this behavior, append '/'.
@ -114,7 +114,7 @@
}, {
'action': [
'python',
'<(DEPTH)/tools/swarm_client/isolate.py',
'<(DEPTH)/tools/swarming_client/isolate.py',
'<(test_isolation_mode)',
'--outdir', '<(test_isolation_outdir)',
# See comment above.

2
talk/examples/android/project.properties
View File

@ -11,6 +11,6 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-17
target=android-19
java.compilerargs=-Xlint:all -Werror

3
talk/libjingle_media_unittest.isolate
View File

@ -30,7 +30,6 @@
'variables': {
'command': [
'../testing/test_env.py',
'../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -39,7 +38,7 @@
'<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../tools/swarm_client/',
'../tools/swarming_client/',
],
},
}],

3
talk/libjingle_p2p_unittest.isolate
View File

@ -30,7 +30,6 @@
'variables': {
'command': [
'../testing/test_env.py',
'../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/libjingle_p2p_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -38,7 +37,7 @@
'<(PRODUCT_DIR)/libjingle_p2p_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../tools/swarm_client/',
'../tools/swarming_client/',
],
},
}],

3
talk/libjingle_peerconnection_unittest.isolate
View File

@ -30,7 +30,6 @@
'variables': {
'command': [
'../testing/test_env.py',
'../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/libjingle_peerconnection_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -38,7 +37,7 @@
'<(PRODUCT_DIR)/libjingle_peerconnection_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../tools/swarm_client/',
'../tools/swarming_client/',
],
},
}],

3
talk/libjingle_sound_unittest.isolate
View File

@ -30,7 +30,6 @@
'variables': {
'command': [
'../testing/test_env.py',
'../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/libjingle_sound_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -38,7 +37,7 @@
'<(PRODUCT_DIR)/libjingle_sound_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../tools/swarm_client/',
'../tools/swarming_client/',
],
},
}],

3
talk/libjingle_unittest.isolate
View File

@ -30,7 +30,6 @@
'variables': {
'command': [
'../testing/test_env.py',
'../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/libjingle_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -38,7 +37,7 @@
'<(PRODUCT_DIR)/libjingle_unittest<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../tools/swarm_client/',
'../tools/swarming_client/',
],
},
}],

1
webrtc/build/common.gypi
View File

@ -178,6 +178,7 @@
# that get overridden by -Wextra.
'-Wno-unused-parameter',
'-Wno-missing-field-initializers',
'-Wno-strict-overflow',
],
'cflags_cc': [
'-Wnon-virtual-dtor',

10
webrtc/build/isolate.gypi
View File

@ -52,9 +52,9 @@
'extension': 'isolate',
'inputs': [
# Files that are known to be involved in this step.
'<(DEPTH)/tools/swarm_client/isolate.py',
'<(DEPTH)/tools/swarm_client/run_isolated.py',
'<(DEPTH)/tools/swarm_client/googletest/run_test_cases.py',
'<(DEPTH)/tools/swarming_client/isolate.py',
'<(DEPTH)/tools/swarming_client/run_isolated.py',
'<(DEPTH)/tools/swarming_client/googletest/run_test_cases.py',
# Disable file tracking by the build driver for now. This means the
# project must have the proper build-time dependency for their runtime
@ -75,7 +75,7 @@
["test_isolation_outdir==''", {
'action': [
'python',
'<(DEPTH)/tools/swarm_client/isolate.py',
'<(DEPTH)/tools/swarming_client/isolate.py',
'<(test_isolation_mode)',
# GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot
# be provided twice. To work around this behavior, append '/'.
@ -95,7 +95,7 @@
}, {
'action': [
'python',
'<(DEPTH)/tools/swarm_client/isolate.py',
'<(DEPTH)/tools/swarming_client/isolate.py',
'<(test_isolation_mode)',
'--outdir', '<(test_isolation_outdir)',
# See comment above.

3
webrtc/common_audio/common_audio_unittests.isolate
View File

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -29,7 +28,7 @@
'<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
'../../tools/swarming_client/',
],
},
}],

3
webrtc/common_video/common_video_unittests.isolate
View File

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -31,7 +30,7 @@
'<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
'../../tools/swarming_client/',
],
},
}],

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

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../../../testing/test_env.py',
'../../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/neteq_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_touched': [
@ -37,7 +36,7 @@
'<(PRODUCT_DIR)/neteq_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../../../tools/swarm_client/',
'../../../../tools/swarming_client/',
],
},
}],

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

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../../../testing/test_env.py',
'../../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_touched': [
@ -33,7 +32,7 @@
'<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../../../tools/swarm_client/',
'../../../../tools/swarming_client/',
],
},
}],

4
webrtc/modules/audio_device/android/test/project.properties
View File

@ -11,6 +11,6 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-17
target=android-19
java.compilerargs=-Xlint:all -Werror
java.compilerargs=-Xlint:all -Werror

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

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -29,7 +28,7 @@
'<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../../tools/swarm_client/',
'../../../tools/swarming_client/',
],
},
}],

3
webrtc/modules/modules_tests.isolate
View File

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -34,7 +33,7 @@
'<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
'../../tools/swarming_client/',
],
},
}],

3
webrtc/modules/modules_unittests.isolate
View File

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -79,7 +78,7 @@
'<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
'../../tools/swarming_client/',
],
},
}],

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

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -29,7 +28,7 @@
'<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../../tools/swarm_client/',
'../../../tools/swarming_client/',
],
},
}],

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

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -29,7 +28,7 @@
'<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../../tools/swarm_client/',
'../../../tools/swarming_client/',
],
},
}],

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

@ -22,7 +22,6 @@
'variables': {
'command': [
'../../../testing/test_env.py',
'../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -30,7 +29,7 @@
'<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../../tools/swarm_client/',
'../../../tools/swarming_client/',
],
},
}],

3
webrtc/test/metrics_unittests.isolate
View File

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/metrics_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -31,7 +30,7 @@
'<(PRODUCT_DIR)/metrics_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
'../../tools/swarming_client/',
],
},
}],

3
webrtc/test/test_support_unittests.isolate
View File

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -30,7 +29,7 @@
'<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
'../../tools/swarming_client/',
],
},
}],

3
webrtc/tools/tools_unittests.isolate
View File

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -31,7 +30,7 @@
'<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
'../../tools/swarming_client/',
],
},
}],

2
webrtc/video_engine/test/android/project.properties
View File

@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-17
target=android-19

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

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../../../testing/test_env.py',
'../../../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_touched': [
@ -32,7 +31,7 @@
'<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
'../../tools/swarming_client/',
],
},
}],

3
webrtc/video_engine/video_engine_core_unittests.isolate
View File

@ -21,7 +21,6 @@
'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': [
@ -29,7 +28,7 @@
'<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
'../../tools/swarming_client/',
],
},
}],

3
webrtc/video_engine_tests.isolate
View File

@ -21,7 +21,6 @@
'variables': {
'command': [
'../testing/test_env.py',
'../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -33,7 +32,7 @@
'<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../tools/swarm_client/',
'../tools/swarming_client/',
],
},
}],

3
webrtc/voice_engine/voe_auto_test.isolate
View File

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -29,7 +28,7 @@
'<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
'../../tools/swarming_client/',
],
},
}],

3
webrtc/voice_engine/voice_engine_unittests.isolate
View File

@ -21,7 +21,6 @@
'variables': {
'command': [
'../../testing/test_env.py',
'../../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@ -29,7 +28,7 @@
'<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'../../tools/swarm_client/',
'../../tools/swarming_client/',
],
},
}],