josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

coverage.sh: if a test cannot be executed mark it as skipped instead of ignoring it

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-11-27 22:52:18 +01:00
parent 529e8076c4
commit d96d0e0e16
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
coverage.sh
View file

@ -113,7 +113,7 @@ if [ ! -e shared/hooks/eatmydata/customize.sh ] || [ hooks/eatmydata/customize.s
fi fi
starttime= starttime=
total=157 total=164
skipped=0 skipped=0
runtests=0 runtests=0
i=1 i=1
@ -156,7 +156,8 @@ mirror="http://127.0.0.1/debian"
for dist in stable testing unstable; do for dist in stable testing unstable; do
for variant in minbase buildd -; do for variant in minbase buildd -; do
if [ $dist != stable ] && [ $variant = - ]; then if [ $dist != stable ] && [ $variant = - ]; then
# skipping because of #963788 echo "skipping test because of #963788" >&2
skipped=$((skipped+1))
continue continue
fi fi
print_header "mode=$defaultmode,variant=$variant: check against debootstrap $dist" print_header "mode=$defaultmode,variant=$variant: check against debootstrap $dist"
@ -2488,6 +2489,8 @@ for variant in extract custom essential apt minbase buildd important standard; d
standard) standard)
# python is priority:standard but uninstallable since # python is priority:standard but uninstallable since
# August 03 2020, see Debian bug #968217 # August 03 2020, see Debian bug #968217
echo "skipping test because of #968217" >&2
skipped=$((skipped+1))
continue continue
;; ;;
esac esac
@ -2649,12 +2652,14 @@ done
# test all variants # test all variants
for variant in essential apt required minbase buildd important debootstrap - standard; do for variant in essential apt required minbase buildd important debootstrap - standard; do
print_header "mode=root,variant=$variant: create tarball"
if [ "$variant" = standard ]; then if [ "$variant" = standard ]; then
# python is priority:standard but uninstallable since August 03 # python is priority:standard but uninstallable since August 03
# 2020, see Debian bug #968217 # 2020, see Debian bug #968217
echo "skipping test because of #968217" >&2
skipped=$((skipped+1))
continue continue
fi fi
print_header "mode=root,variant=$variant: create tarball"
cat << END > shared/test.sh cat << END > shared/test.sh
#!/bin/sh #!/bin/sh
set -eu set -eu
@ -2672,10 +2677,13 @@ END
fi fi
# check if the other modes produce the same result in each variant # check if the other modes produce the same result in each variant
for mode in unshare fakechroot proot; do for mode in unshare fakechroot proot; do
print_header "mode=$mode,variant=$variant: create tarball"
# fontconfig doesn't install reproducibly because differences # fontconfig doesn't install reproducibly because differences
# in /var/cache/fontconfig/. See # in /var/cache/fontconfig/. See
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=864082 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=864082
if [ "$variant" = standard ]; then if [ "$variant" = standard ]; then
echo "skipping test because of #864082" >&2
skipped=$((skipped+1))
continue continue
fi fi
case "$mode" in case "$mode" in
@ -2692,7 +2700,6 @@ END
esac esac
;; ;;
esac esac
print_header "mode=$mode,variant=$variant: create tarball"
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))
@ -2951,7 +2958,6 @@ END
if true; then if true; then
echo "skipping test because of #973325" >&2 echo "skipping test because of #973325" >&2
skipped=$((skipped+1)) skipped=$((skipped+1))
continue
elif [ "$HAVE_QEMU" = "yes" ]; then elif [ "$HAVE_QEMU" = "yes" ]; then
./run_qemu.sh ./run_qemu.sh
runtests=$((runtests+1)) runtests=$((runtests+1))