From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 772993856261 for ; Thu, 16 Jun 2022 20:53:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 772993856261 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from reform (deer0x09.wildebeest.org [172.31.17.139]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 3C2A0302FB88; Thu, 16 Jun 2022 22:53:34 +0200 (CEST) Received: by reform (Postfix, from userid 1000) id C44A72E83DF1; Thu, 16 Jun 2022 22:53:33 +0200 (CEST) From: Mark Wielaard To: buildbot@sourceware.org Cc: keiths@redhat.com, fche@redhat.com, Mark Wielaard 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 Message-Id: <20220616205311.733585-1-mark@klomp.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: buildbot@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "The https://builder.sourceware.org/ buildbot" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2022 20:53:37 -0000 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