| Index: scripts/slave/recipe_modules/chromium/example.expected/chromeos.json
|
| diff --git a/scripts/slave/recipe_modules/chromium/example.expected/chromeos.json b/scripts/slave/recipe_modules/chromium/example.expected/chromeos.json
|
| index 659e692bdc05b64ff21748891030f22604a25ba6..567fbe5e2bd93c09039e3dbedd6d01b05734ec56 100644
|
| --- a/scripts/slave/recipe_modules/chromium/example.expected/chromeos.json
|
| +++ b/scripts/slave/recipe_modules/chromium/example.expected/chromeos.json
|
| @@ -92,33 +92,6 @@
|
| "name": "generate_build_files"
|
| },
|
| {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport multiprocessing\nimport sys\n\njob_limit = 200\nif sys.platform.startswith('linux'):\n # Use 80 for linux not to load goma backend.\n job_limit = 80\n\ntry:\n jobs = min(job_limit, multiprocessing.cpu_count() * 10)\nexcept NotImplementedError:\n jobs = 50\n\nprint jobs\n"
|
| - ],
|
| - "name": "calculate the number of recommended jobs",
|
| - "stdout": "/path/to/tmp/",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import multiprocessing@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@job_limit = 200@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if sys.platform.startswith('linux'):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ # Use 80 for linux not to load goma backend.@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ job_limit = 80@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@try:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ jobs = min(job_limit, multiprocessing.cpu_count() * 10)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@except NotImplementedError:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ jobs = 50@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@print jobs@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| "cmd": [],
|
| "name": "preprocess_for_goma"
|
| },
|
| @@ -161,6 +134,33 @@
|
| },
|
| {
|
| "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport multiprocessing\nimport sys\n\njob_limit = 200\nif sys.platform.startswith('linux'):\n # Use 80 for linux not to load goma backend.\n job_limit = 80\n\ntry:\n jobs = min(job_limit, multiprocessing.cpu_count() * 10)\nexcept NotImplementedError:\n jobs = 50\n\nprint jobs\n"
|
| + ],
|
| + "name": "calculate the number of recommended jobs",
|
| + "stdout": "/path/to/tmp/",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import multiprocessing@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@job_limit = 200@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if sys.platform.startswith('linux'):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ # Use 80 for linux not to load goma backend.@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ job_limit = 80@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@try:@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ jobs = min(job_limit, multiprocessing.cpu_count() * 10)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@except NotImplementedError:@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ jobs = 50@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@print jobs@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| "RECIPE_PACKAGE_REPO[depot_tools]/cros",
|
| "chrome-sdk",
|
| "--board=amd64-generic",
|
| @@ -171,12 +171,12 @@
|
| "--nostart-goma",
|
| "--",
|
| "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
|
| + "-j",
|
| + "50",
|
| "-w",
|
| "dupbuild=err",
|
| "-C",
|
| "None/out_amd64-generic/Release",
|
| - "-j",
|
| - "50",
|
| "All"
|
| ],
|
| "cwd": "None",
|
| @@ -248,7 +248,7 @@
|
| "--ninja-log-compiler",
|
| "goma",
|
| "--ninja-log-command",
|
| - "['RECIPE_PACKAGE_REPO[depot_tools]/ninja', '-w', 'dupbuild=err', '-C', 'None/out_amd64-generic/Release', '-j', 50, 'All']",
|
| + "['RECIPE_PACKAGE_REPO[depot_tools]/ninja', '-j', 50, '-w', 'dupbuild=err', '-C', 'None/out_amd64-generic/Release', 'All']",
|
| "--ninja-log-exit-status",
|
| "0",
|
| "--buildbot-buildername",
|
|
|