From: Mark Wielaard <mark@klomp.org>
To: buildbot@sourceware.org
Cc: Tom de Vries <tdevries@suse.de>, Mark Wielaard <mark@klomp.org>
Subject: [COMMITTED] Fix binutils-gdb configure --enable-targets=all
Date: Tue, 28 Jun 2022 00:42:48 +0200 [thread overview]
Message-ID: <20220627224248.39699-1-mark@klomp.org> (raw)
There was a type in the configure of both binutils and gdb. It is
--enable-targets=all, not --enable-target=all (missing s).
Only use this on fast builders, tumbleweed x86_64 for binutils, fedora
x86_64.
---
builder/master.cfg | 41 ++++++++++++++++++++++++++++++++---------
1 file changed, 32 insertions(+), 9 deletions(-)
diff --git a/builder/master.cfg b/builder/master.cfg
index 644af50..fa53ecb 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -1495,7 +1495,7 @@ binutils_step_configure_target_all = steps.Configure(
command=['../binutils-gdb/configure',
'--enable-gold',
'--enable-shared',
- '--enable-target=all'],
+ '--enable-targets=all'],
name='configure',
haltOnFailure=True)
binutils_step_compile = steps.Compile(
@@ -1546,7 +1546,7 @@ binutils_debian_amd64_builder = util.BuilderConfig(
readContainerFile('debian-stable')},
workernames=vm_workers,
tags=["binutils", "debian", "x86_64"],
- factory=binutils_factory_target_all)
+ factory=binutils_factory)
c['builders'].append(binutils_debian_amd64_builder)
binutils_try_debian_amd64_builder = util.BuilderConfig(
@@ -1556,7 +1556,7 @@ binutils_try_debian_amd64_builder = util.BuilderConfig(
readContainerFile('debian-stable')},
workernames=vm_workers,
tags=["binutils-try", "debian", "x86_64"],
- factory=binutils_factory_target_all)
+ factory=binutils_factory)
c['builders'].append(binutils_try_debian_amd64_builder)
binutils_fedora_x86_64_builder = util.BuilderConfig(
@@ -1565,7 +1565,7 @@ binutils_fedora_x86_64_builder = util.BuilderConfig(
readContainerFile('fedora-latest')},
workernames=vm_workers,
tags=["binutils", "fedora", "x86_64"],
- factory=binutils_factory_target_all)
+ factory=binutils_factory)
c['builders'].append(binutils_fedora_x86_64_builder)
binutils_try_fedora_x86_64_builder = util.BuilderConfig(
@@ -1575,7 +1575,7 @@ binutils_try_fedora_x86_64_builder = util.BuilderConfig(
readContainerFile('fedora-latest')},
workernames=vm_workers,
tags=["binutils-try", "fedora", "x86_64"],
- factory=binutils_factory_target_all)
+ factory=binutils_factory)
c['builders'].append(binutils_try_fedora_x86_64_builder)
binutils_fedora_s390x_builder = util.BuilderConfig(
@@ -1668,7 +1668,7 @@ binutils_opensuseleap_x86_64_builder = util.BuilderConfig(
readContainerFile('opensuse-leap')},
workernames=vm_workers,
tags=["binutils", "opensuseleap", "x86_64"],
- factory=binutils_factory_target_all)
+ factory=binutils_factory)
c['builders'].append(binutils_opensuseleap_x86_64_builder)
binutils_try_opensuseleap_x86_64_builder = util.BuilderConfig(
@@ -1678,7 +1678,7 @@ binutils_try_opensuseleap_x86_64_builder = util.BuilderConfig(
readContainerFile('opensuse-leap')},
workernames=vm_workers,
tags=["binutils-try", "opensuseleap", "x86_64"],
- factory=binutils_factory_target_all)
+ factory=binutils_factory)
c['builders'].append(binutils_try_opensuseleap_x86_64_builder)
# gdb build steps, factory and builders
@@ -1696,9 +1696,14 @@ gdb_rm_step = steps.ShellCommand(
name="rm -rf gdb-build",
haltOnFailure=True)
gdb_configure_step = steps.Configure(
+ workdir='gdb-build',
+ command=['../binutils-gdb/configure'],
+ name='configure',
+ haltOnFailure=True)
+gdb_configure_targets_all_step = steps.Configure(
workdir='gdb-build',
command=['../binutils-gdb/configure',
- '--enable-target=all'],
+ '--enable-targets=all'],
name='configure',
haltOnFailure=True)
gdb_make_step = steps.Compile(
@@ -1782,6 +1787,24 @@ gdb_factory.addSteps(bunsen_logfile_upload_steps([
(["../gdb-build/gdb/testsuite/gdb.sum", "../gdb-build/gdb/testsuite/gdb.log", "../gdb-build/gdb/config.log"],"gdb")],
tagsuffix="/extended-gdbserver"))
+gdb_targets_all_factory = util.BuildFactory()
+gdb_targets_all_factory.addStep(gdb_git_step)
+gdb_targets_all_factory.addStep(gdb_rm_step)
+gdb_targets_all_factory.addStep(gdb_configure_targets_all_step)
+gdb_targets_all_factory.addStep(gdb_make_step)
+gdb_targets_all_factory.addStep(gdb_check_step)
+gdb_targets_all_factory.addSteps(bunsen_logfile_upload_steps([ # only a few tests being run but still
+ (["../gdb-build/gdb/testsuite/gdb.sum", "../gdb-build/gdb/testsuite/gdb.log", "../gdb-build/gdb/config.log"],"gdb")],
+ tagsuffix="/native"))
+gdb_targets_all_factory.addStep(gdb_check_native_gdbserver_step)
+gdb_targets_all_factory.addSteps(bunsen_logfile_upload_steps([
+ (["../gdb-build/gdb/testsuite/gdb.sum", "../gdb-build/gdb/testsuite/gdb.log", "../gdb-build/gdb/config.log"],"gdb")],
+ tagsuffix="/gdbserver"))
+gdb_targets_all_factory.addStep(gdb_check_native_extended_gdbserver_step)
+gdb_targets_all_factory.addSteps(bunsen_logfile_upload_steps([
+ (["../gdb-build/gdb/testsuite/gdb.sum", "../gdb-build/gdb/testsuite/gdb.log", "../gdb-build/gdb/config.log"],"gdb")],
+ tagsuffix="/extended-gdbserver"))
+
# Used for armhf only because of
# https://sourceware.org/bugzilla/show_bug.cgi?id=28561
gdb_factory_make_only = util.BuildFactory()
@@ -1814,7 +1837,7 @@ gdb_fedora_x86_64_builder = util.BuilderConfig(
readContainerFile('fedora-latest')},
workernames=vm_workers,
tags=["gdb", "fedora", "x86_64"],
- factory=gdb_factory)
+ factory=gdb_targets_all_factory)
c['builders'].append(gdb_fedora_x86_64_builder)
gdb_try_fedora_x86_64_builder = util.BuilderConfig(
--
2.30.2
reply other threads:[~2022-06-27 22:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220627224248.39699-1-mark@klomp.org \
--to=mark@klomp.org \
--cc=buildbot@sourceware.org \
--cc=tdevries@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).