[PATCH] xfstests: fix the regex pattern in get_group_list of check

[PATCH] xfstests: fix the regex pattern in get_group_list of check

[Wang Sheng-Hui]

In group files, non comment line starts with a 3-digits, then followed by
space and other characters, but no group names.

The old regex in get_group_list uses the group name as part of the regex,
and fails './check -g xfs' run:
         Group "xfs" is empty or not defined?

The patch removes the pattern for group name, and thus we can trigger tests
like "./check -g xfs" as normal.
	

Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>
---
  check | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check b/check
index 966fbe5..abc65cb 100755
--- a/check
+++ b/check
@@ -100,7 +100,7 @@ get_group_list()
  		l=$(sed -n < $SRC_DIR/$d/group \
  			-e 's/#.*//' \
  			-e 's/$/ /' \
-			-e "s;\(^[0-9][0-9][0-9]\).* $grp .*;$SRC_DIR/$d/\1;p")
+			-e "s;\(^[0-9][0-9][0-9]\) .*;$SRC_DIR/$d/\1;p")
  		grpl="$grpl $l"
  	done
  	echo $grpl
-- 
1.7.12.4

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests: fix the regex pattern in get_group_list of check

[Dave Chinner]

On Fri, Apr 12, 2013 at 02:12:35PM +0800, Wang Sheng-Hui wrote:
> In group files, non comment line starts with a 3-digits, then followed by
> space and other characters, but no group names.

I don't follow. A group file line looks like:

003 db auto quick

Which defines the test name, followed by the group names the test
belongs to.

> The old regex in get_group_list uses the group name as part of the regex,
> and fails './check -g xfs' run:
>         Group "xfs" is empty or not defined?

Well, yes, "xfs" is not a defined group name:

$ grep xfs tests/*/group
$

If I define a "xfs" group by assigning tests to it, check runs just
fine.

$ grep xfs tests/*/group
tests/xfs/group:003 db auto quick xfs
$ sudo ./check -g xfs
FSTYP         -- xfs (debug)
PLATFORM      -- Linux/x86_64 test-2 3.9.0-rc4-dgc+
MKFS_OPTIONS  -- -f -bsize=4096 /dev/vdb
MOUNT_OPTIONS -- /dev/vdb /mnt/scratch

xfs/003  1s
Ran: xfs/003
Passed all 1 tests
$

So what check is doing looks perfectly OK to me and doesn't need
changing.

> The patch removes the pattern for group name, and thus we can trigger tests
> like "./check -g xfs" as normal.

If you want to run all the tests in a specific subdirectory regardless
of groups, then you can do it like:

$ sudo ./check xfs/[0-9][0-9][0-9]
FSTYP         -- xfs (debug)
PLATFORM      -- Linux/x86_64 test-2 3.9.0-rc4-dgc+
MKFS_OPTIONS  -- -f -bsize=4096 /dev/vdb
MOUNT_OPTIONS -- /dev/vdb /mnt/scratch

xfs/003  0s
xfs/004  0s
xfs/008  1s
.....

There's definitely better ways to do this, but conflating source tree
layout with runtime test group definitions is not it. ;)

Perhaps something like "check xfs" will just run all tests in the
xfs test dir, similar for ext4, shared, etc?

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests: fix the regex pattern in get_group_list of check

[Wang Sheng-Hui]

On 2013年04月12日 15:57, Dave Chinner wrote:
> On Fri, Apr 12, 2013 at 02:12:35PM +0800, Wang Sheng-Hui wrote:
>> In group files, non comment line starts with a 3-digits, then followed by
>> space and other characters, but no group names.
>
> I don't follow. A group file line looks like:
>
> 003 db auto quick
>
> Which defines the test name, followed by the group names the test
> belongs to.
>
>> The old regex in get_group_list uses the group name as part of the regex,
>> and fails './check -g xfs' run:
>>          Group "xfs" is empty or not defined?
>
> Well, yes, "xfs" is not a defined group name:
>
> $ grep xfs tests/*/group
> $
>
> If I define a "xfs" group by assigning tests to it, check runs just
> fine.
>
> $ grep xfs tests/*/group
> tests/xfs/group:003 db auto quick xfs
> $ sudo ./check -g xfs
> FSTYP         -- xfs (debug)
> PLATFORM      -- Linux/x86_64 test-2 3.9.0-rc4-dgc+
> MKFS_OPTIONS  -- -f -bsize=4096 /dev/vdb
> MOUNT_OPTIONS -- /dev/vdb /mnt/scratch
>
> xfs/003  1s
> Ran: xfs/003
> Passed all 1 tests
> $
>
> So what check is doing looks perfectly OK to me and doesn't need
> changing.
>
>> The patch removes the pattern for group name, and thus we can trigger tests
>> like "./check -g xfs" as normal.
>
> If you want to run all the tests in a specific subdirectory regardless
> of groups, then you can do it like:
>
> $ sudo ./check xfs/[0-9][0-9][0-9]

Thanks, Dave.

I confused the group with fs type.

> FSTYP         -- xfs (debug)
> PLATFORM      -- Linux/x86_64 test-2 3.9.0-rc4-dgc+
> MKFS_OPTIONS  -- -f -bsize=4096 /dev/vdb
> MOUNT_OPTIONS -- /dev/vdb /mnt/scratch
>
> xfs/003  0s
> xfs/004  0s
> xfs/008  1s
> .....
>
> There's definitely better ways to do this, but conflating source tree
> layout with runtime test group definitions is not it. ;)
>
> Perhaps something like "check xfs" will just run all tests in the
> xfs test dir, similar for ext4, shared, etc?
>
> Cheers,
>
> Dave.
>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs