From 1b7b630eb56703ed87c94cfb65bc73558ea57bda Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 17 Jul 2022 23:34:23 +0200 Subject: [PATCH] Add python black formatter step to gdb-fedora-x86_64 builder Add 'black' to the fedora-latest container file. Add a gdb_targets_all_black_factory that includes a gdb_black_step for the gdb-fedora-x86_64 builder. --- .../containers/Containerfile-fedora-latest | 1 + builder/master.cfg | 27 ++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/builder/containers/Containerfile-fedora-latest b/builder/containers/Containerfile-fedora-latest index e2e9eae..e8e4ad4 100644 --- a/builder/containers/Containerfile-fedora-latest +++ b/builder/containers/Containerfile-fedora-latest @@ -13,6 +13,7 @@ RUN dnf upgrade -y && \ xmlto xmlto-tex fop poppler-utils libxslt docbook-dtds docbook-style-xsl \ libxml2-devel dos2unix dpkg koji python3-devel python3-koji python3-mock \ python3-rpm python3-pyxdg mailcap openmpi-devel gdb help2man wget xxhash-devel \ + black \ buildbot-worker && \ dnf clean all diff --git a/builder/master.cfg b/builder/master.cfg index d94170a..36ec4ae 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -2098,6 +2098,12 @@ gdb_make_step = steps.Compile( 'all-gdb', 'all-gdbserver'], name='make', haltOnFailure=True) +# python formatter +gdb_black_step = steps.Test( + workdir='binutils-gdb', + command=['python3', '-m', 'black', '--check', '--diff', 'gdb'], + name='python black formatter', + haltOnFailure=False, flunkOnFailure=True) # Only a small subset of tests that are fast and known to PASS. gdb_test_exp = ("TESTS= " "gdb.base/break-always.exp " @@ -2196,6 +2202,25 @@ gdb_targets_all_factory.addSteps(bunsen_logfile_upload_steps([ (["../gdb-build/gdb/testsuite/gdb.sum", "../gdb-build/gdb/testsuite/gdb.log", "../gdb-build/gdb/config.log"],"gdb")], tagsuffix="/extended-gdbserver")) +gdb_targets_all_black_factory = util.BuildFactory() +gdb_targets_all_black_factory.addStep(gdb_git_step) +gdb_targets_all_black_factory.addStep(gdb_rm_step) +gdb_targets_all_black_factory.addStep(gdb_configure_targets_all_step) +gdb_targets_all_black_factory.addStep(gdb_make_step) +gdb_targets_all_black_factory.addStep(gdb_black_step) +gdb_targets_all_black_factory.addStep(gdb_check_step) +gdb_targets_all_black_factory.addSteps(bunsen_logfile_upload_steps([ # only a few tests being run but still + (["../gdb-build/gdb/testsuite/gdb.sum", "../gdb-build/gdb/testsuite/gdb.log", "../gdb-build/gdb/config.log"],"gdb")], + tagsuffix="/native")) +gdb_targets_all_black_factory.addStep(gdb_check_native_gdbserver_step) +gdb_targets_all_black_factory.addSteps(bunsen_logfile_upload_steps([ + (["../gdb-build/gdb/testsuite/gdb.sum", "../gdb-build/gdb/testsuite/gdb.log", "../gdb-build/gdb/config.log"],"gdb")], + tagsuffix="/gdbserver")) +gdb_targets_all_black_factory.addStep(gdb_check_native_extended_gdbserver_step) +gdb_targets_all_black_factory.addSteps(bunsen_logfile_upload_steps([ + (["../gdb-build/gdb/testsuite/gdb.sum", "../gdb-build/gdb/testsuite/gdb.log", "../gdb-build/gdb/config.log"],"gdb")], + tagsuffix="/extended-gdbserver")) + # Used for armhf only because of # https://sourceware.org/bugzilla/show_bug.cgi?id=28561 gdb_factory_make_only = util.BuildFactory() @@ -2228,7 +2253,7 @@ gdb_fedora_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-latest')}, workernames=vm_workers, tags=["gdb", "fedora", "x86_64"], - factory=gdb_targets_all_factory) + factory=gdb_targets_all_black_factory) c['builders'].append(gdb_fedora_x86_64_builder) gdb_try_fedora_x86_64_builder = util.BuilderConfig( -- 2.30.2