Skip to content
This repository was archived by the owner on May 31, 2025. It is now read-only.

Commit f41f86c

Browse files
Don't run prof builds on ARM, where they're not supported.
1 parent e177010 commit f41f86c

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

bb_master_config/master.cfg

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,20 +132,26 @@ ALL_BUILDER_NAMES = []
132132

133133
c['builders'] = []
134134
for configuration in configurations:
135-
arm_name = "arm(" + ", ".join(configuration) + ")"
135+
# ARM doesn't support profiling.
136+
if "--enable-prof" not in configuration:
137+
arm_name = "arm(" + ", ".join(configuration) + ")"
138+
ALL_BUILDER_NAMES.append(arm_name)
139+
c['builders'].append(
140+
util.BuilderConfig(
141+
name=arm_name,
142+
workernames=["arm-worker"],
143+
factory=genFactory("make", configuration)))
144+
# Ubuntu (i.e. x86 ubuntu)
136145
ubuntu_name = "ubuntu(" + ", ".join(configuration) + ")"
137-
freebsd_name = "freebsd(" + ", ".join(configuration) + ")"
138-
ALL_BUILDER_NAMES += [arm_name, ubuntu_name, freebsd_name]
139-
c['builders'].append(
140-
util.BuilderConfig(
141-
name=arm_name,
142-
workernames=["arm-worker"],
143-
factory=genFactory("make", configuration)))
146+
ALL_BUILDER_NAMES.append(ubuntu_name)
144147
c['builders'].append(
145148
util.BuilderConfig(
146149
name=ubuntu_name,
147150
workernames=["ubuntu-worker"],
148151
factory=genFactory("make", configuration)))
152+
# FreeBSD
153+
freebsd_name = "freebsd(" + ", ".join(configuration) + ")"
154+
ALL_BUILDER_NAMES.append(freebsd_name)
149155
c['builders'].append(
150156
util.BuilderConfig(
151157
name=freebsd_name,

0 commit comments

Comments
 (0)