summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2017-03-13 17:52:20 +0100
committerDavid Sterba <dsterba@suse.com>2017-03-16 17:02:44 +0100
commitd4eb5a77d7a29419f625d4ed0b4c828bb49eba57 (patch)
treefaac11caa19a0fa7befd084be12e9abd36c70993
parentb7eb8f7650c6707dc3a45835955db4a770d90b68 (diff)
btrfs-progs: tests: mkfs/002 and 003: use TEST_DEV instead of IMAGE
As we don't know what's the TEST_DEV like, use the explicit mkfs limit. Signed-off-by: David Sterba <dsterba@suse.com>
-rwxr-xr-xtests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh3
-rwxr-xr-xtests/mkfs-tests/003-mixed-with-wrong-nodesize/test.sh3
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh b/tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh
index 855fbd18..37846234 100755
--- a/tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh
+++ b/tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh
@@ -8,6 +8,5 @@ check_prereq mkfs.btrfs
setup_root_helper
-run_check truncate -s 512M $IMAGE
-mixed=$(run_check_stdout $TOP/mkfs.btrfs -n 64k -f $IMAGE | egrep 'Data|Metadata')
+mixed=$(run_check_stdout "$TOP/mkfs.btrfs" -b 512M -n 64k -f "$TEST_DEV" | egrep 'Data|Metadata')
echo "$mixed" | grep -q -v 'Data+Metadata:' || _fail "unexpected: created a mixed-bg filesystem"
diff --git a/tests/mkfs-tests/003-mixed-with-wrong-nodesize/test.sh b/tests/mkfs-tests/003-mixed-with-wrong-nodesize/test.sh
index 289d5ff0..074fc22e 100755
--- a/tests/mkfs-tests/003-mixed-with-wrong-nodesize/test.sh
+++ b/tests/mkfs-tests/003-mixed-with-wrong-nodesize/test.sh
@@ -6,7 +6,6 @@ source $TOP/tests/common
check_prereq mkfs.btrfs
-run_check truncate -s 512M $IMAGE
-run_mayfail $TOP/mkfs.btrfs -f -M -s 4096 -n 16384 "$IMAGE" && _fail
+run_mayfail "$TOP/mkfs.btrfs" -b 512M -f -M -s 4096 -n 16384 "$TEST_DEV" && _fail
exit 0