From de85ad44b29c7a731b52cf810b01df61098d9593 Mon Sep 17 00:00:00 2001 From: Johannes 'josch' Schauer Date: Sat, 4 Jan 2020 00:34:09 +0100 Subject: [PATCH] coverage.sh: reintroduce testing of debootstrap '-' variant --- coverage.sh | 11 +---------- make_mirror.sh | 8 -------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/coverage.sh b/coverage.sh index 8bf743b..81ae7f0 100755 --- a/coverage.sh +++ b/coverage.sh @@ -30,11 +30,6 @@ fi notfound=0 for dist in stable testing unstable; do for variant in minbase buildd -; do - # skip because of #917386 and #917407 - if [ "$variant" = '-' ]; then - continue - fi - if [ ! -e "shared/cache/debian-$dist-$variant.tar" ]; then echo "shared/cache/debian-$dist-$variant.tar does not exist" >&2 notfound=1 @@ -52,7 +47,7 @@ if [ ! -e shared/mmdebstrap ] || [ mmdebstrap -nt shared/mmdebstrap ]; then fi starttime= -total=119 +total=122 i=1 print_header() { @@ -94,10 +89,6 @@ mirror="http://127.0.0.1/debian" for dist in stable testing unstable; do for variant in minbase buildd -; do - # skip because of #917386 and #917407 - if [ "$variant" = '-' ]; then - continue - fi print_header "mode=$defaultmode,variant=$variant: check against debootstrap $dist" cat << END > shared/test.sh diff --git a/make_mirror.sh b/make_mirror.sh index 6c04e7e..e58a440 100755 --- a/make_mirror.sh +++ b/make_mirror.sh @@ -378,14 +378,6 @@ mirror="http://127.0.0.1/debian" SOURCE_DATE_EPOCH=$(date --date="$(grep-dctrl -s Date -n '' "$newmirrordir/dists/unstable/Release")" +%s) for dist in stable testing unstable; do for variant in minbase buildd -; do - # skip because of different userids for apt/systemd - if [ "$dist" = 'stable' ] && [ "$variant" = '-' ]; then - continue - fi - # skip because of #917386 and #917407 - if [ "$dist" = 'unstable' ] && [ "$variant" = '-' ]; then - continue - fi echo running debootstrap --no-merged-usr --variant=$variant $dist /tmp/debian-$dist-debootstrap $mirror cat << END > shared/test.sh #!/bin/sh