Re: ☠ Buildbot (Sourceware): binutils-gdb-autoregen - failed 'git diff ...' (failure) (master)

[Mark Wielaard <mark@klomp.org>]

Hi,

On Sun, Jan 07, 2024 at 05:24:56AM +0000, builder--- via Gdb-testers wrote:
> A failed build has been detected on builder binutils-gdb-autoregen while building binutils-gdb.
> 
> Full details are available at:
>     https://builder.sourceware.org/buildbot/#/builders/270/builds/813
> 
> Build state: failed 'git diff ...' (failure)
> Revision: f6c714d65b7296b466089f7d0d0270a12d51742f
> Worker: bb3
> Build Reason: (unknown)
> Blamelist: Alan Modra <amodra@gmail.com>, GDB Administrator <gdbadmin@sourceware.org>, H.J. Lu <hjl.tools@gmail.com>, Indu Bhagat <indu.bhagat@oracle.com>, Jan Beulich <jbeulich@suse.com>, Jin Ma <jinma@linux.alibaba.com>, Mike Frysinger <vapier@gentoo.org>, Tamar Christina <tamar.christina@arm.com>, Tejas Joshi <TejasSanjay.Joshi@amd.com>, Tom de Vries <tdevries@suse.de>

This started failing since:

commit fd67aa1129fd006ad49ed5ecb2b063705211553a
Author: Alan Modra <amodra@gmail.com>
Date:   Thu Jan 4 22:22:08 2024 +1030

    Update year range in copyright notice of binutils files
    
    Adds two new external authors to etc/update-copyright.py to cover
    bfd/ax_tls.m4, and adds gprofng to dirs handled automatically, then
    updates copyright messages as follows:
    
    1) Update cgen/utils.scm emitted copyrights.
    2) Run "etc/update-copyright.py --this-year" with an extra external
       author I haven't committed, 'Kalray SA.', to cover gas testsuite
       files (which should have their copyright message removed).
    3) Build with --enable-maintainer-mode --enable-cgen-maint=yes.
    4) Check out */po/*.pot which we don't update frequently.

For two generated files under gprofng/libcollector this swapped a
couple of entries.  The autogen tested fails because when regenerating
those entries are swapped again:

> odiff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in
> oindex ce8755c80c9..b8e8a7267a3 100644
> o--- a/gprofng/libcollector/Makefile.in
> o+++ b/gprofng/libcollector/Makefile.in
> o@@ -109,15 +109,15 @@ host_triplet = @host@
> o target_triplet = @target@
> o subdir = .
> o ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
> o-am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
> o-	$(top_srcdir)/../../config/lead-dot.m4 \
> o-	$(top_srcdir)/../../config/override.m4 \
> o-	$(top_srcdir)/../../config/warnings.m4 \
> o-	$(top_srcdir)/../../libtool.m4 \
> o+am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \
> o 	$(top_srcdir)/../../ltoptions.m4 \
> o 	$(top_srcdir)/../../ltsugar.m4 \
> o 	$(top_srcdir)/../../ltversion.m4 \
> o 	$(top_srcdir)/../../lt~obsolete.m4 \
> o+	$(top_srcdir)/../../config/depstand.m4 \
> o+	$(top_srcdir)/../../config/lead-dot.m4 \
> o+	$(top_srcdir)/../../config/override.m4 \
> o+	$(top_srcdir)/../../config/warnings.m4 \
> o 	$(top_srcdir)/../../bfd/version.m4 $(top_srcdir)/configure.ac
> o am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
> o 	$(ACLOCAL_M4)
> odiff --git a/gprofng/libcollector/aclocal.m4 b/gprofng/libcollector/aclocal.m4
> oindex 2d13dba8c20..c5a4a54ed82 100644
> o--- a/gprofng/libcollector/aclocal.m4
> o+++ b/gprofng/libcollector/aclocal.m4
> o@@ -1227,12 +1227,12 @@ AC_SUBST([am__tar])
> o AC_SUBST([am__untar])
> o ]) # _AM_PROG_TAR
> o 
> o-m4_include([../../config/depstand.m4])
> o-m4_include([../../config/lead-dot.m4])
> o-m4_include([../../config/override.m4])
> o-m4_include([../../config/warnings.m4])
> o m4_include([../../libtool.m4])
> o m4_include([../../ltoptions.m4])
> o m4_include([../../ltsugar.m4])
> o m4_include([../../ltversion.m4])
> o m4_include([../../lt~obsolete.m4])
> o+m4_include([../../config/depstand.m4])
> o+m4_include([../../config/lead-dot.m4])
> o+m4_include([../../config/override.m4])
> o+m4_include([../../config/warnings.m4])
> hprogram finished with exit code 1

So the autogen tester would like to move these entries back to where
they were before.

OK, to commit this autogen diff to make the tester happy again?

Thanks,

Mark