From d4eb5a77d7a29419f625d4ed0b4c828bb49eba57 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 13 Mar 2017 17:52:20 +0100 Subject: [PATCH] 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 --- tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh | 3 +-- tests/mkfs-tests/003-mixed-with-wrong-nodesize/test.sh | 3 +-- 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 855fbd1..3784623 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 289d5ff..074fc22 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 -- 2.7.4