From d2b7178a1338d63a80ba6176988a6e7b450c2687 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 3 Jul 2022 13:47:36 +0200 Subject: [PATCH] Don't run ld checks on arm64 and armhf They fail because running on debian-oldstable and they boards are a little slow. We can enable them when we get new arm hardware and a newer distro installed. --- builder/master.cfg | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/builder/master.cfg b/builder/master.cfg index f29afa9..63d80d8 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -1609,6 +1609,22 @@ binutils_steps_bunsen = bunsen_logfile_upload_steps([ (["../binutils-build/gas/config.log"], "gas"), (["../binutils-build/binutils/binutils.sum", "../binutils-build/binutils/binutils.log", "../binutils-build/binutils/config.log"], "binutils")]) +binutils_step_check_gas_binutils = steps.Test( + workdir='binutils-build', + command=['make', + util.Interpolate('-j%(prop:ncpus)s'), + 'check-gas', 'check-binutils'], + name='make check', + 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_steps_bunsen_gas_binutils = bunsen_logfile_upload_steps([ + (["../binutils-build/gas/testsuite/gas.sum", "../binutils-build/gas/testsuite/gas.log"], "gas/testsuite"), + (["../binutils-build/gas/config.log"], "gas"), + (["../binutils-build/binutils/binutils.sum", "../binutils-build/binutils/binutils.log", "../binutils-build/binutils/config.log"], "binutils")]) + binutils_factory = util.BuildFactory() binutils_factory.addStep(binutils_step_git) binutils_factory.addStep(binutils_step_rm_build_dir) @@ -1625,6 +1641,15 @@ binutils_factory_target_all.addStep(binutils_step_compile) binutils_factory_target_all.addStep(binutils_step_check) binutils_factory_target_all.addSteps(binutils_steps_bunsen) +# Builds everything, but checks just gas and binutils, not ld. +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_check_gas_binutils) +binutils_factory_gas_binutils.addSteps(binutils_steps_bunsen_gas_binutils) + binutils_debian_amd64_builder = util.BuilderConfig( name="binutils-debian-amd64", properties={'container-file': @@ -1689,7 +1714,7 @@ binutils_debian_armhf_builder = util.BuilderConfig( workernames=["debian-armhf"], tags=["binutils", "debian", "armhf"], collapseRequests=True, - factory=binutils_factory) + factory=binutils_factory_gas_binutils) c['builders'].append(binutils_debian_armhf_builder) binutils_debian_arm64_builder = util.BuilderConfig( @@ -1697,7 +1722,7 @@ binutils_debian_arm64_builder = util.BuilderConfig( workernames=["debian-arm64"], tags=["binutils", "debian", "arm64"], collapseRequests=True, - factory=binutils_factory) + factory=binutils_factory_gas_binutils) c['builders'].append(binutils_debian_arm64_builder) binutils_debian_i386_builder = util.BuilderConfig( -- 2.30.2