[PATCH] No -j for gdb_check CI tests, FORCE_PARALLEL=1 for full binutils_gdb

[PATCH] No -j for gdb_check CI tests, FORCE_PARALLEL=1 for full binutils_gdb

[Mark Wielaard]

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

Re: [PATCH] No -j for gdb_check CI tests, FORCE_PARALLEL=1 for full binutils_gdb

[Mark Wielaard]

Hi,

On Thu, Jun 16, 2022 at 10:53:11PM +0200, Mark Wielaard wrote:
> 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

I pushed this. Please yell and scream if this causes any problems.

Cheers,

Mark