From: Mark Wielaard <mark@klomp.org>
To: buildbot@sourceware.org
Cc: Mark Wielaard <mark@klomp.org>
Subject: [PATCH] Add make_[dist]check_testsuite_step variants for debugedit
Date: Fri, 27 Jan 2023 00:39:13 +0100 [thread overview]
Message-ID: <20230126233913.59803-1-mark@klomp.org> (raw)
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
reply other threads:[~2023-01-26 23:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230126233913.59803-1-mark@klomp.org \
--to=mark@klomp.org \
--cc=buildbot@sourceware.org \
/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).