[PATCH] Add make_[dist]check_testsuite_step variants for debugedit

[PATCH] Add make_[dist]check_testsuite_step variants for debugedit

[Mark Wielaard]

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