diff options
Diffstat (limited to 'infra')
13 files changed, 337 insertions, 96 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index fb02a3ae3a..b2a2230cc9 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -12,6 +12,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): target_arch = self.m.vars.builder_cfg.get('target_arch', '') return any([ + 'CT' in extra_config, 'SAN' in extra_config, extra_config == 'Fast', extra_config == 'GN', diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index 9ef24378dc..88b7dedd6a 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -143,18 +143,38 @@ }, { "cmd": [ - "make", - "nanobench" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" + }, + { + "cmd": [ + "gn", + "gen", + "[SLAVE_BUILD]/out/Release", + "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-C", + "[SLAVE_BUILD]/out/Release" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build nanobench" + "name": "ninja" }, { "cmd": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json index 6e65605ad1..1fac56ce75 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json @@ -143,18 +143,38 @@ }, { "cmd": [ - "make", - "dm" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" + }, + { + "cmd": [ + "gn", + "gen", + "[SLAVE_BUILD]/out/Debug", + "--args=cc=\"gcc\" cxx=\"g++\"" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-C", + "[SLAVE_BUILD]/out/Debug" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build dm" + "name": "ninja" }, { "cmd": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json index c443cdcc92..9a13c4ee76 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json @@ -143,18 +143,38 @@ }, { "cmd": [ - "make", - "dm" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" + }, + { + "cmd": [ + "gn", + "gen", + "[SLAVE_BUILD]/out/Debug", + "--args=cc=\"gcc\" cxx=\"g++\"" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-C", + "[SLAVE_BUILD]/out/Debug" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build dm" + "name": "ninja" }, { "cmd": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index 001e091567..5960092d2f 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -163,18 +163,38 @@ }, { "cmd": [ - "make", - "dm" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" + }, + { + "cmd": [ + "gn", + "gen", + "[SLAVE_BUILD]/out/Debug", + "--args=cc=\"gcc\" cxx=\"g++\"" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-C", + "[SLAVE_BUILD]/out/Debug" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build dm" + "name": "ninja" }, { "cmd": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json index ae9c20dd09..04fb4e5297 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json @@ -143,18 +143,38 @@ }, { "cmd": [ - "make", - "dm" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" + }, + { + "cmd": [ + "gn", + "gen", + "[SLAVE_BUILD]/out/Debug", + "--args=cc=\"gcc\" cxx=\"g++\"" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-C", + "[SLAVE_BUILD]/out/Debug" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build dm" + "name": "ninja" }, { "cmd": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index f9aaa9025b..8d747f6a95 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -143,18 +143,38 @@ }, { "cmd": [ - "make", - "dm" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" + }, + { + "cmd": [ + "gn", + "gen", + "[SLAVE_BUILD]/out/Debug", + "--args=cc=\"gcc\" cxx=\"g++\"" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-C", + "[SLAVE_BUILD]/out/Debug" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build dm" + "name": "ninja" }, { "cmd": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index d0fcbe2c42..470d3c4fff 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -143,18 +143,38 @@ }, { "cmd": [ - "make", - "dm" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" + }, + { + "cmd": [ + "gn", + "gen", + "[SLAVE_BUILD]/out/Debug", + "--args=cc=\"gcc\" cxx=\"g++\"" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-C", + "[SLAVE_BUILD]/out/Debug" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build dm" + "name": "ninja" }, { "cmd": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index 6f0b8e0d09..6964598542 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -143,18 +143,38 @@ }, { "cmd": [ - "make", - "nanobench" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" + }, + { + "cmd": [ + "gn", + "gen", + "[SLAVE_BUILD]/out/Release", + "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-C", + "[SLAVE_BUILD]/out/Release" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build nanobench" + "name": "ninja" }, { "cmd": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index 705653a4a2..0372f6998e 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -143,18 +143,38 @@ }, { "cmd": [ - "make", - "nanobench" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" + }, + { + "cmd": [ + "gn", + "gen", + "[SLAVE_BUILD]/out/Release", + "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-C", + "[SLAVE_BUILD]/out/Release" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build nanobench" + "name": "ninja" }, { "cmd": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index d029db364f..413cd2c555 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -143,18 +143,38 @@ }, { "cmd": [ - "make", - "tools" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" + }, + { + "cmd": [ + "gn", + "gen", + "[SLAVE_BUILD]/out/Debug", + "--args=cc=\"gcc\" cxx=\"g++\"" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-C", + "[SLAVE_BUILD]/out/Debug" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build tools" + "name": "ninja" }, { "cmd": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index b6d0022140..551baa05da 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -143,18 +143,38 @@ }, { "cmd": [ - "make", - "tools" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" + }, + { + "cmd": [ + "gn", + "gen", + "[SLAVE_BUILD]/out/Debug", + "--args=cc=\"gcc\" cxx=\"g++\"" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-C", + "[SLAVE_BUILD]/out/Debug" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build tools" + "name": "ninja" }, { "cmd": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index 937e4f1d85..8b36687f61 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -143,18 +143,38 @@ }, { "cmd": [ - "make", - "tools" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" + }, + { + "cmd": [ + "gn", + "gen", + "[SLAVE_BUILD]/out/Debug", + "--args=cc=\"gcc\" cxx=\"g++\"" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-C", + "[SLAVE_BUILD]/out/Debug" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build tools" + "name": "ninja" }, { "cmd": [ |