From: Mark Wielaard <mark@klomp.org>
To: buildbot@sourceware.org
Cc: keiths@redhat.com, fche@redhat.com, Mark Wielaard <mark@klomp.org>
Subject: [PATCH] No -j for gdb_check CI tests, FORCE_PARALLEL=1 for full binutils_gdb
Date: Thu, 16 Jun 2022 22:53:11 +0200 [thread overview]
Message-ID: <20220616205311.733585-1-mark@klomp.org> (raw)
Adding -j (util.Interpolate('-j%(prop:ncpus)s')) doesn't have effect
when RUNTESTFLAGS is set, unless FORCE_PARALLEL=1 is also set.
See gdb/testsuite/README
---
builder/master.cfg | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/builder/master.cfg b/builder/master.cfg
index 8455dfe..024f0c2 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -1469,10 +1469,16 @@ gdb_test_exp = ("TESTS= "
"gdb.gdb/unittest.exp "
"gdb.server/unittest.exp ")
+# NOTE. -j (util.Interpolate('-j%(prop:ncpus)s')) doesn't have effect
+# when RUNTESTFLAGS is set, unless FORCE_PARALLEL=1 is also set.
+# See gdb/testsuite/README
+#
+# We aren't using that here (yet) because there are not enough tests
+# (each step takes a few seconds).
+
gdb_check_step = steps.Test(
workdir='gdb-build',
command=['make',
- util.Interpolate('-j%(prop:ncpus)s'),
'check-gdb',
gdb_test_exp],
name='make check-gdb',
@@ -1483,7 +1489,6 @@ gdb_check_step = steps.Test(
gdb_check_native_gdbserver_step = steps.Test(
workdir='gdb-build',
command=['make',
- util.Interpolate('-j%(prop:ncpus)s'),
'check-gdb',
gdb_test_exp,
'RUNTESTFLAGS="--target_board=native-gdbserver"'],
@@ -1495,7 +1500,6 @@ gdb_check_native_gdbserver_step = steps.Test(
gdb_check_native_extended_gdbserver_step = steps.Test(
workdir='gdb-build',
command=['make',
- util.Interpolate('-j%(prop:ncpus)s'),
'check-gdb',
gdb_test_exp,
'RUNTESTFLAGS="--target_board=native-extended-gdbserver"'],
@@ -1634,8 +1638,11 @@ def binutils_gdb_factory_factory(runtestflags=None):
make_check_command=['make',
util.Interpolate('-j%(prop:ncpus)s'),
'-k', 'check'] # even with individual testsuite failures, keep going
+ # We need FORCE_PARALLEL=1 when setting RUNTESTFLAGS to make sure the -j is used.
+ # See gdb/testsuite/README
if runtestflags:
make_check_command.append('RUNTESTFLAGS='+runtestflags)
+ make_check_command.append('FORCE_PARALLEL=1')
binutils_gdb_factory.addStep(steps.Test(
command=make_check_command,
name=('make -k check' + (runtestflags if runtestflags else ''))[:50], # length limit
--
2.30.2
next reply other threads:[~2022-06-16 20:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-16 20:53 Mark Wielaard [this message]
2022-06-18 17:55 ` Mark Wielaard
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=20220616205311.733585-1-mark@klomp.org \
--to=mark@klomp.org \
--cc=buildbot@sourceware.org \
--cc=fche@redhat.com \
--cc=keiths@redhat.com \
/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).