aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-09-15 12:07:48 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-09-15 12:07:48 -0700
commit1fbdf98d0e9a9e5e720c77fd896a0655074e31cb (patch)
tree25c3d2ffe7d8d3fe9312263509edfcfb0b18af2e /infra/bots
parentab00f4222c9fff8c08873e1218e79f49845f95a1 (diff)
GN: support 32-bit x86 builds
Take over Ubuntu -x86- bots. Note the change to Build-Win-MSVC-x86-Release-GN.json, which is not incidental. We'll want target_cpu="x86" there too. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2340463008 Committed: https://skia.googlesource.com/skia/+/1949386ae00485ae92dd5608a2614b9dee417542 CQ_INCLUDE_TRYBOTS=master.client.skia.compile:Build-Ubuntu-Clang-x86-Debug-GN_Android-Trybot,Build-Ubuntu-GCC-x86-Release-Trybot Review-Url: https://codereview.chromium.org/2340463008
Diffstat (limited to 'infra/bots')
-rw-r--r--infra/bots/recipe_modules/flavor/gn_flavor.py7
-rw-r--r--infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json37
-rw-r--r--infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json2
-rw-r--r--infra/bots/recipes/swarm_compile.expected/failed_compile.json12
-rw-r--r--infra/bots/recipes/swarm_compile.py2
5 files changed, 42 insertions, 18 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index bef577926d..fb02a3ae3a 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -8,12 +8,15 @@ import default_flavor
class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
def supported(self):
extra_config = self.m.vars.builder_cfg.get('extra_config', '')
+ os = self.m.vars.builder_cfg.get('os', '')
+ target_arch = self.m.vars.builder_cfg.get('target_arch', '')
return any([
'SAN' in extra_config,
extra_config == 'Fast',
extra_config == 'GN',
- extra_config.startswith('SK')
+ extra_config.startswith('SK'),
+ os == 'Ubuntu' and target_arch == 'x86',
])
def _run(self, title, cmd, env=None, infra_step=False):
@@ -29,6 +32,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
configuration = self.m.vars.builder_cfg.get('configuration', '')
extra_config = self.m.vars.builder_cfg.get('extra_config', '')
os = self.m.vars.builder_cfg.get('os', '')
+ target_arch = self.m.vars.builder_cfg.get('target_arch', '')
clang_linux = str(self.m.vars.slave_dir.join('clang_linux'))
@@ -65,6 +69,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
'extra_cflags': ' '.join(extra_cflags),
'extra_ldflags': ' '.join(extra_ldflags),
'sanitize': extra_config if 'SAN' in extra_config else '',
+ 'target_cpu': 'x86' if target_arch == 'x86' else '',
}.iteritems():
if v:
args[k] = '"%s"' % v
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json
index aaadb46c71..3555d1ad1e 100644
--- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json
@@ -121,19 +121,38 @@
},
{
"cmd": [
- "make",
- "most"
+ "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "CHROME_PATH": "[SLAVE_BUILD]/src",
- "GYP_DEFINES": "skia_arch_type=x86 skia_warnings_as_errors=1",
- "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": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug"
+ "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",
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug/Debug",
+ "--args=cc=\"gcc\" cxx=\"g++\" target_cpu=\"x86\""
+ ],
+ "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",
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug/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 most"
+ "name": "ninja"
},
{
"cmd": [
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json
index 3561951792..ce0290855e 100644
--- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json
@@ -134,7 +134,7 @@
"gn",
"gen",
"[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN\\Release",
- "--args=is_debug=false"
+ "--args=is_debug=false target_cpu=\"x86\""
],
"cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
"env": {
diff --git a/infra/bots/recipes/swarm_compile.expected/failed_compile.json b/infra/bots/recipes/swarm_compile.expected/failed_compile.json
index e36dce5efd..b6b22230a5 100644
--- a/infra/bots/recipes/swarm_compile.expected/failed_compile.json
+++ b/infra/bots/recipes/swarm_compile.expected/failed_compile.json
@@ -35,7 +35,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug"
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug"
},
"name": "gclient setup"
},
@@ -64,7 +64,7 @@
"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-Debug"
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug"
},
"name": "gclient sync",
"~followup_annotations": [
@@ -95,7 +95,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug"
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug"
},
"name": "gclient recurse (git config user.name)"
},
@@ -115,7 +115,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"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": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug"
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug"
},
"name": "gclient recurse (git config user.email)"
},
@@ -129,9 +129,9 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"CHROME_PATH": "[SLAVE_BUILD]/src",
- "GYP_DEFINES": "skia_arch_type=x86 skia_warnings_as_errors=1",
+ "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]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug"
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug"
},
"name": "build most",
"~followup_annotations": [
diff --git a/infra/bots/recipes/swarm_compile.py b/infra/bots/recipes/swarm_compile.py
index a9f7fb03a1..750d2dbfef 100644
--- a/infra/bots/recipes/swarm_compile.py
+++ b/infra/bots/recipes/swarm_compile.py
@@ -265,7 +265,7 @@ def GenTests(api):
mastername = 'client.skia.compile'
slavename = 'skiabot-win-compile-000'
- buildername = 'Build-Ubuntu-GCC-x86-Debug'
+ buildername = 'Build-Ubuntu-GCC-x86_64-Debug'
yield (
api.test('failed_compile') +
api.properties(buildername=buildername,
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-16 23:30:29 +0000