On Tue, May 17, 2022 at 05:01:03PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> Darrick noticed that tests/xfs/191-input-validation didn't get
> generated properly. Fix the regex to handle this.
>
> $ grep -I -R "^_begin_fstest" tests/xfs | \
> sed -e 's/^.*\/\([0-9]*\):_begin_fstest/\1/' |grep 191
> tests/xfs/191-input-validation:_begin_fstest auto quick mkfs realtime
> $
> $ grep -I -R "^_begin_fstest" tests/xfs | \
> sed -e 's/^.*\/\([0-9]*\).*:_begin_fstest/\1/ ' |grep 191
> 191 auto quick mkfs realtime
> $
>
> Use the regexes for matching test names defined in common/test_names
> rather than trying to open code it.
>
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
Definitely an improvement, thank you.
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> tools/mkgroupfile | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tools/mkgroupfile b/tools/mkgroupfile
> index 24435898..414cb538 100755
> --- a/tools/mkgroupfile
> +++ b/tools/mkgroupfile
> @@ -19,6 +19,8 @@ if [ ! -x ../../check ]; then
> exit 1
> fi
>
> +. ../../common/test_names
> +
> cleanup()
> {
> rm -f $new_groups.check
> @@ -60,7 +62,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/^.*\/\($VALID_TEST_NAME\):_begin_fstest/\1/" \
> + >> $new_groups
>
> # Create the list of unique groups for existence checking
> grep -I -R "^_begin_fstest" $test_dir/ | \
> --
> 2.35.1
>
