[PATCH] btrfs-progs: fix zstd compression test on a kernel without ztsd support

[PATCH] btrfs-progs: fix zstd compression test on a kernel without ztsd support

[Johannes Thumshirn]

The test-case 'misc-tests/025-zstd-compression' is failing on a kernel
without zstd compression support.

Check if zstd compression is supported by the kernel and if not skip the
test-case.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
 tests/misc-tests/025-zstd-compression/test.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/misc-tests/025-zstd-compression/test.sh b/tests/misc-tests/025-zstd-compression/test.sh
index 22795d27500e..f9ff1d089fd5 100755
--- a/tests/misc-tests/025-zstd-compression/test.sh
+++ b/tests/misc-tests/025-zstd-compression/test.sh
@@ -6,6 +6,11 @@ source "$TEST_TOP/common"
 check_prereq btrfs
 check_global_prereq md5sum
 
+if ! [ -f "/sys/fs/btrfs/features/compress_zstd" ]; then
+       _not_run "kernel does not support zstd compression feature"
+       exit
+fi
+
 # Extract the test image
 image=$(extract_image compress.raw.xz)
 
-- 
2.16.4

Re: [PATCH] btrfs-progs: fix zstd compression test on a kernel without ztsd support

[David Sterba]

On Tue, Sep 03, 2019 at 02:27:21PM +0200, Johannes Thumshirn wrote:
> The test-case 'misc-tests/025-zstd-compression' is failing on a kernel
> without zstd compression support.
> 
> Check if zstd compression is supported by the kernel and if not skip the
> test-case.
> 
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
> ---
>  tests/misc-tests/025-zstd-compression/test.sh | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/tests/misc-tests/025-zstd-compression/test.sh b/tests/misc-tests/025-zstd-compression/test.sh
> index 22795d27500e..f9ff1d089fd5 100755
> --- a/tests/misc-tests/025-zstd-compression/test.sh
> +++ b/tests/misc-tests/025-zstd-compression/test.sh
> @@ -6,6 +6,11 @@ source "$TEST_TOP/common"
>  check_prereq btrfs
>  check_global_prereq md5sum
>  
> +if ! [ -f "/sys/fs/btrfs/features/compress_zstd" ]; then
> +       _not_run "kernel does not support zstd compression feature"

Sorry, I misled you with this check. The test needs to detect zstd
support in 'btrfs restore'. The only thing I see right now is to grep
for zstd in output of 'ldd', because unlike for btrfs-convert, the help
does not list the optional features.

Re: [PATCH] btrfs-progs: fix zstd compression test on a kernel without ztsd support

[Johannes Thumshirn]

On 03/09/2019 18:09, David Sterba wrote:
>> +if ! [ -f "/sys/fs/btrfs/features/compress_zstd" ]; then
>> +       _not_run "kernel does not support zstd compression feature"
> 
> Sorry, I misled you with this check. The test needs to detect zstd
> support in 'btrfs restore'. The only thing I see right now is to grep
> for zstd in output of 'ldd', because unlike for btrfs-convert, the help
> does not list the optional features.

Well, yes and no. You can compile a btrfs binary with zstd support and
run it on a kernel without. The check would catch this case.

But I see it can't cope with a btrfs binary without zstd support
compiled in indeed.

Let me cook something.

Byte,
	Johannes
-- 
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn@suse.de                                +49 911 74053 689
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5
90409 Nürnberg
Germany
(HRB 247165, AG München)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850