From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from csb.redhat.com (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id CC6B53858D20 for ; Thu, 26 Jan 2023 23:39:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CC6B53858D20 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: by csb.redhat.com (Postfix, from userid 10916) id 3F814EE3B6; Fri, 27 Jan 2023 00:39:29 +0100 (CET) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [PATCH] Add make_[dist]check_testsuite_step variants for debugedit Date: Fri, 27 Jan 2023 00:39:13 +0100 Message-Id: <20230126233913.59803-1-mark@klomp.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3038.0 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_NONE,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: debugedit uses autotest which generates a testsuite.log instead of a test-suite.log. --- builder/master.cfg | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/builder/master.cfg b/builder/master.cfg index 567f15a..6528fd5 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -996,6 +996,12 @@ make_check_test_suite_step = steps.Test( util.Interpolate('-j%(prop:ncpus)s')]), name="make check", haltOnFailure=False, flunkOnFailure=True, logfiles={"test-suite.log": "tests/test-suite.log"}) +# Same but with tests/testsuite.log (note, no dash) +make_check_testsuite_step = steps.Test( + command=addOutputSync.withArgs(["make", "check", + util.Interpolate('-j%(prop:ncpus)s')]), + name="make check", haltOnFailure=False, flunkOnFailure=True, + logfiles={"testsuite.log": "tests/testsuite.log"}) make_distcheck_step = steps.Test( command=addOutputSync.withArgs(["make", "distcheck", util.Interpolate('-j%(prop:ncpus)s')]), @@ -1010,6 +1016,14 @@ make_distcheck_test_suite_step = steps.Test( timeout=3600, logfiles={"test-suite.log": util.Interpolate('%(prop:package_name)s-%(prop:package_version)s/_build/sub/tests/test-suite.log')}) +# Same but with tests/testsuite.log (note, no dash) +make_distcheck_testsuite_step = steps.Test( + command=addOutputSync.withArgs(["make", "distcheck", + util.Interpolate('-j%(prop:ncpus)s')]), + name="make distcheck", haltOnFailure=False, flunkOnFailure=True, + timeout=3600, + logfiles={"testsuite.log": + util.Interpolate('%(prop:package_name)s-%(prop:package_version)s/_build/sub/tests/testsuite.log')}) # Generic make clean step to be run at the end of a build make_clean_step = steps.ShellCommand( @@ -1297,8 +1311,8 @@ debugedit_factory.addStep(autoreconf_step) debugedit_factory.addStep(configure_step) debugedit_factory.addStep(getversion_step) debugedit_factory.addStep(make_step) -debugedit_factory.addStep(make_check_test_suite_step) -debugedit_factory.addStep(make_distcheck_test_suite_step) +debugedit_factory.addStep(make_check_testsuite_step) +debugedit_factory.addStep(make_distcheck_testsuite_step) debugedit_factory.addSteps(bunsen_logfile_upload_cpio_steps(["*.at", "*.log", "*atlocal"])) debugedit_factory.addStep(make_clean_step) -- 2.31.1