>From b00886897ea3d65410f2fd56aead11104a0b3fb9 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 18 May 2022 15:40:43 +0200 Subject: [PATCH] gdb: Disable make check for gdb-debian-armhf builder make gdb-check is flaky on armhf. Tracked at https://sourceware.org/bugzilla/show_bug.cgi?id=28561 --- builder/master.cfg | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/builder/master.cfg b/builder/master.cfg index 27b8dc1..06c388f 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -1217,33 +1217,32 @@ c['builders'].append(binutils_fedora_ppc64le_builder) # gdb build steps, factory and builders -gdb_factory = util.BuildFactory() -gdb_factory.addStep(steps.Git( +gdb_git_step = steps.Git( workdir='binutils-gdb', repourl=binutils_gdb_repourl, mode='full', method='fresh', name="git checkout", - haltOnFailure=True)) -gdb_factory.addStep(steps.ShellCommand( + haltOnFailure=True) +gdb_rm_step = steps.ShellCommand( command=["rm", "-rf", util.Interpolate ("%(prop:builddir)s/gdb-build")], name="rm -rf gdb-build", - haltOnFailure=True)) -gdb_factory.addStep(steps.Configure( + haltOnFailure=True) +gdb_configure_step = steps.Configure( workdir='gdb-build', command=['../binutils-gdb/configure', '--enable-target=all'], name='configure', - haltOnFailure=True)) -gdb_factory.addStep(steps.Compile( + haltOnFailure=True) +gdb_make_step = steps.Compile( workdir='gdb-build', command=['make', util.Interpolate('-j%(prop:ncpus)s'), 'all-gdb', 'all-gdbserver'], name='make', - haltOnFailure=True)) + haltOnFailure=True) # Only a small subset of tests that are fast and known to PASS. -gdb_factory.addStep(steps.Test( +gdb_check_step = steps.Test( workdir='gdb-build', command=['make', util.Interpolate('-j%(prop:ncpus)s'), @@ -1255,7 +1254,22 @@ gdb_factory.addStep(steps.Test( name='make check-gdb', logfiles={ "gdb.sum": "gdb/testsuite/gdb.sum", "gdb.log": "gdb/testsuite/gdb.log" }, - haltOnFailure=True)) + haltOnFailure=True) + +gdb_factory = util.BuildFactory() +gdb_factory.addStep(gdb_git_step) +gdb_factory.addStep(gdb_rm_step) +gdb_factory.addStep(gdb_configure_step) +gdb_factory.addStep(gdb_make_step) +gdb_factory.addStep(gdb_check_step) + +# Used for armhf only because of +# https://sourceware.org/bugzilla/show_bug.cgi?id=28561 +gdb_factory_make_only = util.BuildFactory() +gdb_factory_make_only.addStep(gdb_git_step) +gdb_factory_make_only.addStep(gdb_rm_step) +gdb_factory_make_only.addStep(gdb_configure_step) +gdb_factory_make_only.addStep(gdb_make_step) # NB: no need to BUNSEN ME, test suites are not actually being run gdb_centos_x86_64_builder = util.BuilderConfig( @@ -1276,7 +1290,7 @@ gdb_debian_armhf_builder = util.BuilderConfig( name="gdb-debian-armhf", workernames=["debian-armhf"], tags=["gdb", "debian", "armhf"], - factory=gdb_factory) + factory=gdb_factory_make_only) c['builders'].append(gdb_debian_armhf_builder) gdb_debian_arm64_builder = util.BuilderConfig( -- 2.18.4