[PATCH] Add binutils-ubuntu-riscv builder and try-builder

[Mark Wielaard <mark@klomp.org>]

Tweak binutils_factory_gas_binutils a little to run ld checks,
but only warn on failure.
---
 builder/master.cfg | 51 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/builder/master.cfg b/builder/master.cfg
index d2cb2d0..d9dcc66 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -826,6 +826,7 @@ binutils_scheduler = schedulers.SingleBranchScheduler(
                       "binutils-gentoo-sparc",
                       "binutils-debian-i386",
                       "binutils-fedora-ppc64le",
+                      "binutils-ubuntu-riscv",
                       "binutils-opensusetw-x86_64",
                       "binutils-opensuseleap-x86_64"])
 c['schedulers'].append(binutils_scheduler)
@@ -847,6 +848,7 @@ binutils_try_scheduler = schedulers.AnyBranchScheduler(
                       "binutils-try-gentoo-sparc",
                       "binutils-try-debian-i386",
                       "binutils-try-fedora-ppc64le",
+                      "binutils-try-ubuntu-riscv",
                       "binutils-try-opensusetw-x86_64",
                       "binutils-try-opensuseleap-x86_64"])
 c['schedulers'].append(binutils_try_scheduler)
@@ -2550,6 +2552,12 @@ binutils_step_configure = steps.Configure(
         name='configure',
         haltOnFailure=True,
         logfiles={"config.log": "config.log"})
+binutils_step_configure_minimal = steps.Configure(
+        workdir='binutils-build',
+        command=['../binutils-gdb/configure'],
+        name='configure',
+        haltOnFailure=True,
+        logfiles={"config.log": "config.log"})
 binutils_step_configure_libctf = steps.Configure(
         workdir='binutils-build',
         command=['../binutils-gdb/configure',
@@ -2567,6 +2575,13 @@ binutils_step_compile = steps.Compile(
                  'all-gas', 'all-ld', 'all-binutils', 'all-gold']),
         name='make',
         haltOnFailure=True)
+binutils_step_compile_minimal = steps.Compile(
+        workdir='binutils-build',
+        command=addOutputSync.withArgs(['make',
+                 util.Interpolate('-j%(prop:ncpus)s'),
+                 'all-gas', 'all-ld', 'all-binutils']),
+        name='make',
+        haltOnFailure=True)
 binutils_step_compile_libctf = steps.Compile(
         workdir='binutils-build',
         command=addOutputSync.withArgs(['make',
@@ -2622,12 +2637,21 @@ binutils_step_check_gas_binutils = steps.Test(
         command=addOutputSync.withArgs(['make',
                  util.Interpolate('-j%(prop:ncpus)s'),
                  'check-gas', 'check-binutils']),
-        name='make check',
+        name='make check gas binutils',
         logfiles={ "gas.sum": "gas/testsuite/gas.sum",
                    "gas.log": "gas/testsuite/gas.log",
                    "binutils.sum": "binutils/binutils.sum",
                    "binutils.log": "binutils/binutils.log" },
         haltOnFailure=False, flunkOnFailure=True)
+binutils_step_check_ld_warn = steps.Test(
+        workdir='binutils-build',
+        command=addOutputSync.withArgs(['make',
+                                        util.Interpolate('-j%(prop:ncpus)s'),
+                                        'check-ld']),
+        name='make check ld',
+        logfiles={ "ld.sum": "ld/ld.sum",
+                   "ld.log": "ld/ld.log"},
+        haltOnFailure=False, flunkOnFailure=False, warnOnFailure=True)
 binutils_steps_bunsen_gas_binutils = bunsen_logfile_upload_cpio_steps(
         ["*.sum", "*.log"],
         workdir='binutils-build')
@@ -2654,14 +2678,15 @@ binutils_factory_libctf.addStep(binutils_step_check_libctf)
 binutils_factory_libctf.addSteps(binutils_steps_bunsen_libctf)
 binutils_factory_libctf.addStep(binutils_step_rm_build_dir)
 
-# Builds everything, but checks just gas and binutils, not ld.
+# Builds everything, but checks just gas and binutils, ld checks may fail.
 binutils_factory_gas_binutils = util.BuildFactory()
 binutils_factory_gas_binutils.addStep(binutils_step_git)
 binutils_factory_gas_binutils.addStep(binutils_step_rm_build_dir)
-binutils_factory_gas_binutils.addStep(binutils_step_configure)
-binutils_factory_gas_binutils.addStep(binutils_step_compile)
+binutils_factory_gas_binutils.addStep(binutils_step_configure_minimal)
+binutils_factory_gas_binutils.addStep(binutils_step_compile_minimal)
 binutils_factory_gas_binutils.addStep(binutils_step_check_gas_binutils)
-binutils_factory_gas_binutils.addSteps(binutils_steps_bunsen_gas_binutils)
+binutils_factory_gas_binutils.addStep(binutils_step_check_ld_warn)
+binutils_factory_gas_binutils.addSteps(binutils_steps_bunsen)
 binutils_factory_gas_binutils.addStep(binutils_step_rm_build_dir)
 
 binutils_gdb_autoregen_factory = util.BuildFactory()
@@ -2794,6 +2819,22 @@ binutils_try_fedora_ppc64le_builder = util.BuilderConfig(
         factory=binutils_factory_libctf)
 c['builders'].append(binutils_try_fedora_ppc64le_builder)
 
+binutils_ubuntu_riscv_builder = util.BuilderConfig(
+	name="binutils-ubuntu-riscv",
+        workernames=["starfive-riscv"],
+        tags=["binutils", "ubuntu", "riscv"],
+        collapseRequests=True,
+        factory=binutils_factory_gas_binutils)
+c['builders'].append(binutils_ubuntu_riscv_builder)
+
+binutils_try_ubuntu_riscv_builder = util.BuilderConfig(
+	name="binutils-try-ubuntu-riscv",
+        collapseRequests=True,
+        workernames=["starfive-riscv"],
+        tags=["binutils-try", "ubuntu", "riscv"],
+        factory=binutils_factory_gas_binutils)
+c['builders'].append(binutils_try_ubuntu_riscv_builder)
+
 binutils_opensusetw_x86_64_builder = util.BuilderConfig(
 	name="binutils-opensusetw-x86_64",
 	properties={'container-file':
-- 
2.39.3