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

coverage.sh: reintroduce testing of debootstrap '-' variant

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-01-04 00:34:09 +01:00
parent c8f79cf4b5
commit de85ad44b2
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
2 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
coverage.sh
View file

@ -30,11 +30,6 @@ fi
notfound=0 notfound=0
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
# skip because of #917386 and #917407
if [ "$variant" = '-' ]; then
continue
fi
if [ ! -e "shared/cache/debian-$dist-$variant.tar" ]; then if [ ! -e "shared/cache/debian-$dist-$variant.tar" ]; then
echo "shared/cache/debian-$dist-$variant.tar does not exist" >&2 echo "shared/cache/debian-$dist-$variant.tar does not exist" >&2
notfound=1 notfound=1
@ -52,7 +47,7 @@ if [ ! -e shared/mmdebstrap ] || [ mmdebstrap -nt shared/mmdebstrap ]; then
fi fi
starttime= starttime=
total=119 total=122
i=1 i=1
print_header() { print_header() {
@ -94,10 +89,6 @@ 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
# skip because of #917386 and #917407
if [ "$variant" = '-' ]; then
continue
fi
print_header "mode=$defaultmode,variant=$variant: check against debootstrap $dist" print_header "mode=$defaultmode,variant=$variant: check against debootstrap $dist"
cat << END > shared/test.sh cat << END > shared/test.sh

8
make_mirror.sh
View file

@ -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) SOURCE_DATE_EPOCH=$(date --date="$(grep-dctrl -s Date -n '' "$newmirrordir/dists/unstable/Release")" +%s)
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
# 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 echo running debootstrap --no-merged-usr --variant=$variant $dist /tmp/debian-$dist-debootstrap $mirror
cat << END > shared/test.sh cat << END > shared/test.sh
#!/bin/sh #!/bin/sh