From f8efe39cc996d15142e2310a35b526ec2766619c Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Mon, 10 Jun 2024 00:01:33 +0200 Subject: [PATCH] tests: bug #1031276 got fixed --- coverage.txt | 10 +++------- tests/debug | 4 +--- tests/verbose | 4 +--- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/coverage.txt b/coverage.txt index c040b8b..f47e715 100644 --- a/coverage.txt +++ b/coverage.txt @@ -64,7 +64,7 @@ Variants: essential apt minbase buildd - standard Skip-If: variant == "standard" and dist == "oldstable" # #864082, #1004557, #1004558 mode == "fakechroot" and variant in ["-", "standard"] # no extended attributes - variant == "standard" and hostarch in ["armel", "armhf", "mipsel"] # #1031276 + variant == "standard" and dist in ["oldstable", "stable"] and hostarch in ["armel", "armhf", "mipsel"] # #1031276 Test: check-for-bit-by-bit-identical-format-output Modes: unshare fakechroot @@ -73,7 +73,7 @@ Variants: essential apt minbase buildd - standard Skip-If: variant == "standard" and dist == "oldstable" # #864082, #1004557, #1004558 mode == "fakechroot" and variant in ["-", "standard"] # no extended attributes - variant == "standard" and hostarch in ["armel", "armhf", "mipsel"] # #1031276 + variant == "standard" and dist in ["oldstable", "stable"] and hostarch in ["armel", "armhf", "mipsel"] # #1031276 Test: tarfilter-idshift Needs-QEMU: true @@ -275,15 +275,11 @@ Needs-Root: true Test: verbose Variants: - standard Skip-If: - variant == "-" and hostarch not in ["armel", "armhf", "mipsel"] # #1031276 - variant == "standard" and hostarch in ["armel", "armhf", "mipsel"] # #1031276 variant == "standard" and dist == "oldstable" # #864082, #1004557, #1004558 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 variant == "standard" and dist == "oldstable" # #864082, #1004557, #1004558 Test: quiet diff --git a/tests/debug b/tests/debug index 5612115..bce3fd2 100644 --- a/tests/debug +++ b/tests/debug @@ -7,9 +7,7 @@ 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 -# 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 +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 b0b0fb9..5a36310 100644 --- a/tests/verbose +++ b/tests/verbose @@ -7,9 +7,7 @@ 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 -# 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 +case {{ VARIANT }} in standard) : ;; *) exit 1;; esac {{ CMD }} --variant={{ VARIANT }} --verbose {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }}