debian/changelog

@@ -10,6 +10,13 @@ glibc (2.40-7) UNRELEASED; urgency=medium
   * debian/libc0.1.symbols.common: remove leftover from kfreebsd removal.
   * debhelper.in/locales.NEWS: remove asterisks list to make lintian happier.
   * debian/copyright: fix issues reported by lintian.
+  * debian/tests/rebuild: rename into upstream-testsuite and only run the
+    build-arch-post-check target instead of the full build.
+  * debian/tests/control.in: update accordingly and drop fakeroot from the
+    depends.
+  * debian/rules.d/build.mk: display the failures again in the
+    build-arch-post-check target, useful for debci which drop the middle of
+    the autopkgtest log.
   [ Frans Spiesschaert ]
   * Update Dutch debconf translation.  Closes: #1094154.

debian/rules.d/build.mk

@@ -178,7 +178,7 @@ $(stamp)check_%: $(stamp)build_%
 	    echo "+---------------------------------------------------------------------+" ; \
 	    grep -E '^FAIL:' $(DEB_BUILDDIR)/tests.sum | sort ; \
 	    if ! echo $(DEB_VERSION) | grep -q -E '^Version:.*\+deb[0-9]+u[0-9]+' ; then \
-	        touch $@_failed ; \
+	        grep -E '^FAIL:' $(DEB_BUILDDIR)/tests.sum | sort > $@_failed ; \
 	    fi ; \
 	  else \
 	    echo "+---------------------------------------------------------------------+" ; \
@@ -200,6 +200,7 @@ build-arch-post-check: $(patsubst %,$(stamp)check_%,$(GLIBC_PASSES))
 	for pass in $(patsubst %,$(stamp)check_%,$(GLIBC_PASSES)); do \
 	  if [ -f $${pass}_failed ]; then \
 	    echo "check for $$(basename $$pass) failed"; \
+	    sed -e 's/^/  /' $${pass}_failed ; \
 	    fail=1; \
 	  fi; \
 	done; \

debian/tests/control

-Tests: rebuild
-Depends: @builddeps@, fakeroot, binutils, linux-libc-dev [linux-any], gcc-14
+Tests: upstream-testsuite
+Depends: @builddeps@, binutils, linux-libc-dev [linux-any], gcc-14
 Restrictions: allow-stderr

debian/tests/control.in

-Tests: rebuild
-Depends: @builddeps@, fakeroot, @triggers@
+Tests: upstream-testsuite
+Depends: @builddeps@, @triggers@
 Restrictions: allow-stderr

debian/tests/rebuild

-#!/bin/sh
-set -e
-dpkg-buildpackage -rfakeroot -us -uc -b

debian/tests/upstream-testsuite

+#!/bin/sh
+set -e
+debian/rules build-arch-post-check