On Sat, May 21, 2022 at 01:43:49PM +0800, Zorro Lang wrote:
> The mkgroupfile doesn't sort cases in number order, that cause
> fstests' ./new script can't find a proper number which isn't taken.
> The unsorted case number might cause more problems, so fix it.
>
> Fixes: 441606d28681 ("fstests: faster group file creation")
> Signed-off-by: Zorro Lang <zlang@xxxxxxxxxx>
Makes sense to me.
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> ---
>
> Hi,
>
> If you'd like to fix this issue seperately, I can merge this patch with Dave's
> "[PATCH 04/12] fstests: fix group list generation for whacky test names"
> together.
Yeah, that'd be nice...
--D
>
> Thanks,
> Zorro
>
> tools/mkgroupfile | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/mkgroupfile b/tools/mkgroupfile
> index 24435898..bab85046 100755
> --- a/tools/mkgroupfile
> +++ b/tools/mkgroupfile
> @@ -60,7 +60,8 @@ ENDL
>
> # Aggregate the groups each test belongs to for the group file
> grep -I -R "^_begin_fstest" $test_dir/ | \
> - sed -e 's/^.*\/\([0-9]*\):_begin_fstest/\1/' >> $new_groups
> + sed -e 's/^.*\/\([0-9]*\):_begin_fstest/\1/' | \
> + sort -ug >> $new_groups
>
> # Create the list of unique groups for existence checking
> grep -I -R "^_begin_fstest" $test_dir/ | \
> --
> 2.31.1
>
