| Index: scripts/slave/recipes/webrtc/baremetal.expected/buildbot_linux64_Release.json
|
| diff --git a/scripts/slave/recipes/webrtc/baremetal.expected/buildbot_linux64_Release.json b/scripts/slave/recipes/webrtc/baremetal.expected/buildbot_linux64_Release.json
|
| index 6a9f63ccb49f881c51d97565e1c6614e62991f87..9bac2a0959ff9695967c966ac28e6773d0aa91a1 100644
|
| --- a/scripts/slave/recipes/webrtc/baremetal.expected/buildbot_linux64_Release.json
|
| +++ b/scripts/slave/recipes/webrtc/baremetal.expected/buildbot_linux64_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": [
|
| @@ -78,10 +78,10 @@
|
| "Release",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| - "--builder-name=buildbot builder",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| + "--builder-name=buildbot",
|
| "--slave-name=slavename",
|
| "--master-name=mastername",
|
| "audioproc",
|
| @@ -97,10 +97,7 @@
|
| "seed_steps": [
|
| "audioproc_perf",
|
| "isac_fixed_perf",
|
| - "libjingle_peerconnection_java_unittest",
|
| - "vie_auto_test",
|
| - "video_capture_tests",
|
| - "voe_auto_test"
|
| + "libjingle_peerconnection_java_unittest"
|
| ]
|
| },
|
| {
|
| @@ -113,10 +110,10 @@
|
| "Release",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| - "--builder-name=buildbot builder",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| + "--builder-name=buildbot",
|
| "--slave-name=slavename",
|
| "--master-name=mastername",
|
| "iSACFixtest",
|
| @@ -136,10 +133,10 @@
|
| "Release",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| - "--builder-name=buildbot builder",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"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_java_unittest"
|
| @@ -159,17 +156,23 @@
|
| "Release",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| - "--builder-name=buildbot builder",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"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"
|
| ],
|
| - "name": "vie_auto_test"
|
| + "name": "vie_auto_test",
|
| + "seed_steps": [
|
| + "vie_auto_test",
|
| + "voe_auto_test",
|
| + "video_capture_tests",
|
| + "webrtc_perf_tests"
|
| + ]
|
| },
|
| {
|
| "always_run": true,
|
| @@ -181,10 +184,31 @@
|
| "Release",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| - "--builder-name=buildbot builder",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"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"
|
| + ],
|
| + "name": "voe_auto_test"
|
| + },
|
| + {
|
| + "always_run": true,
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--no-xvfb",
|
| + "--factory-properties",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| + "--build-properties",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"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"
|
| @@ -201,15 +225,14 @@
|
| "Release",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot\", \"mastername\": \"mastername\", \"patch_url\": null, \"recipe\": \"webrtc/baremetal\", \"revision\": null, \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"buildername\": \"buildbot builder\", \"mastername\": \"mastername\", \"recipe\": \"webrtc/baremetal\", \"slavename\": \"slavename\"}",
|
| - "--builder-name=buildbot builder",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"TARGET_BITS\": 64, \"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"
|
| }
|
| ]
|
|
|