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

coverage.sh: run diff with -u

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-08-15 18:07:45 +02:00
parent 8c467584f6
commit e8144b1fbb
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

@ -561,15 +561,15 @@ tar --numeric-owner -tvf /tmp/debian-chroot-shifted.tar \
mkdir /tmp/debian-chroot mkdir /tmp/debian-chroot
tar --xattrs --xattrs-include='*' --directory /tmp/debian-chroot -xf /tmp/debian-chroot-shifted.tar tar --xattrs --xattrs-include='*' --directory /tmp/debian-chroot -xf /tmp/debian-chroot-shifted.tar
echo "100000 100000" > expected echo "100000 100000" > expected
stat --format="%u %g" /tmp/debian-chroot/bin/ping | diff expected - stat --format="%u %g" /tmp/debian-chroot/bin/ping | diff -u expected -
echo "/tmp/debian-chroot/bin/ping cap_net_raw=ep" > expected echo "/tmp/debian-chroot/bin/ping cap_net_raw=ep" > expected
getcap /tmp/debian-chroot/bin/ping | diff expected - getcap /tmp/debian-chroot/bin/ping | diff -u expected -
echo "0 0" > expected echo "0 0" > expected
runuser -u user -- $CMD --unshare-helper /usr/sbin/chroot /tmp/debian-chroot stat --format="%u %g" /bin/ping \ runuser -u user -- $CMD --unshare-helper /usr/sbin/chroot /tmp/debian-chroot stat --format="%u %g" /bin/ping \
| diff expected - | diff -u expected -
echo "/bin/ping cap_net_raw=ep" > expected echo "/bin/ping cap_net_raw=ep" > expected
runuser -u user -- $CMD --unshare-helper /usr/sbin/chroot /tmp/debian-chroot getcap /bin/ping \ runuser -u user -- $CMD --unshare-helper /usr/sbin/chroot /tmp/debian-chroot getcap /bin/ping \
| diff expected - | diff -u expected -
rm /tmp/debian-chroot.tar /tmp/debian-chroot-shifted.tar /tmp/debian-chroot.txt /tmp/debian-chroot-shiftedback.tar expected rm /tmp/debian-chroot.tar /tmp/debian-chroot-shifted.tar /tmp/debian-chroot.txt /tmp/debian-chroot-shiftedback.tar expected
rm -r /tmp/debian-chroot rm -r /tmp/debian-chroot
END END