summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2018-03-07 21:22:47 +0100
committerJakob Unterwurzacher2018-03-07 21:36:52 +0100
commit8373410678eaadbfe7079065f80fc9ea16e4a4b3 (patch)
tree6558a9a8ae651e15089c8bccf101e0f886ecd5c1
parent51de6cd9405aa0db3b248324623c82cbc05e61ae (diff)
macos: extractloop.sh: exclude symlink & mute ln error message
Extracting the symlink fails with linux-3.0/arch/microblaze/boot/dts/system.dts: Can't set permissions to 0755 so just exclude it. The ln error Looks scary but is harmless, so get rid of it. The symlink is only created to make it more convenient to view the csv log.
-rwxr-xr-xtests/stress_tests/extractloop.bash8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/stress_tests/extractloop.bash b/tests/stress_tests/extractloop.bash
index 26496ba..970eafd 100755
--- a/tests/stress_tests/extractloop.bash
+++ b/tests/stress_tests/extractloop.bash
@@ -39,7 +39,7 @@ elif [ $# -eq 1 ] && [ "$1" == "-loopback" ]; then
else
echo "Testing gocryptfs"
gocryptfs -q -init -extpass="echo test" -scryptn=10 $CRYPT
- gocryptfs -q -extpass="echo test" -nosyslog -f $CRYPT $MNT &
+ gocryptfs -q -extpass="echo test" -nosyslog -fg $CRYPT $MNT &
FSPID=$(jobs -p)
#gocryptfs -q -extpass="echo test" -nosyslog -memprofile /tmp/extractloop-mem $CRYPT $MNT
fi
@@ -48,7 +48,7 @@ echo "Test dir: $CRYPT"
sleep 1
cd $MNT
-ln -sTf $CSV /tmp/extractloop.csv || true # fails on MacOS
+ln -v -sTf $CSV /tmp/extractloop.csv 2> /dev/null || true # fails on MacOS, ignore
# Cleanup trap
# Note: gocryptfs may have already umounted itself because bash relays SIGINT
@@ -67,7 +67,9 @@ function loop {
while true
do
t1=$SECONDS
- tar xf /tmp/linux-3.0.tar.gz
+ 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"
md5sum --status -c $MD5
rm -Rf linux-3.0
t2=$SECONDS