| Index: infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
|
| diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
|
| index 88cd7aacbab31a05526899e0db443db99e394adc..5d0dd78b6dbb897c7949955cf4acbdf6e2d89a10 100644
|
| --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
|
| +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
|
| @@ -76,20 +76,83 @@
|
| },
|
| {
|
| "cmd": [
|
| - "make",
|
| - "most"
|
| + "python",
|
| + "-u",
|
| + "import json\nimport subprocess\nimport sys\n\nccache = None\ntry:\n ccache = subprocess.check_output(['which', 'ccache']).rstrip()\nexcept:\n pass\nprint json.dumps({'ccache': ccache})\n"
|
| + ],
|
| + "env": {
|
| + "BUILDTYPE": "Debug",
|
| + "CHROME_HEADLESS": "1",
|
| + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
|
| + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
|
| + },
|
| + "name": "has ccache?",
|
| + "stdout": "/path/to/tmp/json",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| + "@@@STEP_LOG_END@json.output (invalid)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import json@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ccache = None@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@try:@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ ccache = subprocess.check_output(['which', 'ccache']).rstrip()@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@except:@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ pass@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@print json.dumps({'ccache': ccache})@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
|
| + ],
|
| + "cwd": "[CUSTOM_/_B_WORK]/skia",
|
| + "env": {
|
| + "BUILDTYPE": "Debug",
|
| + "CHROME_HEADLESS": "1",
|
| + "CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE",
|
| + "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
|
| + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
|
| + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
|
| + },
|
| + "name": "fetch-gn"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "gn",
|
| + "gen",
|
| + "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug",
|
| + "--args=cc=\"gcc -DSK_USE_DISCARDABLE_SCALEDIMAGECACHE\" cxx=\"g++ -DSK_USE_DISCARDABLE_SCALEDIMAGECACHE\""
|
| + ],
|
| + "cwd": "[CUSTOM_/_B_WORK]/skia",
|
| + "env": {
|
| + "BUILDTYPE": "Debug",
|
| + "CHROME_HEADLESS": "1",
|
| + "CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE",
|
| + "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
|
| + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
|
| + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
|
| + },
|
| + "name": "gn gen"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "ninja",
|
| + "-C",
|
| + "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug"
|
| ],
|
| "cwd": "[CUSTOM_/_B_WORK]/skia",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "CHROME_PATH": "[SLAVE_BUILD]/src",
|
| "CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
|
| "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
|
| },
|
| - "name": "build most"
|
| + "name": "ninja"
|
| },
|
| {
|
| "cmd": [
|
|
|