linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 1/2] btrfs-progs: test/common: Introduce run_mustfail_stdout and enhance prepare_test_dev
@ 2017-10-27  0:53 Qu Wenruo
  2017-10-27  0:53 ` [PATCH v3 2/2] btrfs-progs: test/mkfs: Test if the minimal device size is valid Qu Wenruo
  2017-10-27 16:53 ` [PATCH v3 1/2] btrfs-progs: test/common: Introduce run_mustfail_stdout and enhance prepare_test_dev David Sterba
  0 siblings, 2 replies; 6+ messages in thread
From: Qu Wenruo @ 2017-10-27  0:53 UTC (permalink / raw)
  To: linux-btrfs; +Cc: dsterba

Introduce a new function, run_mustfail_stdout(), which is similar to
run_mustfail(), with extra output redirection.
Also this new run_mustfail_stdout() doesn't set pipefail and use
temporary file to catch the output.
So it doesn't support command with pipeline.

Also enhance prepare_test_dev() to truncates the file even it already
exists.
So test device size will be reset each time prepare_test_dev() get
called.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
changelog:
v2:
  Nothing
v3:
  Split the test infrastructure modification into its own patch.
---
 tests/common | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/tests/common b/tests/common
index eb525a4d02c5..80392c3a6d7d 100644
--- a/tests/common
+++ b/tests/common
@@ -236,6 +236,58 @@ run_mustfail()
 	fi
 }
 
+# The first parameter is error message to print if it fails, just like
+# run_must_fail().
+# Also we don't use pipefail to avoid disturbing other script, so here we
+# use temporary output file.
+# So it doesn't support pipeline in the @cmd
+run_mustfail_stdout()
+{
+	local spec
+	local ins
+	local cmd
+	local msg
+	local ret
+	local tmp_output
+
+	tmp_output=$(mktemp --tmpdir btrfs-progs-test--mustfail-stdtout.XXXXXX)
+
+	msg="$1"
+	shift
+
+	if _is_file_or_command "$msg"; then
+		echo "ASSERTION FAIL: 1st argument of run_mustfail_stdout must be a message"
+		exit 1
+	fi
+
+	ins=$(_get_spec_ins "$@")
+	spec=$(($ins-1))
+	cmd=$(eval echo "\${$spec}")
+	spec=$(_cmd_spec "${@:$spec}")
+	set -- "${@:1:$(($ins-1))}" $spec "${@: $ins}"
+	echo "############### $@" >> "$RESULTS" 2>&1
+	if [[ $TEST_LOG =~ tty ]]; then echo "CMD(mustfail): $@" > /dev/tty; fi
+	if [ "$1" = 'root_helper' ]; then
+		"$@" 2>&1 > "$tmp_output"
+	else
+		$INSTRUMENT "$@" 2>&1 > "$tmp_output"
+	fi
+	ret=$?
+
+	cat "$tmp_output" >> "$RESULTS"
+	cat "$tmp_output"
+	rm "$tmp_output"
+
+	if [ "$ret" != 0 ]; then
+		echo "failed (expected): $@" >> "$RESULTS"
+		return 0
+	else
+		echo "succeeded (unexpected!): $@" >> "$RESULTS"
+		_fail "unexpected success: $msg"
+		return 1
+	fi
+}
+
 check_prereq()
 {
 	if ! [ -f "$TOP/$1" ]; then
@@ -389,8 +441,12 @@ prepare_test_dev()
 	# num[K/M/G/T...]
 	local size="$1"
 
-	[[ "$TEST_DEV" ]] && return
 	[[ "$size" ]] || size='2G'
+	# Still truncate it to new size
+	if [[ "$TEST_DEV" ]]; then
+		truncate -s "$size" "$TEST_DEV"
+		return;
+	fi
 
 	echo "\$TEST_DEV not given, use $TOP/test/test.img as fallback" >> \
 		"$RESULTS"
-- 
2.14.3


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v3 2/2] btrfs-progs: test/mkfs: Test if the minimal device size is valid
  2017-10-27  0:53 [PATCH v3 1/2] btrfs-progs: test/common: Introduce run_mustfail_stdout and enhance prepare_test_dev Qu Wenruo
@ 2017-10-27  0:53 ` Qu Wenruo
  2017-10-27 16:59   ` David Sterba
  2017-10-27 16:53 ` [PATCH v3 1/2] btrfs-progs: test/common: Introduce run_mustfail_stdout and enhance prepare_test_dev David Sterba
  1 sibling, 1 reply; 6+ messages in thread
From: Qu Wenruo @ 2017-10-27  0:53 UTC (permalink / raw)
  To: linux-btrfs; +Cc: dsterba

New test case to test if the minimal device size given by "mkfs.btrfs"
failure case is valid.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 tests/mkfs-tests/010-small-image/test.sh | 49 ++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100755 tests/mkfs-tests/010-small-image/test.sh

diff --git a/tests/mkfs-tests/010-small-image/test.sh b/tests/mkfs-tests/010-small-image/test.sh
new file mode 100755
index 000000000000..f55760df061f
--- /dev/null
+++ b/tests/mkfs-tests/010-small-image/test.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+# test if the reported minimal size of mkfs.btrfs is valid
+
+source "$TOP"/tests/common
+
+check_prereq mkfs.btrfs
+check_prereq btrfs
+
+setup_root_helper
+
+do_test()
+{
+	# Well, 1M small enough to fail, we just use the output
+	# to get the minimal device size
+	prepare_test_dev 1M
+	output=$(run_mustfail_stdout "mkfs.btrfs for small image" \
+		 "$TOP"/mkfs.btrfs -f $@ "$TEST_DEV")
+	good_size=$(echo "$output" | grep -oP "(?<=is )\d+")
+
+	prepare_test_dev "$good_size"
+	run_check "$TOP"/mkfs.btrfs -f $@ "$TEST_DEV"
+	run_check $SUDO_HELPER mount "$TEST_DEV" "$TEST_MNT"
+	run_check $SUDO_HELPER umount "$TEST_MNT"
+}
+
+do_test -n 4k	-m single	-d single
+do_test -n 4k	-m single	-d dup
+do_test -n 4k	-m dup		-d single
+do_test -n 4k	-m dup		-d dup
+
+do_test -n 8k	-m single	-d single
+do_test -n 8k	-m single	-d dup
+do_test -n 8k	-m dup		-d single
+do_test -n 8k	-m dup		-d dup
+
+do_test -n 16k	-m single	-d single
+do_test -n 16k	-m single	-d dup
+do_test -n 16k	-m dup		-d single
+do_test -n 16k	-m dup		-d dup
+
+do_test -n 32k	-m single	-d single
+do_test -n 32k	-m single	-d dup
+do_test -n 32k	-m dup		-d single
+do_test -n 32k	-m dup		-d dup
+
+do_test -n 64k	-m single	-d single
+do_test -n 64k	-m single	-d dup
+do_test -n 64k	-m dup		-d single
+do_test -n 64k	-m dup		-d dup
-- 
2.14.3


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v3 1/2] btrfs-progs: test/common: Introduce run_mustfail_stdout and enhance prepare_test_dev
  2017-10-27  0:53 [PATCH v3 1/2] btrfs-progs: test/common: Introduce run_mustfail_stdout and enhance prepare_test_dev Qu Wenruo
  2017-10-27  0:53 ` [PATCH v3 2/2] btrfs-progs: test/mkfs: Test if the minimal device size is valid Qu Wenruo
@ 2017-10-27 16:53 ` David Sterba
  1 sibling, 0 replies; 6+ messages in thread
From: David Sterba @ 2017-10-27 16:53 UTC (permalink / raw)
  To: Qu Wenruo; +Cc: linux-btrfs, dsterba

On Fri, Oct 27, 2017 at 08:53:23AM +0800, Qu Wenruo wrote:
> Introduce a new function, run_mustfail_stdout(), which is similar to
> run_mustfail(), with extra output redirection.
> Also this new run_mustfail_stdout() doesn't set pipefail and use
> temporary file to catch the output.
> So it doesn't support command with pipeline.
> 
> Also enhance prepare_test_dev() to truncates the file even it already
> exists.
> So test device size will be reset each time prepare_test_dev() get
> called.

That's a completely unrelated change to the above and should be also
split, please.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v3 2/2] btrfs-progs: test/mkfs: Test if the minimal device size is valid
  2017-10-27  0:53 ` [PATCH v3 2/2] btrfs-progs: test/mkfs: Test if the minimal device size is valid Qu Wenruo
@ 2017-10-27 16:59   ` David Sterba
  2017-10-27 23:59     ` Qu Wenruo
  2017-10-30  0:53     ` Qu Wenruo
  0 siblings, 2 replies; 6+ messages in thread
From: David Sterba @ 2017-10-27 16:59 UTC (permalink / raw)
  To: Qu Wenruo; +Cc: linux-btrfs, dsterba

On Fri, Oct 27, 2017 at 08:53:24AM +0800, Qu Wenruo wrote:
> New test case to test if the minimal device size given by "mkfs.btrfs"
> failure case is valid.
> 
> Signed-off-by: Qu Wenruo <wqu@suse.com>
> ---
>  tests/mkfs-tests/010-small-image/test.sh | 49 ++++++++++++++++++++++++++++++++
>  1 file changed, 49 insertions(+)
>  create mode 100755 tests/mkfs-tests/010-small-image/test.sh
> 
> diff --git a/tests/mkfs-tests/010-small-image/test.sh b/tests/mkfs-tests/010-small-image/test.sh
> new file mode 100755
> index 000000000000..f55760df061f
> --- /dev/null
> +++ b/tests/mkfs-tests/010-small-image/test.sh
> @@ -0,0 +1,49 @@
> +#!/bin/bash
> +# test if the reported minimal size of mkfs.btrfs is valid
> +
> +source "$TOP"/tests/common
> +
> +check_prereq mkfs.btrfs
> +check_prereq btrfs
> +
> +setup_root_helper
> +
> +do_test()
> +{
> +	# Well, 1M small enough to fail, we just use the output
> +	# to get the minimal device size
> +	prepare_test_dev 1M
> +	output=$(run_mustfail_stdout "mkfs.btrfs for small image" \
> +		 "$TOP"/mkfs.btrfs -f $@ "$TEST_DEV")
> +	good_size=$(echo "$output" | grep -oP "(?<=is )\d+")
> +
> +	prepare_test_dev "$good_size"
> +	run_check "$TOP"/mkfs.btrfs -f $@ "$TEST_DEV"
> +	run_check $SUDO_HELPER mount "$TEST_DEV" "$TEST_MNT"
> +	run_check $SUDO_HELPER umount "$TEST_MNT"

There are helpers for the default mounts, you can use them to save some
typing: run_check_mount_test_dev and run_check_umount_test_dev.

> +}
> +
> +do_test -n 4k	-m single	-d single

I don't seem to get this test to work, it fails with this in the log:

=== Entering btrfs-progs/tests/mkfs-tests/010-small-image
$TEST_DEV not given, use btrfs-progs/test/test.img as fallback
############### btrfs-progs/mkfs.btrfs -f -n 4k -m single -d single btrfs-progs/tests/test.img
btrfs-progs v4.13.3-61-g0615ffa351c2
See http://btrfs.wiki.kernel.org for more information.

failed (expected): btrfs-progs/mkfs.btrfs -f -n 4k -m single -d single btrfs-progs/tests/test.img
############### btrfs-progs/mkfs.btrfs -f -n 4k -m single -d single btrfs-progs/tests/test.img
btrfs-progs v4.13.3-61-g0615ffa351c2
See http://btrfs.wiki.kernel.org for more information.

Label:              (null)
UUID:               b9b55b1b-4096-46ee-acd0-15151a8050d6
Node size:          4096
Sector size:        4096
Filesystem size:    16.00MiB
Block group profiles:
  Data:             single            1.56MiB
  Metadata:         single            1.56MiB
  System:           single            4.00MiB
SSD detected:       no
Incompat features:  extref, skinny-metadata
Number of devices:  1
Devices:
   ID        SIZE  PATH
    1    16.00MiB  btrfs-progs/tests/test.img

############### root_helper mount btrfs-progs/tests/test.img btrfs-progs/tests/mnt
############### root_helper umount btrfs-progs/tests/mnt
############### btrfs-progs/mkfs.btrfs -f -n 4k -m single -d dup btrfs-progs/tests/test.img
btrfs-progs v4.13.3-61-g0615ffa351c2
See http://btrfs.wiki.kernel.org for more information.

failed (expected): btrfs-progs/mkfs.btrfs -f -n 4k -m single -d dup btrfs-progs/tests/test.img
############### btrfs-progs/mkfs.btrfs -f -n 4k -m single -d dup btrfs-progs/tests/test.img
ERROR: not enough free space to allocate chunk
btrfs-progs v4.13.3-61-g0615ffa351c2
See http://btrfs.wiki.kernel.org for more information.

failed: btrfs-progs/mkfs.btrfs -f -n 4k -m single -d dup btrfs-progs/tests/test.img
test failed for case 010-small-image
---

The output is unexpected and does not contain the minimal size. The tested
branch is current devel (7141063af3c9a423dda), your mkfs --rootdir rework
patches are there. Can you please have a look?

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v3 2/2] btrfs-progs: test/mkfs: Test if the minimal device size is valid
  2017-10-27 16:59   ` David Sterba
@ 2017-10-27 23:59     ` Qu Wenruo
  2017-10-30  0:53     ` Qu Wenruo
  1 sibling, 0 replies; 6+ messages in thread
From: Qu Wenruo @ 2017-10-27 23:59 UTC (permalink / raw)
  To: dsterba, Qu Wenruo, linux-btrfs


[-- Attachment #1.1: Type: text/plain, Size: 7020 bytes --]



On 2017年10月28日 00:59, David Sterba wrote:
> On Fri, Oct 27, 2017 at 08:53:24AM +0800, Qu Wenruo wrote:
>> New test case to test if the minimal device size given by "mkfs.btrfs"
>> failure case is valid.
>>
>> Signed-off-by: Qu Wenruo <wqu@suse.com>
>> ---
>>  tests/mkfs-tests/010-small-image/test.sh | 49 ++++++++++++++++++++++++++++++++
>>  1 file changed, 49 insertions(+)
>>  create mode 100755 tests/mkfs-tests/010-small-image/test.sh
>>
>> diff --git a/tests/mkfs-tests/010-small-image/test.sh b/tests/mkfs-tests/010-small-image/test.sh
>> new file mode 100755
>> index 000000000000..f55760df061f
>> --- /dev/null
>> +++ b/tests/mkfs-tests/010-small-image/test.sh
>> @@ -0,0 +1,49 @@
>> +#!/bin/bash
>> +# test if the reported minimal size of mkfs.btrfs is valid
>> +
>> +source "$TOP"/tests/common
>> +
>> +check_prereq mkfs.btrfs
>> +check_prereq btrfs
>> +
>> +setup_root_helper
>> +
>> +do_test()
>> +{
>> +	# Well, 1M small enough to fail, we just use the output
>> +	# to get the minimal device size
>> +	prepare_test_dev 1M
>> +	output=$(run_mustfail_stdout "mkfs.btrfs for small image" \
>> +		 "$TOP"/mkfs.btrfs -f $@ "$TEST_DEV")
>> +	good_size=$(echo "$output" | grep -oP "(?<=is )\d+")
>> +
>> +	prepare_test_dev "$good_size"
>> +	run_check "$TOP"/mkfs.btrfs -f $@ "$TEST_DEV"
>> +	run_check $SUDO_HELPER mount "$TEST_DEV" "$TEST_MNT"
>> +	run_check $SUDO_HELPER umount "$TEST_MNT"
> 
> There are helpers for the default mounts, you can use them to save some
> typing: run_check_mount_test_dev and run_check_umount_test_dev.
> 
>> +}
>> +
>> +do_test -n 4k	-m single	-d single
> 
> I don't seem to get this test to work, it fails with this in the log:

Strange, it passed without problem on my box.

=== Entering /home/adam/btrfs/btrfs-progs/tests/mkfs-tests/010-small-image
$TEST_DEV not given, use /home/adam/btrfs/btrfs-progs/test/test.img as
fallback
############### /home/adam/btrfs/btrfs-progs/mkfs.btrfs -f -n 4k -m
single -d single /home/adam/btrfs/btrfs-progs/tests/test.img
btrfs-progs v4.13.2
See http://btrfs.wiki.kernel.org for more information.

failed (expected): /home/adam/btrfs/btrfs-progs/mkfs.btrfs -f -n 4k -m
single -d single /home/adam/btrfs/btrfs-progs/tests/test.img
############### /home/adam/btrfs/btrfs-progs/mkfs.btrfs -f -n 4k -m
single -d single /home/adam/btrfs/btrfs-progs/tests/test.img
btrfs-progs v4.13.2
See http://btrfs.wiki.kernel.org for more information.

Label:              (null)
UUID:               04213076-9678-420b-b748-5e5b6394e025
Node size:          4096
Sector size:        4096
Filesystem size:    44.00MiB
Block group profiles:
  Data:             single            4.38MiB
  Metadata:         single            4.38MiB
  System:           single            4.00MiB
SSD detected:       no
Incompat features:  extref, skinny-metadata
Number of devices:  1
Devices:
   ID        SIZE  PATH
    1    44.00MiB  /home/adam/btrfs/btrfs-progs/tests/test.img

############### root_helper mount
/home/adam/btrfs/btrfs-progs/tests/test.img
/home/adam/btrfs/btrfs-progs/tests/mnt
############### root_helper umount /home/adam/btrfs/btrfs-progs/tests/mnt
############### /home/adam/btrfs/btrfs-progs/mkfs.btrfs -f -n 4k -m
single -d dup /home/adam/btrfs/btrfs-progs/tests/test.img
btrfs-progs v4.13.2
See http://btrfs.wiki.kernel.org for more information.

failed (expected): /home/adam/btrfs/btrfs-progs/mkfs.btrfs -f -n 4k -m
single -d dup /home/adam/btrfs/btrfs-progs/tests/test.img
############### /home/adam/btrfs/btrfs-progs/mkfs.btrfs -f -n 4k -m
single -d dup /home/adam/btrfs/btrfs-progs/tests/test.img
btrfs-progs v4.13.2
See http://btrfs.wiki.kernel.org for more information.

Label:              (null)
UUID:               f7c3a0db-abf1-4061-99f0-1028ac713ed6
Node size:          4096
Sector size:        4096
Filesystem size:    164.00MiB
Block group profiles:
  Data:             DUP              64.00MiB
  Metadata:         single            8.00MiB
  System:           single            4.00MiB
SSD detected:       no
Incompat features:  extref, skinny-metadata
Number of devices:  1
Devices:
   ID        SIZE  PATH
    1   164.00MiB  /home/adam/btrfs/btrfs-progs/tests/test.img

############### root_helper mount
/home/adam/btrfs/btrfs-progs/tests/test.img
/home/adam/btrfs/btrfs-progs/tests/mnt
############### root_helper umount /home/adam/btrfs/btrfs-progs/tests/mnt


Maybe it's related to the preparation patch for that?
Like the prepare_test_dev() function modification?

Thanks,
Qu
> 
> === Entering btrfs-progs/tests/mkfs-tests/010-small-image
> $TEST_DEV not given, use btrfs-progs/test/test.img as fallback
> ############### btrfs-progs/mkfs.btrfs -f -n 4k -m single -d single btrfs-progs/tests/test.img
> btrfs-progs v4.13.3-61-g0615ffa351c2
> See http://btrfs.wiki.kernel.org for more information.
> 
> failed (expected): btrfs-progs/mkfs.btrfs -f -n 4k -m single -d single btrfs-progs/tests/test.img
> ############### btrfs-progs/mkfs.btrfs -f -n 4k -m single -d single btrfs-progs/tests/test.img
> btrfs-progs v4.13.3-61-g0615ffa351c2
> See http://btrfs.wiki.kernel.org for more information.
> 
> Label:              (null)
> UUID:               b9b55b1b-4096-46ee-acd0-15151a8050d6
> Node size:          4096
> Sector size:        4096
> Filesystem size:    16.00MiB
> Block group profiles:
>   Data:             single            1.56MiB
>   Metadata:         single            1.56MiB
>   System:           single            4.00MiB
> SSD detected:       no
> Incompat features:  extref, skinny-metadata
> Number of devices:  1
> Devices:
>    ID        SIZE  PATH
>     1    16.00MiB  btrfs-progs/tests/test.img
> 
> ############### root_helper mount btrfs-progs/tests/test.img btrfs-progs/tests/mnt
> ############### root_helper umount btrfs-progs/tests/mnt
> ############### btrfs-progs/mkfs.btrfs -f -n 4k -m single -d dup btrfs-progs/tests/test.img
> btrfs-progs v4.13.3-61-g0615ffa351c2
> See http://btrfs.wiki.kernel.org for more information.
> 
> failed (expected): btrfs-progs/mkfs.btrfs -f -n 4k -m single -d dup btrfs-progs/tests/test.img
> ############### btrfs-progs/mkfs.btrfs -f -n 4k -m single -d dup btrfs-progs/tests/test.img
> ERROR: not enough free space to allocate chunk
> btrfs-progs v4.13.3-61-g0615ffa351c2
> See http://btrfs.wiki.kernel.org for more information.
> 
> failed: btrfs-progs/mkfs.btrfs -f -n 4k -m single -d dup btrfs-progs/tests/test.img
> test failed for case 010-small-image
> ---
> 
> The output is unexpected and does not contain the minimal size. The tested
> branch is current devel (7141063af3c9a423dda), your mkfs --rootdir rework
> patches are there. Can you please have a look?
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 520 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v3 2/2] btrfs-progs: test/mkfs: Test if the minimal device size is valid
  2017-10-27 16:59   ` David Sterba
  2017-10-27 23:59     ` Qu Wenruo
@ 2017-10-30  0:53     ` Qu Wenruo
  1 sibling, 0 replies; 6+ messages in thread
From: Qu Wenruo @ 2017-10-30  0:53 UTC (permalink / raw)
  To: dsterba, Qu Wenruo, linux-btrfs


[-- Attachment #1.1: Type: text/plain, Size: 4678 bytes --]



On 2017年10月28日 00:59, David Sterba wrote:
> On Fri, Oct 27, 2017 at 08:53:24AM +0800, Qu Wenruo wrote:
>> New test case to test if the minimal device size given by "mkfs.btrfs"
>> failure case is valid.
>>
>> Signed-off-by: Qu Wenruo <wqu@suse.com>
>> ---
>>  tests/mkfs-tests/010-small-image/test.sh | 49 ++++++++++++++++++++++++++++++++
>>  1 file changed, 49 insertions(+)
>>  create mode 100755 tests/mkfs-tests/010-small-image/test.sh
>>
>> diff --git a/tests/mkfs-tests/010-small-image/test.sh b/tests/mkfs-tests/010-small-image/test.sh
>> new file mode 100755
>> index 000000000000..f55760df061f
>> --- /dev/null
>> +++ b/tests/mkfs-tests/010-small-image/test.sh
>> @@ -0,0 +1,49 @@
>> +#!/bin/bash
>> +# test if the reported minimal size of mkfs.btrfs is valid
>> +
>> +source "$TOP"/tests/common
>> +
>> +check_prereq mkfs.btrfs
>> +check_prereq btrfs
>> +
>> +setup_root_helper
>> +
>> +do_test()
>> +{
>> +	# Well, 1M small enough to fail, we just use the output
>> +	# to get the minimal device size
>> +	prepare_test_dev 1M
>> +	output=$(run_mustfail_stdout "mkfs.btrfs for small image" \
>> +		 "$TOP"/mkfs.btrfs -f $@ "$TEST_DEV")
>> +	good_size=$(echo "$output" | grep -oP "(?<=is )\d+")
>> +
>> +	prepare_test_dev "$good_size"
>> +	run_check "$TOP"/mkfs.btrfs -f $@ "$TEST_DEV"
>> +	run_check $SUDO_HELPER mount "$TEST_DEV" "$TEST_MNT"
>> +	run_check $SUDO_HELPER umount "$TEST_MNT"
> 
> There are helpers for the default mounts, you can use them to save some
> typing: run_check_mount_test_dev and run_check_umount_test_dev.
> 
>> +}
>> +
>> +do_test -n 4k	-m single	-d single
> 
> I don't seem to get this test to work, it fails with this in the log:

Forgot to mention, the test case is for minimal-device-size fix patchset:
Enhance minimal device size calculation to fix mkfs failure on small file

Considering I sent too many patchset recently and most of them have
dependency, should I resend a big patchset to address the dependency?

IIRC the dependency should be:
rootdir rework -> rootdir refactor -> minimal device size fix (including
test cases)

And later mkfs qgroup support also depends on rootdir rework (just
conflicts, not code dependency)

Thanks,
Qu
> 
> === Entering btrfs-progs/tests/mkfs-tests/010-small-image
> $TEST_DEV not given, use btrfs-progs/test/test.img as fallback
> ############### btrfs-progs/mkfs.btrfs -f -n 4k -m single -d single btrfs-progs/tests/test.img
> btrfs-progs v4.13.3-61-g0615ffa351c2
> See http://btrfs.wiki.kernel.org for more information.
> 
> failed (expected): btrfs-progs/mkfs.btrfs -f -n 4k -m single -d single btrfs-progs/tests/test.img
> ############### btrfs-progs/mkfs.btrfs -f -n 4k -m single -d single btrfs-progs/tests/test.img
> btrfs-progs v4.13.3-61-g0615ffa351c2
> See http://btrfs.wiki.kernel.org for more information.
> 
> Label:              (null)
> UUID:               b9b55b1b-4096-46ee-acd0-15151a8050d6
> Node size:          4096
> Sector size:        4096
> Filesystem size:    16.00MiB
> Block group profiles:
>   Data:             single            1.56MiB
>   Metadata:         single            1.56MiB
>   System:           single            4.00MiB
> SSD detected:       no
> Incompat features:  extref, skinny-metadata
> Number of devices:  1
> Devices:
>    ID        SIZE  PATH
>     1    16.00MiB  btrfs-progs/tests/test.img
> 
> ############### root_helper mount btrfs-progs/tests/test.img btrfs-progs/tests/mnt
> ############### root_helper umount btrfs-progs/tests/mnt
> ############### btrfs-progs/mkfs.btrfs -f -n 4k -m single -d dup btrfs-progs/tests/test.img
> btrfs-progs v4.13.3-61-g0615ffa351c2
> See http://btrfs.wiki.kernel.org for more information.
> 
> failed (expected): btrfs-progs/mkfs.btrfs -f -n 4k -m single -d dup btrfs-progs/tests/test.img
> ############### btrfs-progs/mkfs.btrfs -f -n 4k -m single -d dup btrfs-progs/tests/test.img
> ERROR: not enough free space to allocate chunk
> btrfs-progs v4.13.3-61-g0615ffa351c2
> See http://btrfs.wiki.kernel.org for more information.
> 
> failed: btrfs-progs/mkfs.btrfs -f -n 4k -m single -d dup btrfs-progs/tests/test.img
> test failed for case 010-small-image
> ---
> 
> The output is unexpected and does not contain the minimal size. The tested
> branch is current devel (7141063af3c9a423dda), your mkfs --rootdir rework
> patches are there. Can you please have a look?
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 520 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-10-30  0:53 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-27  0:53 [PATCH v3 1/2] btrfs-progs: test/common: Introduce run_mustfail_stdout and enhance prepare_test_dev Qu Wenruo
2017-10-27  0:53 ` [PATCH v3 2/2] btrfs-progs: test/mkfs: Test if the minimal device size is valid Qu Wenruo
2017-10-27 16:59   ` David Sterba
2017-10-27 23:59     ` Qu Wenruo
2017-10-30  0:53     ` Qu Wenruo
2017-10-27 16:53 ` [PATCH v3 1/2] btrfs-progs: test/common: Introduce run_mustfail_stdout and enhance prepare_test_dev David Sterba

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).