tests: extractloop.sh: don't abort if md5sum is missing
MacOS does not have it installed by default.
This commit is contained in:
parent
8373410678
commit
e46f6b940f
@ -26,6 +26,16 @@ CSV=$CRYPT.csv
|
|||||||
MNT=$CRYPT.mnt
|
MNT=$CRYPT.mnt
|
||||||
mkdir $MNT
|
mkdir $MNT
|
||||||
|
|
||||||
|
function check_md5sums {
|
||||||
|
if command -v md5sum > /dev/null ; then
|
||||||
|
md5sum --status -c $1
|
||||||
|
else
|
||||||
|
# MacOS / darwin which do not have the md5sum utility
|
||||||
|
# installed by default
|
||||||
|
echo "Skipping md5sum (not installed). Hint: brew install md5sha1sum"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# Mount
|
# Mount
|
||||||
FSPID=0
|
FSPID=0
|
||||||
if [ $# -eq 1 ] && [ "$1" == "-encfs" ]; then
|
if [ $# -eq 1 ] && [ "$1" == "-encfs" ]; then
|
||||||
@ -36,11 +46,13 @@ elif [ $# -eq 1 ] && [ "$1" == "-loopback" ]; then
|
|||||||
rm -f /tmp/loopback*.memprof
|
rm -f /tmp/loopback*.memprof
|
||||||
loopback -l -memprofile=/tmp/loopback $MNT $CRYPT &
|
loopback -l -memprofile=/tmp/loopback $MNT $CRYPT &
|
||||||
FSPID=$(jobs -p)
|
FSPID=$(jobs -p)
|
||||||
|
disown
|
||||||
else
|
else
|
||||||
echo "Testing gocryptfs"
|
echo "Testing gocryptfs"
|
||||||
gocryptfs -q -init -extpass="echo test" -scryptn=10 $CRYPT
|
gocryptfs -q -init -extpass="echo test" -scryptn=10 $CRYPT
|
||||||
gocryptfs -q -extpass="echo test" -nosyslog -fg $CRYPT $MNT &
|
gocryptfs -q -extpass="echo test" -nosyslog -fg $CRYPT $MNT &
|
||||||
FSPID=$(jobs -p)
|
FSPID=$(jobs -p)
|
||||||
|
disown
|
||||||
#gocryptfs -q -extpass="echo test" -nosyslog -memprofile /tmp/extractloop-mem $CRYPT $MNT
|
#gocryptfs -q -extpass="echo test" -nosyslog -memprofile /tmp/extractloop-mem $CRYPT $MNT
|
||||||
fi
|
fi
|
||||||
echo "Test dir: $CRYPT"
|
echo "Test dir: $CRYPT"
|
||||||
@ -53,7 +65,7 @@ ln -v -sTf $CSV /tmp/extractloop.csv 2> /dev/null || true # fails on MacOS, igno
|
|||||||
# Cleanup trap
|
# Cleanup trap
|
||||||
# Note: gocryptfs may have already umounted itself because bash relays SIGINT
|
# Note: gocryptfs may have already umounted itself because bash relays SIGINT
|
||||||
# Just ignore unmount errors.
|
# Just ignore unmount errors.
|
||||||
trap "cd /; fuse-unmount -z $MNT; rm -rf $CRYPT $MNT" EXIT
|
trap "cd / ; fuse-unmount -z $MNT ; rm -rf $CRYPT; rmdir $MNT" EXIT
|
||||||
|
|
||||||
function loop {
|
function loop {
|
||||||
ID=$1
|
ID=$1
|
||||||
@ -70,7 +82,7 @@ function loop {
|
|||||||
tar xf /tmp/linux-3.0.tar.gz --exclude linux-3.0/arch/microblaze/boot/dts/system.dts
|
tar xf /tmp/linux-3.0.tar.gz --exclude linux-3.0/arch/microblaze/boot/dts/system.dts
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
# Exclude the one symlink in the tarball - causes problems on MacOS: "Can't set permissions to 0755"
|
# Exclude the one symlink in the tarball - causes problems on MacOS: "Can't set permissions to 0755"
|
||||||
md5sum --status -c $MD5
|
check_md5sums $MD5
|
||||||
rm -Rf linux-3.0
|
rm -Rf linux-3.0
|
||||||
t2=$SECONDS
|
t2=$SECONDS
|
||||||
delta=$((t2-t1))
|
delta=$((t2-t1))
|
||||||
|
Loading…
Reference in New Issue
Block a user