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

coverage.sh: re-enable fakechroot testing as #915559 got fixed

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2019-02-28 07:51:47 +01:00
parent d0f0283120
commit 632b19eca3
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
coverage.sh
View file

@ -51,7 +51,7 @@ if [ ! -e shared/mmdebstrap ] || [ mmdebstrap -nt shared/mmdebstrap ]; then
fi fi
starttime= starttime=
total=69 total=87
i=1 i=1
print_header() { print_header() {
@ -876,7 +876,6 @@ 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
[ "$mode" = "fakechroot" ] && continue
# 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
@ -919,6 +918,7 @@ prefix=
# artificially add some files # artificially add some files
{ tar -tf /tmp/unstable-chroot.tar; { tar -tf /tmp/unstable-chroot.tar;
[ "$mode" = "fakechroot" ] && printf "./etc/ld.so.cache\n./var/cache/ldconfig/\n"; [ "$mode" = "fakechroot" ] && printf "./etc/ld.so.cache\n./var/cache/ldconfig/\n";
[ "$mode" = "fakechroot" ] && [ "$variant" != "essential" ] && printf "./etc/.pwd.lock\n";
} | sort | diff -u "./$variant.txt" - } | sort | diff -u "./$variant.txt" -
rm /tmp/unstable-chroot.tar rm /tmp/unstable-chroot.tar
END END
@ -942,6 +942,7 @@ prefix=
\$prefix fakechroot fakeroot $CMD --mode=$mode --variant=$variant unstable /tmp/unstable-chroot.tar $mirror \$prefix fakechroot fakeroot $CMD --mode=$mode --variant=$variant unstable /tmp/unstable-chroot.tar $mirror
{ tar -tf /tmp/unstable-chroot.tar; { tar -tf /tmp/unstable-chroot.tar;
printf "./etc/ld.so.cache\n./var/cache/ldconfig/\n"; printf "./etc/ld.so.cache\n./var/cache/ldconfig/\n";
[ "$variant" != "essential" ] && printf "./etc/.pwd.lock\n";
} | sort | diff -u "./$variant.txt" - } | sort | diff -u "./$variant.txt" -
rm /tmp/unstable-chroot.tar rm /tmp/unstable-chroot.tar
END END
@ -1118,7 +1119,6 @@ fi
# create directory in sudo mode # create directory in sudo mode
for mode in root unshare fakechroot proot; do for mode in root unshare fakechroot proot; do
[ "$mode" = "fakechroot" ] && continue
print_header "mode=$mode,variant=apt: create armhf tarball" print_header "mode=$mode,variant=apt: create armhf tarball"
if [ "$HAVE_BINFMT" != "yes" ]; then if [ "$HAVE_BINFMT" != "yes" ]; then
echo "HAVE_BINFMT != yes -- Skipping test..." echo "HAVE_BINFMT != yes -- Skipping test..."
@ -1153,7 +1153,7 @@ prefix=
| grep -v '^\./lib/arm-linux-gnueabihf/ld-linux-armhf\.so\.3$' \ | grep -v '^\./lib/arm-linux-gnueabihf/ld-linux-armhf\.so\.3$' \
| sed 's/arm-linux-gnueabihf/x86_64-linux-gnu/' \ | sed 's/arm-linux-gnueabihf/x86_64-linux-gnu/' \
| sed 's/armhf/amd64/'; | sed 's/armhf/amd64/';
[ "$mode" = "fakechroot" ] && printf "./etc/ld.so.cache\n./var/cache/ldconfig/\n"; [ "$mode" = "fakechroot" ] && printf "./etc/ld.so.cache\n./var/cache/ldconfig/\n./etc/.pwd.lock\n";
} | sort > tar2.txt } | sort > tar2.txt
{ cat tar1.txt \ { cat tar1.txt \
| grep -v '^\./usr/bin/i386$' \ | grep -v '^\./usr/bin/i386$' \