coverage.sh: skip tests affected by #973305 and #973325

This commit is contained in:
Johannes 'josch' Schauer 2020-11-26 23:42:29 +01:00
parent 0b4f8ca7db
commit 692f687928
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1

View file

@ -2543,7 +2543,10 @@ rm /tmp/debian-chroot/var/lib/dpkg/status
# the rest should be empty directories that we can rmdir recursively # the rest should be empty directories that we can rmdir recursively
find /tmp/debian-chroot -depth -print0 | xargs -0 rmdir find /tmp/debian-chroot -depth -print0 | xargs -0 rmdir
END END
if [ "$HAVE_QEMU" = "yes" ]; then if true; then
echo "skipping test because of #973305" >&2
skipped=$((skipped+1))
elif [ "$HAVE_QEMU" = "yes" ]; then
./run_qemu.sh ./run_qemu.sh
runtests=$((runtests+1)) runtests=$((runtests+1))
elif [ "$defaultmode" = "root" ]; then elif [ "$defaultmode" = "root" ]; then
@ -2559,6 +2562,11 @@ fi
for variant in extract custom essential apt; do for variant in extract custom essential apt; do
for mode in root unshare fakechroot proot chrootless; do for mode in root unshare fakechroot proot chrootless; do
print_header "mode=$mode,variant=$variant: create tarball --dry-run" print_header "mode=$mode,variant=$variant: create tarball --dry-run"
if true; then
echo "skipping test because of #973305" >&2
skipped=$((skipped+1))
continue
fi
if [ "$mode" = "unshare" ] && [ "$HAVE_UNSHARE" != "yes" ]; then if [ "$mode" = "unshare" ] && [ "$HAVE_UNSHARE" != "yes" ]; then
echo "HAVE_UNSHARE != yes -- Skipping test..." >&2 echo "HAVE_UNSHARE != yes -- Skipping test..." >&2
skipped=$((skipped+1)) skipped=$((skipped+1))
@ -2917,7 +2925,11 @@ prefix=
[ "\$(id -u)" -eq 0 ] && prefix="runuser -u user --" [ "\$(id -u)" -eq 0 ] && prefix="runuser -u user --"
\$prefix $CMD --mode=chrootless --variant=custom --include=bsdutils,coreutils,debianutils,diffutils,dpkg,findutils,grep,gzip,hostname,init-system-helpers,ncurses-base,ncurses-bin,perl-base,sed,tar $DEFAULT_DIST /dev/null $mirror \$prefix $CMD --mode=chrootless --variant=custom --include=bsdutils,coreutils,debianutils,diffutils,dpkg,findutils,grep,gzip,hostname,init-system-helpers,ncurses-base,ncurses-bin,perl-base,sed,tar $DEFAULT_DIST /dev/null $mirror
END END
if [ "$HAVE_QEMU" = "yes" ]; then if true; then
echo "skipping test because of #973325" >&2
skipped=$((skipped+1))
continue
elif [ "$HAVE_QEMU" = "yes" ]; then
./run_qemu.sh ./run_qemu.sh
runtests=$((runtests+1)) runtests=$((runtests+1))
else else