coverage.sh: enable building variant=standard

This commit is contained in:
Johannes Schauer Marin Rodrigues 2022-05-22 02:53:17 +02:00
parent 6ec09c27ca
commit d7b39b6c97
Signed by untrusted user: josch
GPG key ID: F2CBA5C78FBD83E1

View file

@ -805,12 +805,13 @@ fi
for variant in essential apt minbase buildd important standard; do for variant in essential apt minbase buildd important standard; do
for format in tar squashfs ext2; do for format in tar squashfs ext2; do
print_header "mode=root/unshare/fakechroot,variant=$variant: check for bit-by-bit identical $format output" print_header "mode=root/unshare/fakechroot,variant=$variant: check for bit-by-bit identical $format output"
# pyc files and man index.db are not reproducible
# See #1004557 and #1004558
if [ "$variant" = "standard" ]; then if [ "$variant" = "standard" ]; then
echo "skipping test because of #864082" >&2 case "$DEFAULT_DIST" in oldstable|stable)
echo "skipping test because of #864082, #1004557 and #1004558" >&2
skipped=$((skipped+1)) skipped=$((skipped+1))
continue continue
;;
esac
fi fi
if [ "$variant" = "important" ] && [ "$DEFAULT_DIST" = "oldstable" ]; then if [ "$variant" = "important" ] && [ "$DEFAULT_DIST" = "oldstable" ]; then
echo "skipping test on oldstable because /var/lib/systemd/catalog/database differs" >&2 echo "skipping test on oldstable because /var/lib/systemd/catalog/database differs" >&2
@ -3037,12 +3038,13 @@ fi
# into /var/cache/apt/archives/partial # into /var/cache/apt/archives/partial
for variant in extract custom essential apt minbase buildd important standard; do for variant in extract custom essential apt minbase buildd important standard; do
print_header "mode=$defaultmode,variant=$variant: compare output with pre-seeded /var/cache/apt/archives" print_header "mode=$defaultmode,variant=$variant: compare output with pre-seeded /var/cache/apt/archives"
# pyc files and man index.db are not reproducible
# See #1004557 and #1004558
if [ "$variant" = "standard" ]; then if [ "$variant" = "standard" ]; then
echo "skipping test because of #864082" >&2 case "$DEFAULT_DIST" in oldstable|stable)
echo "skipping test because of #864082, #1004557 and #1004558" >&2
skipped=$((skipped+1)) skipped=$((skipped+1))
continue continue
;;
esac
fi fi
if [ "$variant" = "important" ] && [ "$DEFAULT_DIST" = "oldstable" ]; then if [ "$variant" = "important" ] && [ "$DEFAULT_DIST" = "oldstable" ]; then
echo "skipping test on oldstable because /var/lib/systemd/catalog/database differs" >&2 echo "skipping test on oldstable because /var/lib/systemd/catalog/database differs" >&2