diff mbox series

[2/3] btrfs-progs: mkfs-tests/025: fix the wrong function call

Message ID e89c8122b8b999737e4164467b2b6164daae0575.1664936628.git.wqu@suse.com (mailing list archive)
State New, archived
Headers show
Series btrfs-progs: selftests fixes | expand

Commit Message

Qu Wenruo Oct. 5, 2022, 2:25 a.m. UTC
[BUG]
Btrfs-progs test case mkfs/025 will output the following error:

  # make TEST=025\* test-mkfs
    [TEST]   mkfs-tests.sh
    [TEST/mkfs]   025-zoned-parallel
  ./test.sh: line 11: !check_min_kernel_version: command not found

[CAUSE]
There lacks a space between "!" and the function we called.

[FIX]
Add back the missing space.

Note that, this requires the previous fix on check_min_kernel_version(),
or it will not properly work on v6.x kernels.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 tests/mkfs-tests/025-zoned-parallel/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Wang Yugui Oct. 5, 2022, 6:43 a.m. UTC | #1
Hi,

> [BUG]
> Btrfs-progs test case mkfs/025 will output the following error:
> 
>   # make TEST=025\* test-mkfs
>     [TEST]   mkfs-tests.sh
>     [TEST/mkfs]   025-zoned-parallel
>   ./test.sh: line 11: !check_min_kernel_version: command not found
> 
> [CAUSE]
> There lacks a space between "!" and the function we called.
> 
> [FIX]
> Add back the missing space.
> 
> Note that, this requires the previous fix on check_min_kernel_version(),
> or it will not properly work on v6.x kernels.
> 
> Signed-off-by: Qu Wenruo <wqu@suse.com>
> ---
>  tests/mkfs-tests/025-zoned-parallel/test.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/mkfs-tests/025-zoned-parallel/test.sh b/tests/mkfs-tests/025-zoned-parallel/test.sh
> index 8cad906cd5d1..83274bb23447 100755
> --- a/tests/mkfs-tests/025-zoned-parallel/test.sh
> +++ b/tests/mkfs-tests/025-zoned-parallel/test.sh
> @@ -8,7 +8,7 @@ source "$TEST_TOP/common"
>  setup_root_helper
>  prepare_test_dev
>  
> -if !check_min_kernel_version 5.12; then
> +if ! check_min_kernel_version 5.12; then
>  	_notrun "zoned tests need kernel 5.12 and newer"
>  fi

'_notrun' should be changed to '_not_run' too.

Best Regards
Wang Yugui (wangyugui@e16-tech.com)
2022/10/05

>  
> -- 
> 2.37.3
Qu Wenruo Oct. 5, 2022, 7:58 a.m. UTC | #2
On 2022/10/5 14:43, Wang Yugui wrote:
> Hi,
>
>> [BUG]
>> Btrfs-progs test case mkfs/025 will output the following error:
>>
>>    # make TEST=025\* test-mkfs
>>      [TEST]   mkfs-tests.sh
>>      [TEST/mkfs]   025-zoned-parallel
>>    ./test.sh: line 11: !check_min_kernel_version: command not found
>>
>> [CAUSE]
>> There lacks a space between "!" and the function we called.
>>
>> [FIX]
>> Add back the missing space.
>>
>> Note that, this requires the previous fix on check_min_kernel_version(),
>> or it will not properly work on v6.x kernels.
>>
>> Signed-off-by: Qu Wenruo <wqu@suse.com>
>> ---
>>   tests/mkfs-tests/025-zoned-parallel/test.sh | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/mkfs-tests/025-zoned-parallel/test.sh b/tests/mkfs-tests/025-zoned-parallel/test.sh
>> index 8cad906cd5d1..83274bb23447 100755
>> --- a/tests/mkfs-tests/025-zoned-parallel/test.sh
>> +++ b/tests/mkfs-tests/025-zoned-parallel/test.sh
>> @@ -8,7 +8,7 @@ source "$TEST_TOP/common"
>>   setup_root_helper
>>   prepare_test_dev
>>
>> -if !check_min_kernel_version 5.12; then
>> +if ! check_min_kernel_version 5.12; then
>>   	_notrun "zoned tests need kernel 5.12 and newer"
>>   fi
>
> '_notrun' should be changed to '_not_run' too.

That's right, I forgot this as my previous patch would render the path
unreachable for newer kernels.

David, can you fix it when merging?

Thanks,
Qu
>
> Best Regards
> Wang Yugui (wangyugui@e16-tech.com)
> 2022/10/05
>
>>
>> --
>> 2.37.3
>
>
David Sterba Oct. 5, 2022, 11:50 a.m. UTC | #3
On Wed, Oct 05, 2022 at 03:58:47PM +0800, Qu Wenruo wrote:
> On 2022/10/5 14:43, Wang Yugui wrote:
> >>   tests/mkfs-tests/025-zoned-parallel/test.sh | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/tests/mkfs-tests/025-zoned-parallel/test.sh b/tests/mkfs-tests/025-zoned-parallel/test.sh
> >> index 8cad906cd5d1..83274bb23447 100755
> >> --- a/tests/mkfs-tests/025-zoned-parallel/test.sh
> >> +++ b/tests/mkfs-tests/025-zoned-parallel/test.sh
> >> @@ -8,7 +8,7 @@ source "$TEST_TOP/common"
> >>   setup_root_helper
> >>   prepare_test_dev
> >>
> >> -if !check_min_kernel_version 5.12; then
> >> +if ! check_min_kernel_version 5.12; then
> >>   	_notrun "zoned tests need kernel 5.12 and newer"
> >>   fi
> >
> > '_notrun' should be changed to '_not_run' too.
> 
> That's right, I forgot this as my previous patch would render the path
> unreachable for newer kernels.
> 
> David, can you fix it when merging?

Fixed and pushed, thanks.
diff mbox series

Patch

diff --git a/tests/mkfs-tests/025-zoned-parallel/test.sh b/tests/mkfs-tests/025-zoned-parallel/test.sh
index 8cad906cd5d1..83274bb23447 100755
--- a/tests/mkfs-tests/025-zoned-parallel/test.sh
+++ b/tests/mkfs-tests/025-zoned-parallel/test.sh
@@ -8,7 +8,7 @@  source "$TEST_TOP/common"
 setup_root_helper
 prepare_test_dev
 
-if !check_min_kernel_version 5.12; then
+if ! check_min_kernel_version 5.12; then
 	_notrun "zoned tests need kernel 5.12 and newer"
 fi