| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_chromeos_compile_rel_ng.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_rel_ng.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_chromeos_compile_rel_ng.json
|
| similarity index 91%
|
| copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_rel_ng.json
|
| copy to scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_chromeos_compile_rel_ng.json
|
| index 5cc2ba0cb9a57702849e7938ce1f6ac4f2fb0bea..e31aafcf2792f48ce0d35f93ddc6513509829b8f 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_rel_ng.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_chromeos_compile_rel_ng.json
|
| @@ -7,7 +7,7 @@
|
| "--master",
|
| "tryserver.chromium.linux",
|
| "--builder",
|
| - "linux_chromium_rel_ng",
|
| + "linux_chromium_chromeos_compile_rel_ng",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -99,7 +99,7 @@
|
| "runhooks"
|
| ],
|
| "env": {
|
| - "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1"
|
| + "GYP_DEFINES": "chromeos=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=ChromeOS gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=archive test_isolation_outdir=https://isolateserver.appspot.com use_goma=1"
|
| },
|
| "name": "gclient runhooks (with patch)"
|
| },
|
| @@ -108,12 +108,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -131,7 +131,7 @@
|
| "--paths",
|
| "{\"build\": \"[BUILD]\"}",
|
| "--properties",
|
| - "{\"buildername\": \"linux_chromium_rel_ng\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}"
|
| + "{\"buildername\": \"linux_chromium_chromeos_compile_rel_ng\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -201,11 +201,11 @@
|
| "-u",
|
| "[SLAVE_BUILD]/src/build/gyp_chromium",
|
| "--analyzer",
|
| - "{\"files\": [\"foo.cc\"], \"targets\": [\"chrome\"]}",
|
| + "{\"files\": [\"foo.cc\"], \"targets\": []}",
|
| "/path/to/tmp/json"
|
| ],
|
| "env": {
|
| - "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1"
|
| + "GYP_DEFINES": "chromeos=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=ChromeOS gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=archive test_isolation_outdir=https://isolateserver.appspot.com use_goma=1"
|
| },
|
| "name": "analyze",
|
| "~followup_annotations": [
|
|
|