Merge ~athos-ribeiro/ubuntu/+source/squid:halt-build-on-test-failures-kinetic into ubuntu/+source/squid:ubuntu/kinetic-devel

[Athos Ribeiro]

I am re-submitting these kinetic changes to include vorlon's suggestions raised during the SRU review in LP: #2004050.

The relevant changes are
- Disabling specific compiler errors instead of disabling LTO in s390x
- Removing patch instead of commenting it out in d/p/series to ease SRU review process.

As it is being discussed in [1], squid builds will not halt upon upstream unit test failures during dh_auto_test. This could hinder the squid MRE test plan process [2].

This MP proposes a patch set to force squid builds to fail upon test failures. It also includes additional changes to ensure build time and autopkgtests are also passing for those upstream tests.

This is the kinetic SRU for the change applied in lunar in [3]

[1] https://lists.ubuntu.com/archives/ubuntu-release/2023-January/005522.html
[2] https://wiki.ubuntu.com/SquidUpdates
PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/squid-halt-build-on-test-failures/+packages
[3] https://code.launchpad.net/~athos-ribeiro/ubuntu/+source/squid/+git/squid/+merge/436437

[Athos Ribeiro (athos-ribeiro)]

Note that I already have

- verified that the s390x LTO change is needed here; and
- tested a build without removing the 0003 patch, which did lead to a build failure due to failing tests, as expected.

[Bryce Harrington (bryce)]

Should this be targeting the applied branch? Or am I confused?

With this targeting kinetic, should version number be 5.6-1ubuntu3.1?

review: Needs Fixing

[Athos Ribeiro (athos-ribeiro)]

Thanks, Bryce!

I fixed the target branch and updated the version string.

[Bryce Harrington (bryce)]

Thanks, looks good now!

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: athos-ribeiro, bryce
Uploaders: athos-ribeiro, bryce
MP auto-approved

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Uploaded:

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading squid_5.6-1ubuntu3.1.dsc: done.
  Uploading squid_5.6-1ubuntu3.1.debian.tar.xz: done.
  Uploading squid_5.6-1ubuntu3.1_source.buildinfo: done.
  Uploading squid_5.6-1ubuntu3.1_source.changes: done.
Successfully uploaded packages.

[Bryce Harrington (bryce)]

The changes themselves LGTM, but the changelog could benefit from some additional clarifications (inline below). With those changes applied, this LGTM.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: athos-ribeiro, bryce
Uploaders: athos-ribeiro, bryce
MP auto-approved

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Bryce!

I updated the changelog (and commit message) as requested; added more information to the SRU bug to describe all the needed changes listed in the changelog; removed the accidental blank line being added to d/rules; and will check if debian would benefit from the s390x specific d/rules bit (that is a workaround for LTO issues).

[Athos Ribeiro (athos-ribeiro)]

Uploaded

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading squid_5.6-1ubuntu3.1.dsc: done.
  Uploading squid_5.6-1ubuntu3.1.debian.tar.xz: done.
  Uploading squid_5.6-1ubuntu3.1_source.buildinfo: done.
  Uploading squid_5.6-1ubuntu3.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 9bd5a20..396cc68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+squid (5.6-1ubuntu3.1) kinetic; urgency=medium
+
+  * Make builds fail when upstream test suite fails (LP: #2004050):
+    - d/p/0003-installed-binary-for-debian-ci.patch: dropped. Do not rely on
+      installed binaries for build time tests since this would lead to test
+      failures.
+    - d/rules: halt build upon test failures.
+    - d/rules: do not include additional configuration files during
+      build time tests. This would lead to test failures due to missing
+      paths.
+    - d/t/upstream-test-suite: use installed squid binary for
+      autopkgtest config file checks.
+    - d/rules: disable LTO related compilation errors for s390x builds.
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 30 Jan 2023 20:12:50 -0300
+
 squid (5.6-1ubuntu3) kinetic; urgency=medium
 
   * SECURITY UPDATE: Exposure of Sensitive Information in Cache Manager
diff --git a/debian/patches/0003-installed-binary-for-debian-ci.patch b/debian/patches/0003-installed-binary-for-debian-ci.patch
deleted file mode 100644
index fb1ce64..0000000
--- a/debian/patches/0003-installed-binary-for-debian-ci.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Amos Jeffries <[e-mail]>
-Date: Sat, 21 Jul 2018 21:07:00 +1300
-Subject: Use installed squid binary for Debian CI testing
-
-Index: pkg-squid/test-suite/Makefile.am
-===================================================================
---- pkg-squid.orig/test-suite/Makefile.am
-+++ pkg-squid/test-suite/Makefile.am
-@@ -150,7 +150,7 @@ VirtualDeleteOperator_SOURCES = VirtualD
- squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*
- 	@failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \
- 	for cfg in $$cfglist ; do \
--		$(top_builddir)/src/squid -k parse -f $$cfg || \
-+		/usr/sbin/squid -k parse -f $$cfg || \
- 			{ echo "FAIL: squid.conf test: $$cfg" | \
- 				sed s%$(top_builddir)/src/%% | \
- 				sed s%$(srcdir)/squidconf/%% ; \
-Index: pkg-squid/test-suite/Makefile.in
-===================================================================
---- pkg-squid.orig/test-suite/Makefile.in
-+++ pkg-squid/test-suite/Makefile.in
-@@ -1477,7 +1477,7 @@ STUB.h: $(top_srcdir)/src/tests/STUB.h
- squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*
- 	@failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \
- 	for cfg in $$cfglist ; do \
--		$(top_builddir)/src/squid -k parse -f $$cfg || \
-+		/usr/sbin/squid -k parse -f $$cfg || \
- 			{ echo "FAIL: squid.conf test: $$cfg" | \
- 				sed s%$(top_builddir)/src/%% | \
- 				sed s%$(srcdir)/squidconf/%% ; \
diff --git a/debian/patches/series b/debian/patches/series
index 3c055ad..8c2318e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0001-Default-configuration-file-for-debian.patch
 0002-Change-default-file-locations-for-debian.patch
-0003-installed-binary-for-debian-ci.patch
 0005-Use-RuntimeDirectory-to-create-run-squid.patch
 0006-Fix-build-against-OpenSSL-3-0.patch
 90-cf.data.ubuntu.patch
diff --git a/debian/rules b/debian/rules
index 85d55f3..aae9452 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -Wno-error=deprecated-declarations
 export DEB_CXXFLAGS_MAINT_APPEND = -Wno-error=deprecated-declarations
 
+ifeq ($(DEB_HOST_ARCH), s390x)
+    DEB_CFLAGS_MAINT_APPEND += -Wno-error=stringop-overread
+    DEB_CXXFLAGS_MAINT_APPEND += -Wno-error=stringop-overread
+endif
+
 ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc powerpcspe sh4))
 	DEB_LDFLAGS_MAINT_APPEND += -latomic
 endif
@@ -89,9 +94,17 @@ override_dh_auto_build:
 	dh_auto_build
 	cd debian/build-openssl && dh_auto_build
 
+execute_before_dh_auto_test:
+	# Do not include additional configuration files during tests. This would lead to failures due to missing paths.
+	sed -i 's|^\(include /etc/squid/conf\.d/\*\.conf\)|# \1|' src/squid.conf.default debian/build-openssl/src/squid.conf.default
+
 override_dh_auto_test:
-	-dh_auto_test
-	-cd debian/build-openssl && dh_auto_test
+	dh_auto_test
+	cd debian/build-openssl && dh_auto_test
+
+execute_after_dh_auto_test:
+	# Restore configuration file to its previous state.
+	sed -i 's|^# \(include /etc/squid/conf\.d/\*\.conf\)|\1|' src/squid.conf.default debian/build-openssl/src/squid.conf.default
 
 override_dh_auto_install:
 	dh_auto_install
diff --git a/debian/tests/upstream-test-suite b/debian/tests/upstream-test-suite
index b6c9495..d503788 100644
--- a/debian/tests/upstream-test-suite
+++ b/debian/tests/upstream-test-suite
@@ -5,6 +5,10 @@ export DEB_CFLAGS_MAINT_APPEND="-Wno-error=deprecated-declarations"
 export DEB_CXXFLAGS_MAINT_APPEND="-Wno-error=deprecated-declarations"
 
 dpkg-source --before-build `pwd`
+
+# Use installed squid binary
+sed -i 's|\$(top_builddir)/src/squid -k parse|/usr/sbin/squid -k parse|' test-suite/Makefile.am test-suite/Makefile.in
+
 dh_update_autotools_config
 dh_autoreconf
 dh_auto_configure -- ${DEB_CONFIGURE_EXTRA_FLAGS} --with-gnutls