From 901d0170995b1bd25e35b28b0f690a648f446669 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Mon, 13 Mar 2023 13:21:18 +0100 Subject: [PATCH] tests: do not run debug and verbose tests with variant standards for arches affected by #1031276 --- coverage.txt | 10 ++++++++-- tests/debug | 8 +++++--- tests/verbose | 4 +++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/coverage.txt b/coverage.txt index 454dde6..faf3e06 100644 --- a/coverage.txt +++ b/coverage.txt @@ -283,10 +283,16 @@ Test: debootstrap-no-op-options Needs-Root: true Test: verbose -Variants: standard +Variants: - standard +Skip-If: + variant == "-" and hostarch not in ["armel", "armhf", "mipsel"] # #1031276 + variant == "standard" and hostarch in ["armel", "armhf", "mipsel"] # #1031276 Test: debug -Variants: standard +Variants: - standard +Skip-If: + variant == "-" and hostarch not in ["armel", "armhf", "mipsel"] # #1031276 + variant == "standard" and hostarch in ["armel", "armhf", "mipsel"] # #1031276 Test: quiet Needs-Root: true diff --git a/tests/debug b/tests/debug index 9a24078..5612115 100644 --- a/tests/debug +++ b/tests/debug @@ -5,9 +5,11 @@ export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }} trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM -# we use variant standard in debug mode to see all debug output and the maximum -# number of packages that was chosen in case of USE_HOST_APT_CONFIG=yes -[ {{ VARIANT }} = "standard" ] +# we use variant standard in verbose mode to see the maximum number of packages +# that was chosen in case of USE_HOST_APT_CONFIG=yes +# we use variant important on arches where variant standard is not bit-by-bit +# reproducible due to #1031276 +case {{ VARIANT }} in standard|-) : ;; *) exit 1;; esac {{ CMD }} --variant={{ VARIANT }} --debug {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }} diff --git a/tests/verbose b/tests/verbose index 31ad093..b0b0fb9 100644 --- a/tests/verbose +++ b/tests/verbose @@ -7,7 +7,9 @@ trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM # we use variant standard in verbose mode to see the maximum number of packages # that was chosen in case of USE_HOST_APT_CONFIG=yes -[ {{ VARIANT }} = "standard" ] +# we use variant important on arches where variant standard is not bit-by-bit +# reproducible due to #1031276 +case {{ VARIANT }} in standard|-) : ;; *) exit 1;; esac {{ CMD }} --variant={{ VARIANT }} --verbose {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }}