zulcss/mmdebstrap
1
0
Fork 0
forked from josch/mmdebstrap
Code Pull requests Activity

coverage.sh: make regex more precise and relax it for version numbers

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2018-12-05 12:01:58 +01:00
parent b57b8de3a0
commit 94862ef03e
Signed by untrusted user: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
coverage.sh
View file

@ -731,22 +731,22 @@ prefix=
# artificially add some files # artificially add some files
# in proot mode, some extra files are put there by proot # in proot mode, some extra files are put there by proot
{ tar -tf /tmp/unstable-chroot.tar \ { tar -tf /tmp/unstable-chroot.tar \
| grep -v '^./usr/lib/ld-linux-armhf.so.3$' \ | grep -v '^\./usr/lib/ld-linux-armhf\.so\.3$' \
| grep -v '^./usr/lib/arm-linux-gnueabihf/ld-linux.so.3$' \ | grep -v '^\./usr/lib/arm-linux-gnueabihf/ld-linux\.so\.3$' \
| grep -v '^./usr/lib/arm-linux-gnueabihf/ld-linux-armhf.so.3$' \ | grep -v '^\./usr/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";
} | sort > tar2.txt } | sort > tar2.txt
{ cat tar1.txt \ { cat tar1.txt \
| grep -v '^./usr/bin/i386$' \ | grep -v '^\./usr/bin/i386$' \
| grep -v '^./usr/bin/x86_64$' \ | grep -v '^\./usr/bin/x86_64$' \
| grep -v '^./usr/lib64/ld-linux-x86-64.so.2$' \ | grep -v '^\./usr/lib64/ld-linux-x86-64\.so\.2$' \
| grep -v '^./usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2$' \ | grep -v '^\./usr/lib/x86_64-linux-gnu/ld-linux-x86-64\.so\.2$' \
| grep -v '^./usr/lib/x86_64-linux-gnu/libmvec-2.27.so$' \ | grep -v '^\./usr/lib/x86_64-linux-gnu/libmvec-2\.[0-9]\+\.so$' \
| grep -v '^./usr/lib/x86_64-linux-gnu/libmvec.so.1$' \ | grep -v '^\./usr/lib/x86_64-linux-gnu/libmvec\.so\.1$' \
| grep -v '^./usr/share/man/man8/i386.8.gz$' \ | grep -v '^\./usr/share/man/man8/i386\.8\.gz$' \
| grep -v '^./usr/share/man/man8/x86_64.8.gz$'; | grep -v '^\./usr/share/man/man8/x86_64\.8\.gz$';
[ "$mode" = "proot" ] && printf "./etc/ld.so.preload\n"; [ "$mode" = "proot" ] && printf "./etc/ld.so.preload\n";
} | sort | diff -u - tar2.txt } | sort | diff -u - tar2.txt
rm /tmp/unstable-chroot.tar rm /tmp/unstable-chroot.tar