|
|
@ -119,7 +119,7 @@ if [ ! -e shared/hooks/eatmydata/customize.sh ] || [ hooks/eatmydata/customize.s
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
starttime=
|
|
|
|
starttime=
|
|
|
|
total=166
|
|
|
|
total=167
|
|
|
|
skipped=0
|
|
|
|
skipped=0
|
|
|
|
runtests=0
|
|
|
|
runtests=0
|
|
|
|
i=1
|
|
|
|
i=1
|
|
|
@ -1858,6 +1858,25 @@ else
|
|
|
|
runtests=$((runtests+1))
|
|
|
|
runtests=$((runtests+1))
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# This checks for https://bugs.debian.org/976166
|
|
|
|
|
|
|
|
# Since $DEFAULT_DIST varies, we hardcode stable and unstable.
|
|
|
|
|
|
|
|
print_header "mode=root,variant=apt: test --include with multiple apt sources"
|
|
|
|
|
|
|
|
cat << END > shared/test.sh
|
|
|
|
|
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
set -eu
|
|
|
|
|
|
|
|
export LC_ALL=C.UTF-8
|
|
|
|
|
|
|
|
$CMD --mode=root --variant=minbase --include=doc-debian unstable /tmp/debian-chroot "deb $mirror unstable main" "deb $mirror stable main"
|
|
|
|
|
|
|
|
chroot /tmp/debian-chroot dpkg-query --show doc-debian
|
|
|
|
|
|
|
|
rm -r /tmp/debian-chroot
|
|
|
|
|
|
|
|
END
|
|
|
|
|
|
|
|
if [ "$HAVE_QEMU" = "yes" ]; then
|
|
|
|
|
|
|
|
./run_qemu.sh
|
|
|
|
|
|
|
|
runtests=$((runtests+1))
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
./run_null.sh SUDO
|
|
|
|
|
|
|
|
runtests=$((runtests+1))
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
print_header "mode=root,variant=apt: test merged-usr via --setup-hook"
|
|
|
|
print_header "mode=root,variant=apt: test merged-usr via --setup-hook"
|
|
|
|
cat << END > shared/test.sh
|
|
|
|
cat << END > shared/test.sh
|
|
|
|
#!/bin/sh
|
|
|
|
#!/bin/sh
|
|
|
|