summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-11-18 19:21:02 +0100
committerDavid Sterba <dsterba@suse.com>2016-11-23 11:07:05 +0100
commitd4ce61f7a2905c914e00ff764ecfa2554d1726b7 (patch)
treec55b6dd4d143632b6fe9286b8575acf5829c560b
parent3a8234ee73f6c9e57c0327021f6b8c41c876c685 (diff)
btrfs-progs: tests: add fallback to current directory for check_all_images
Reported-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--tests/common4
-rwxr-xr-xtests/fsck-tests.sh2
-rwxr-xr-xtests/fsck-tests/022-qgroup-rescan-halfway/test.sh2
-rwxr-xr-xtests/fsck-tests/023-qgroup-stack-overflow/test.sh2
4 files changed, 7 insertions, 3 deletions
diff --git a/tests/common b/tests/common
index e653d4c6..5430f822 100644
--- a/tests/common
+++ b/tests/common
@@ -202,6 +202,10 @@ check_all_images()
local extracted
dir="$1"
+ if [ -z "$dir" ]; then
+ dir=.
+ fi
+ _assert_path "$dir"
for image in $(find "$dir" \( -iname '*.img' -o \
-iname '*.img.xz' -o \
-iname '*.raw' -o \
diff --git a/tests/fsck-tests.sh b/tests/fsck-tests.sh
index d5fc3d14..44cca1b8 100755
--- a/tests/fsck-tests.sh
+++ b/tests/fsck-tests.sh
@@ -43,7 +43,7 @@ run_one_test() {
fi
else
# Type 1
- check_all_images `pwd`
+ check_all_images
fi
cd "$TOP"
}
diff --git a/tests/fsck-tests/022-qgroup-rescan-halfway/test.sh b/tests/fsck-tests/022-qgroup-rescan-halfway/test.sh
index 5b114eeb..1dc8f8fc 100755
--- a/tests/fsck-tests/022-qgroup-rescan-halfway/test.sh
+++ b/tests/fsck-tests/022-qgroup-rescan-halfway/test.sh
@@ -16,4 +16,4 @@ check_image() {
fi
}
-check_all_images "."
+check_all_images
diff --git a/tests/fsck-tests/023-qgroup-stack-overflow/test.sh b/tests/fsck-tests/023-qgroup-stack-overflow/test.sh
index e8bf3fae..a304eac5 100755
--- a/tests/fsck-tests/023-qgroup-stack-overflow/test.sh
+++ b/tests/fsck-tests/023-qgroup-stack-overflow/test.sh
@@ -14,4 +14,4 @@ check_image()
run_check $TOP/btrfs check "$1"
}
-check_all_images "."
+check_all_images