From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id C02B93858D1E for ; Sat, 14 Jan 2023 22:02:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C02B93858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org From: Sam James To: buildbot@sourceware.org Cc: Sam James Subject: [PATCH] Use output synchronization for make for clearer output Date: Sat, 14 Jan 2023 22:01:55 +0000 Message-Id: <20230114220155.189867-1-sam@gentoo.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Pass --output-sync=line to make to avoid noise when multiple jobs (especially configures) are running in parallel. Gentoo and opensuse are both using this for building gcc/gdb/binutils because it makes logs much more legible. --- builder/master.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builder/master.cfg b/builder/master.cfg index 8789dd5..d144008 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -963,26 +963,26 @@ getversion_step = steps.SetPropertyFromCommand( command='grep PACKAGE_VERSION config.h | cut -f2 -d\\"', property="package_version") make_step = steps.Compile( - command=["make", util.Interpolate('-j%(prop:ncpus)s')], + command=["make", "--output-sync=line", util.Interpolate('-j%(prop:ncpus)s')], name="make", haltOnFailure=True) make_check_step = steps.Test( - command=["make", "check", util.Interpolate('-j%(prop:ncpus)s')], + command=["make", "--output-sync=line", "check", util.Interpolate('-j%(prop:ncpus)s')], name="make check", haltOnFailure=False, flunkOnFailure=True) # Same as make_check_step but with tests/test-suite.log recorded make_check_test_suite_step = steps.Test( - command=["make", "check", util.Interpolate('-j%(prop:ncpus)s')], + command=["make", "--output-sync=line", "check", util.Interpolate('-j%(prop:ncpus)s')], name="make check", haltOnFailure=False, flunkOnFailure=True, logfiles={"test-suite.log": "tests/test-suite.log"}) make_distcheck_step = steps.Test( - command=["make", "distcheck", + command=["make", "--output-sync=line", "distcheck", util.Interpolate('-j%(prop:ncpus)s')], name="make distcheck", haltOnFailure=False, flunkOnFailure=True, timeout=3600) # Same as make_distcheck_step but with tests/test-suite-log from _build # Needs package_version and package_name properties set make_distcheck_test_suite_step = steps.Test( - command=["make", "distcheck", + command=["make", "--output-sync=line", "distcheck", util.Interpolate('-j%(prop:ncpus)s')], name="make distcheck", haltOnFailure=False, flunkOnFailure=True, timeout=3600, -- 2.39.0