Merge ~liushuyu-011/ubuntu/+source/libzstd:ubuntu/devel into ubuntu/+source/libzstd:ubuntu/devel

[Zixing Liu]

This merge proposal fixes the tests under i386 using some workarounds but without skipping any of the tests.

[Jeremy Bícha (jbicha)]

Ubuntu's libzstd packaging is currently in sync with Debian. Could you propose this to Debian?

https://salsa.debian.org/pkg-rpm-team/libzstd

[Simon Chopin (schopin)]

Hi Zixing,

Thanks for the contribution.

Is this still needed? There's been a new sync from Debian on this package that addresses some test failures seemingly related to 32-bit ints.

If you still want this merged, it'd be nice to have a changelog entry, ideally giving some more context as to what was broken in the first place.

[Lucas Kanashiro (lucaskanashiro)]

review: Needs Information

[Zixing Liu (liushuyu-011)]

> Ubuntu's libzstd packaging is currently in sync with Debian. Could you propose this to Debian?

I think I will propose this to Debian.

> There's been a new sync from Debian on this package that addresses some test failures seemingly related to 32-bit ints.

This new sync did not fix the test failures with i386, where the compiler choice was incorrect.

[Sergio Durigan Junior (sergiodj)]

Thank you, Zixing. Since you're going to be working directly with the Debian maintainer, do you mind withdrawing/closing this MP? If you can't do that, then please remove the Ubuntu Sponsors review slot. Thanks.

[Steve Langasek (vorlon)]

Changes such as this do NOT need to go via Debian first. This is in the sponsorship queue to be uploaded to Ubuntu, and we should not be redirecting contributors to land such changes in Debian first, particularly when they concern architectural differences between Debian and Ubuntu (autopkgtests on i386 pass in Debian, and not in Ubuntu because i386 is a partial arch for us).

Our policy is to forward changes to Debian and try to reduce the delta from Debian where possible, not to block improving Ubuntu on getting agreement from Debian first.

review: Needs Fixing

Unmerged commits

ea0efdc... by Zixing Liu on 2023-03-09

d/tests: fix tests on i386

diff --git a/debian/changelog b/debian/changelog
index 535bde4..be4e48b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libzstd (1.5.4+dfsg2-5ubuntu1) unstable; urgency=medium
+
+  * Fix the autopkgtest on i386 when running from a x86_64 host system
+
+ -- Zixing Liu <[e-mail]>  Fri, 23 Jun 2023 13:50:34 -0600
+
 libzstd (1.5.4+dfsg2-5) unstable; urgency=medium
 
   * Add the 0021-tests-newline patch to fix a very rarely occurring bug in
diff --git a/debian/tests/control b/debian/tests/control
index d656628..b9819b9 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -6,19 +6,19 @@ Depends:
  @,
  build-essential,
  pkgconf,
- python3,
- python3-click,
- python3-typedload,
+ python3:any,
+ python3-click:all,
+ python3-typedload:all,
 Restrictions: allow-stderr
 Features: test-name=build-pkg-config
 
-Test-Command: env PYTHONPATH="$(pwd)/debian/tests/python" python3 -B -u -m check_build -c debian/tests/ztest/programs.toml -v -- cmake
+Test-Command: "$(pwd)"/debian/tests/test-cmake
 Depends:
  @,
  build-essential,
  cmake,
- python3,
- python3-click,
- python3-typedload,
+ python3:any,
+ python3-click:all,
+ python3-typedload:all,
 Restrictions: allow-stderr
 Features: test-name=build-cmake
diff --git a/debian/tests/test-cmake b/debian/tests/test-cmake
new file mode 100755
index 0000000..ec4391b
--- /dev/null
+++ b/debian/tests/test-cmake
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+suffix=''
+if [[ "$DEB_HOST_ARCH" = 'i386' ]]; then
+    suffix='_i386'
+fi
+PYTHONPATH="$(pwd)/debian/tests/python" python3 -B -u -m check_build -c debian/tests/ztest/programs.toml -v -- cmake"$suffix"
diff --git a/debian/tests/ztest/cmake_i386 b/debian/tests/ztest/cmake_i386
new file mode 120000
index 0000000..b6868d4
--- /dev/null
+++ b/debian/tests/ztest/cmake_i386
@@ -0,0 +1 @@
+cmake
\ No newline at end of file
diff --git a/debian/tests/ztest/pkg-make/Makefile b/debian/tests/ztest/pkg-make/Makefile
index d2f343f..282a1b9 100644
--- a/debian/tests/ztest/pkg-make/Makefile
+++ b/debian/tests/ztest/pkg-make/Makefile
@@ -27,6 +27,12 @@ LIBS+=		${LIBS_ZSTD}
 
 RM?=		rm -f --
 
+ifeq (i386,${DEB_HOST_ARCH})
+	CFLAGS += $(shell i386-linux-gnu-pkg-config --cflags libzstd)
+	LIBS += $(shell i386-linux-gnu-pkg-config --libs libzstd)
+	CC = i686-linux-gnu-gcc
+endif
+
 all:		${PROG}
 
 ${PROG}:	${OBJS}
diff --git a/debian/tests/ztest/programs.toml b/debian/tests/ztest/programs.toml
index e6a5854..fdae211 100644
--- a/debian/tests/ztest/programs.toml
+++ b/debian/tests/ztest/programs.toml
@@ -17,3 +17,14 @@ executable = "ztest"
 clean = [["make", "clean"]]
 build = [["cmake", "."], ["make"]]
 test = [["./ztest"]]
+
+[program.cmake_i386]
+executable = "ztest"
+
+[program.cmake_i386.commands]
+clean = [["make", "clean"]]
+build = [
+  ["cmake", ".", "-DCMAKE_C_COMPILER=i686-linux-gnu-gcc", "-DCMAKE_CXX_COMPILER=i686-linux-gnu-g++"],
+  ["make"]
+]
+test = [["./ztest"]]