| Index: scripts/slave/recipes/chromium_clang_upload.expected/full_tryserver_chromium_linux_linux_chromium_clang_upload.json
|
| diff --git a/scripts/slave/recipes/nacl/sdk_build.expected/basic.json b/scripts/slave/recipes/chromium_clang_upload.expected/full_tryserver_chromium_linux_linux_chromium_clang_upload.json
|
| similarity index 90%
|
| copy from scripts/slave/recipes/nacl/sdk_build.expected/basic.json
|
| copy to scripts/slave/recipes/chromium_clang_upload.expected/full_tryserver_chromium_linux_linux_chromium_clang_upload.json
|
| index cab5bc3e67e9a933806708f080875a68b9ebfa91..d82bf8d8d0d3f81df42fc594b546bcf9b685b793 100644
|
| --- a/scripts/slave/recipes/nacl/sdk_build.expected/basic.json
|
| +++ b/scripts/slave/recipes/chromium_clang_upload.expected/full_tryserver_chromium_linux_linux_chromium_clang_upload.json
|
| @@ -5,19 +5,25 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| - "chromium.testing.master",
|
| + "tryserver.chromium.linux",
|
| "--builder",
|
| - "TestBuilder",
|
| + "linux_chromium_clang_upload",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| - "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
|
| + "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",
|
| "--root",
|
| "src",
|
| "--revision_mapping_file",
|
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| "--git-cache-dir",
|
| "[GIT_CACHE]",
|
| + "--issue",
|
| + "12853011",
|
| + "--patchset",
|
| + "1",
|
| + "--rietveld_server",
|
| + "https://codereview.chromium.org",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| @@ -106,6 +112,7 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| + "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
|
| },
|
| @@ -115,20 +122,29 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/cleanup_temp.py"
|
| + "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| + "gen",
|
| + "-m",
|
| + "tryserver.chromium.linux",
|
| + "-b",
|
| + "linux_chromium_clang_upload",
|
| + "--config-file",
|
| + "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| + "--goma-dir",
|
| + "[BUILD]/goma",
|
| + "//out/Release"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "cleanup_temp"
|
| + "name": "generate_build_files"
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/native_client_sdk/src/build_tools/buildbot_run.py"
|
| + "[SLAVE_BUILD]/src/tools/clang/scripts/package.py"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "annotated_steps"
|
| + "name": "package clang"
|
| },
|
| {
|
| "name": "$result",
|
|
|