RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-11 03:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: tests: add quotes around variables in common

Browse Source 
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-11-11 10:04:26 +01:00
parent 747146e237
commit cc0d3d3198
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
tests/common
View File

@ -23,14 +23,14 @@ _assert_path()
_fail()
{
echo "$*" | tee -a $RESULTS
echo "$*" | tee -a "$RESULTS"
exit 1
}
# log a message to the results file
_log()
{
echo "$*" | tee -a $RESULTS
echo "$*" | tee -a "$RESULTS"
}
_not_run()
@ -41,12 +41,12 @@ _not_run()
run_check()
{
echo "############### $@" >> $RESULTS 2>&1
echo "############### $@" >> "$RESULTS" 2>&1
if [ "$TEST_LOG" = 'tty' ]; then echo "CMD: $@" > /dev/tty; fi
if [ "$1" = 'root_helper' ]; then
"$@" >> $RESULTS 2>&1 || _fail "failed: $@"
"$@" >> "$RESULTS" 2>&1 || _fail "failed: $@"
else
$INSTRUMENT "$@" >> $RESULTS 2>&1 || _fail "failed: $@"
$INSTRUMENT "$@" >> "$RESULTS" 2>&1 || _fail "failed: $@"
fi
}
@ -54,12 +54,12 @@ run_check()
# can be processed further
run_check_stdout()
{
echo "############### $@" >> $RESULTS 2>&1
echo "############### $@" >> "$RESULTS" 2>&1
if [ "$TEST_LOG" = 'tty' ]; then echo "CMD(stdout): $@" > /dev/tty; fi
if [ "$1" = 'root_helper' ]; then
"$@" 2>&1 | tee -a $RESULTS || _fail "failed: $@"
"$@" 2>&1 | tee -a "$RESULTS" || _fail "failed: $@"
else
$INSTRUMENT "$@" 2>&1 | tee -a $RESULTS || _fail "failed: $@"
$INSTRUMENT "$@" 2>&1 | tee -a "$RESULTS" || _fail "failed: $@"
fi
}
@ -68,16 +68,16 @@ run_mayfail()
{
local ret
echo "############### $@" >> $RESULTS 2>&1
echo "############### $@" >> "$RESULTS" 2>&1
if [ "$TEST_LOG" = 'tty' ]; then echo "CMD(mayfail): $@" > /dev/tty; fi
if [ "$1" = 'root_helper' ]; then
"$@" >> $RESULTS 2>&1
else
$INSTRUMENT "$@" >> $RESULTS 2>&1
$INSTRUMENT "$@" >> "$RESULTS" 2>&1
fi
ret=$?
if [ $ret != 0 ]; then
echo "failed (ignored, ret=$ret): $@" >> $RESULTS
echo "failed (ignored, ret=$ret): $@" >> "$RESULTS"
if [ $ret == 139 ]; then
_fail "mayfail: returned code 139 (SEGFAULT), not ignored"
elif [ $ret == 134 ]; then
@ -96,18 +96,18 @@ run_mustfail()
msg="$1"
shift
echo "############### $@" >> $RESULTS 2>&1
echo "############### $@" >> "$RESULTS" 2>&1
if [ "$TEST_LOG" = 'tty' ]; then echo "CMD(mustfail): $@" > /dev/tty; fi
if [ "$1" = 'root_helper' ]; then
"$@" >> $RESULTS 2>&1
"$@" >> "$RESULTS" 2>&1
else
$INSTRUMENT "$@" >> $RESULTS 2>&1
$INSTRUMENT "$@" >> "$RESULTS" 2>&1
fi
if [ $? != 0 ]; then
echo "failed (expected): $@" >> $RESULTS
echo "failed (expected): $@" >> "$RESULTS"
return 0
else
echo "succeeded (unexpected!): $@" >> $RESULTS
echo "succeeded (unexpected!): $@" >> "$RESULTS"
_fail "unexpected success: $msg"
return 1
fi
@ -115,7 +115,7 @@ run_mustfail()
check_prereq()
{
if ! [ -f $TOP/$1 ]; then
if ! [ -f "$TOP/$1" ]; then
_fail "Failed prerequisites: $1";
fi
}
@ -133,12 +133,12 @@ check_image()
local image
image=$1
echo "testing image $(basename $image)" >> $RESULTS
$TOP/btrfs check $image >> $RESULTS 2>&1
echo "testing image $(basename $image)" >> "$RESULTS"
$TOP/btrfs check "$image" >> "$RESULTS" 2>&1
[ $? -eq 0 ] && _fail "btrfs check should have detected corruption"
run_check $TOP/btrfs check --repair $image
run_check $TOP/btrfs check $image
run_check $TOP/btrfs check --repair "$image"
run_check $TOP/btrfs check "$image"
}
# Extract a usable image from packed formats
@ -155,36 +155,36 @@ extract_image()
image="$1"
case "$image" in
*.img)
rm -f $image.restored
rm -f "$image.restored"
: ;;
*.img.xz)
xz --decompress --keep "$image" || \
_fail "failed to decompress image $image" >&2
image=${image%%.xz}
rm -f $image.restored
rm -f "$image.restored"
cleanme=$image
;;
*.raw)
cp --sparse=auto $image $image.restored
cp --sparse=auto "$image" "$image.restored"
;;
*.raw.xz)
xz --decompress --keep "$image" || \
_fail "failed to decompress image $image" >&2
image=${image%%.xz}
mv "$image" "$image".restored
mv "$image" "$image.restored"
;;
*.stream.xz)
xz --decompress --keep "$image" || \
_fail "failed to decompress file $image" >&2
image=${image%%.xz}
mv "$image" "$image".restored
mv "$image" "$image.restored"
;;
esac
if ! [ -f $image.restored ]; then
echo "restoring image $(basename $image)" >> $RESULTS
$TOP/btrfs-image -r $image $image.restored \
&>> $RESULTS \
if ! [ -f "$image.restored" ]; then
echo "restoring image $(basename $image)" >> "$RESULTS"
"$TOP/btrfs-image" -r "$image" "$image.restored" \
&>> "$RESULTS" \
|| _fail "failed to restore image $image" >&2
fi
@ -200,7 +200,7 @@ check_all_images()
local extracted
dir="$1"
for image in $(find $dir \( -iname '*.img' -o \
for image in $(find "$dir" \( -iname '*.img' -o \
-iname '*.img.xz' -o \
-iname '*.raw' -o \
-iname '*.raw.xz' \) | sort)
@ -266,7 +266,7 @@ prepare_test_dev()
[[ "$size" ]] || size='2G'
echo "\$TEST_DEV not given, use $TOP/test/test.img as fallback" >> \
$RESULTS
"$RESULTS"
TEST_DEV="$TOP/tests/test.img"
truncate -s "$size" "$TEST_DEV" || _not_run "create file for loop device failed"