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

coverage.sh: also test variant=custom with dropping archives into /var/cache/apt/archives

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-11-29 11:40:26 +01:00
parent beb0b8c177
commit ac48ff6672
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
coverage.sh
View file

@ -2486,22 +2486,14 @@ fi
# test that the user can drop archives into /var/cache/apt/archives as well as # test that the user can drop archives into /var/cache/apt/archives as well as
# 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
case "$variant" in
custom)
# we cannot try try it in other variants than
# chrootless unless we pass a package list including
# dpkg and friends
continue
;;
standard)
# python is priority:standard but uninstallable since
# August 03 2020, see Debian bug #968217
echo "skipping test because of #968217" >&2
skipped=$((skipped+1))
continue
;;
esac
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"
if [ "$variant" = "standard" ]; then
# python is priority:standard but uninstallable since
# August 03 2020, see Debian bug #968217
echo "skipping test because of #968217" >&2
skipped=$((skipped+1))
continue
fi
cat << END > shared/test.sh cat << END > shared/test.sh
#!/bin/sh #!/bin/sh
set -eu set -eu
@ -2511,7 +2503,11 @@ if [ ! -e /mmdebstrap-testenv ]; then
echo "this test requires the cache directory to be mounted on /mnt and should only be run inside a container" >&2 echo "this test requires the cache directory to be mounted on /mnt and should only be run inside a container" >&2
exit 1 exit 1
fi fi
$CMD --include=doc-debian --mode=$defaultmode --variant=$variant \ include="--include=doc-debian"
if [ "$variant" = "custom" ]; then
include="\$include,base-files,base-passwd,coreutils,dash,diffutils,dpkg,libc-bin,sed"
fi
$CMD \$include --mode=$defaultmode --variant=$variant \
--setup-hook='mkdir -p "\$1"/var/cache/apt/archives/partial' \ --setup-hook='mkdir -p "\$1"/var/cache/apt/archives/partial' \
--setup-hook='touch "\$1"/var/cache/apt/archives/lock' \ --setup-hook='touch "\$1"/var/cache/apt/archives/lock' \
--setup-hook='chmod 0640 "\$1"/var/cache/apt/archives/lock' \ --setup-hook='chmod 0640 "\$1"/var/cache/apt/archives/lock' \
@ -2524,12 +2520,12 @@ $CMD --include=doc-debian --mode=$defaultmode --variant=$variant \
# another reason to copy the files into a new directory is, that we can use shell globs # another reason to copy the files into a new directory is, that we can use shell globs
tmpdir=\$(mktemp -d) tmpdir=\$(mktemp -d)
cp /mnt/cache/debian/pool/main/b/busybox/busybox_*"_$HOSTARCH.deb" /mnt/cache/debian/pool/main/a/apt/apt_*"_$HOSTARCH.deb" "\$tmpdir" cp /mnt/cache/debian/pool/main/b/busybox/busybox_*"_$HOSTARCH.deb" /mnt/cache/debian/pool/main/a/apt/apt_*"_$HOSTARCH.deb" "\$tmpdir"
$CMD --include=doc-debian --mode=$defaultmode --variant=$variant \ $CMD \$include --mode=$defaultmode --variant=$variant \
--setup-hook='mkdir -p "\$1"/var/cache/apt/archives/partial' \ --setup-hook='mkdir -p "\$1"/var/cache/apt/archives/partial' \
--setup-hook='sync-in "'"\$tmpdir"'" /var/cache/apt/archives/partial' \ --setup-hook='sync-in "'"\$tmpdir"'" /var/cache/apt/archives/partial' \
$DEFAULT_DIST - $mirror > test1.tar $DEFAULT_DIST - $mirror > test1.tar
cmp orig.tar test1.tar cmp orig.tar test1.tar
$CMD --include=doc-debian --mode=$defaultmode --variant=$variant --skip=download/empty \ $CMD \$include --mode=$defaultmode --variant=$variant --skip=download/empty \
--customize-hook='touch "\$1"/var/cache/apt/archives/partial' \ --customize-hook='touch "\$1"/var/cache/apt/archives/partial' \
--setup-hook='mkdir -p "\$1"/var/cache/apt/archives/' \ --setup-hook='mkdir -p "\$1"/var/cache/apt/archives/' \
--setup-hook='sync-in "'"\$tmpdir"'" /var/cache/apt/archives/' \ --setup-hook='sync-in "'"\$tmpdir"'" /var/cache/apt/archives/' \