summaryrefslogtreecommitdiff
path: root/tests/common
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-11-21 14:51:40 +0100
committerDavid Sterba <dsterba@suse.com>2016-11-23 11:07:06 +0100
commit55db7bf0598ab782d64cd1605a3c9a7162997a54 (patch)
treec1b6400993dee1cf018aaa7bd2dbadd5d721ec06 /tests/common
parentc1d714f944ee334a58ebf0adb19420bcf5d62d84 (diff)
btrfs-progs: tests: more variable quoting in common scripts
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'tests/common')
-rw-r--r--tests/common14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/common b/tests/common
index d9dec0c3..98ef0292 100644
--- a/tests/common
+++ b/tests/common
@@ -73,7 +73,7 @@ run_mayfail()
echo "############### $@" >> "$RESULTS" 2>&1
if [[ $TEST_LOG =~ tty ]]; then echo "CMD(mayfail): $@" > /dev/tty; fi
if [ "$1" = 'root_helper' ]; then
- "$@" >> $RESULTS 2>&1
+ "$@" >> "$RESULTS" 2>&1
else
$INSTRUMENT "$@" >> "$RESULTS" 2>&1
fi
@@ -136,11 +136,11 @@ check_image()
image=$1
echo "testing image $(basename $image)" >> "$RESULTS"
- $TOP/btrfs check "$image" >> "$RESULTS" 2>&1
+ "$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
@@ -322,7 +322,7 @@ generate_dataset() {
dirpath=$TEST_MNT/$dataset_type
run_check $SUDO_HELPER mkdir -p "$dirpath"
- case $dataset_type in
+ case "$dataset_type" in
small)
for num in $(seq 1 "$DATASET_SIZE"); do
run_check $SUDO_HELPER dd if=/dev/urandom of="$dirpath/$dataset_type.$num" bs=10K \
@@ -332,14 +332,14 @@ generate_dataset() {
hardlink)
for num in $(seq 1 "$DATASET_SIZE"); do
- run_check $SUDO_HELPER touch $dirpath/$dataset_type.$num
+ run_check $SUDO_HELPER touch "$dirpath/$dataset_type.$num"
run_check $SUDO_HELPER ln "$dirpath/$dataset_type.$num" "$dirpath/hlink.$num"
done
;;
fast_symlink)
for num in $(seq 1 "$DATASET_SIZE"); do
- run_check $SUDO_HELPER touch $dirpath/$dataset_type.$num
+ run_check $SUDO_HELPER touch "$dirpath/$dataset_type.$num"
run_check cd "$dirpath" && \
$SUDO_HELPER ln -s "$dataset_type.$num" "$dirpath/slink.$num" && \
cd /