From 94862ef03e565a0742d893b92e2c9ccc5ce08846 Mon Sep 17 00:00:00 2001 From: Johannes 'josch' Schauer Date: Wed, 5 Dec 2018 12:01:58 +0100 Subject: [PATCH] coverage.sh: make regex more precise and relax it for version numbers --- coverage.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/coverage.sh b/coverage.sh index 9e9b581..a80e9f3 100755 --- a/coverage.sh +++ b/coverage.sh @@ -731,22 +731,22 @@ prefix= # artificially add some files # in proot mode, some extra files are put there by proot { tar -tf /tmp/unstable-chroot.tar \ - | 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-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-armhf\.so\.3$' \ | sed 's/arm-linux-gnueabihf/x86_64-linux-gnu/' \ | sed 's/armhf/amd64/'; [ "$mode" = "fakechroot" ] && printf "./etc/ld.so.cache\n./var/cache/ldconfig/\n"; } | sort > tar2.txt { cat tar1.txt \ - | grep -v '^./usr/bin/i386$' \ - | grep -v '^./usr/bin/x86_64$' \ - | 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/libmvec-2.27.so$' \ - | 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/x86_64.8.gz$'; + | grep -v '^\./usr/bin/i386$' \ + | grep -v '^\./usr/bin/x86_64$' \ + | 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/libmvec-2\.[0-9]\+\.so$' \ + | 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/x86_64\.8\.gz$'; [ "$mode" = "proot" ] && printf "./etc/ld.so.preload\n"; } | sort | diff -u - tar2.txt rm /tmp/unstable-chroot.tar