| Index: scripts/slave/recipes/webrtc/baremetal.expected/buildbot_mac32_Release.json
|
| diff --git a/scripts/slave/recipes/webrtc/baremetal.expected/buildbot_mac32_Release.json b/scripts/slave/recipes/webrtc/baremetal.expected/buildbot_mac32_Release.json
|
| index 5ec02dbcd6b6778c93e9a563e377f1e3a4182733..bf4ea897a72eaed0f5f3f474c7b57b9e82281267 100644
|
| --- a/scripts/slave/recipes/webrtc/baremetal.expected/buildbot_mac32_Release.json
|
| +++ b/scripts/slave/recipes/webrtc/baremetal.expected/buildbot_mac32_Release.json
|
| @@ -6,7 +6,7 @@
|
| "[DEPOT_TOOLS]/gclient.py",
|
| "config",
|
| "--spec",
|
| - "cache_dir = None\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'http://webrtc.googlecode.com/svn/trunk'}]"
|
| + "cache_dir = None\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'http://webrtc.googlecode.com/svn/trunk'}, {'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/webrtc-limited'}]"
|
| ],
|
| "name": "gclient setup",
|
| "seed_steps": [
|
| @@ -77,22 +77,15 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| - "--builder-name=buildbot builder",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| + "--builder-name=buildbot",
|
| "--slave-name=slavename",
|
| "--master-name=mastername",
|
| "audio_device_tests"
|
| ],
|
| - "name": "audio_device_tests",
|
| - "seed_steps": [
|
| - "audio_device_tests",
|
| - "libjingle_peerconnection_objc_test",
|
| - "vie_auto_test",
|
| - "video_capture_tests",
|
| - "voe_auto_test"
|
| - ]
|
| + "name": "audio_device_tests"
|
| },
|
| {
|
| "always_run": true,
|
| @@ -103,17 +96,23 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| - "--builder-name=buildbot builder",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| + "--builder-name=buildbot",
|
| "--slave-name=slavename",
|
| "--master-name=mastername",
|
| - "libjingle_peerconnection_objc_test.app/Contents/MacOS/libjingle_peerconnection_objc_test",
|
| + "vie_auto_test",
|
| "--automated",
|
| "--capture_test_ensure_resolution_alignment_in_capture_device=false"
|
| ],
|
| - "name": "libjingle_peerconnection_objc_test"
|
| + "name": "vie_auto_test",
|
| + "seed_steps": [
|
| + "vie_auto_test",
|
| + "voe_auto_test",
|
| + "video_capture_tests",
|
| + "webrtc_perf_tests"
|
| + ]
|
| },
|
| {
|
| "always_run": true,
|
| @@ -124,17 +123,16 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| - "--builder-name=buildbot builder",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| + "--builder-name=buildbot",
|
| "--slave-name=slavename",
|
| "--master-name=mastername",
|
| - "vie_auto_test",
|
| - "--automated",
|
| - "--capture_test_ensure_resolution_alignment_in_capture_device=false"
|
| + "voe_auto_test",
|
| + "--automated"
|
| ],
|
| - "name": "vie_auto_test"
|
| + "name": "voe_auto_test"
|
| },
|
| {
|
| "always_run": true,
|
| @@ -145,10 +143,10 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| - "--builder-name=buildbot builder",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| + "--builder-name=buildbot",
|
| "--slave-name=slavename",
|
| "--master-name=mastername",
|
| "video_capture_tests"
|
| @@ -164,15 +162,14 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| - "--builder-name=buildbot builder",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 32, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| + "--builder-name=buildbot",
|
| "--slave-name=slavename",
|
| "--master-name=mastername",
|
| - "voe_auto_test",
|
| - "--automated"
|
| + "webrtc_perf_tests"
|
| ],
|
| - "name": "voe_auto_test"
|
| + "name": "webrtc_perf_tests"
|
| }
|
| ]
|
|
|