xfstests: honor comments in the test group file

xfstests: honor comments in the test group file

[Alex Elder]

There are some spots in the "group" file where test numbers have
groups listed after a '#' character, clearly intending for those
groups to be commented out.  But the way the group list gets
generated that commenting doesn't work, and in fact these tests
explicitly *are* included in such commented-out groups.

This patch fixes that, stripping out all comments (which start with
a '#' character and end with a newline) from the file before
building the set of test numbers for a group.

Signed-off-by: Alex Elder <aelder@sgi.com>

---
 common |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Index: b/common
===================================================================
--- a/common
+++ b/common
@@ -58,9 +58,10 @@ do
     if $group
     then
        # arg after -g
-       group_list=`sed -n <group -e 's/$/ /' -e "/^[0-9][0-9][0-9].*
$r /"'{
-s/ .*//p
-}'`
+       group_list=$(sed -n < group \
+                       -e 's/#.*//' \
+                       -e 's/$/ /' \
+                       -e "/^[0-9][0-9][0-9].* $r /"'{ s/ .*//p }')
        if [ -z "$group_list" ]
        then
            echo "Group \"$r\" is empty or not defined?"


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

Re: xfstests: honor comments in the test group file

[Alex Elder]

Will someone review this for me?	-Alex

On Fri, 2010-02-26 at 12:29 -0600, Alex Elder wrote:
> There are some spots in the "group" file where test numbers have
> groups listed after a '#' character, clearly intending for those
> groups to be commented out.  But the way the group list gets
> generated that commenting doesn't work, and in fact these tests
> explicitly *are* included in such commented-out groups.
> 
> This patch fixes that, stripping out all comments (which start with
> a '#' character and end with a newline) from the file before
> building the set of test numbers for a group.
> 
> Signed-off-by: Alex Elder <aelder@sgi.com>
> 
> ---
>  common |    7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> Index: b/common
> ===================================================================
> --- a/common
> +++ b/common
> @@ -58,9 +58,10 @@ do
>      if $group
>      then
>         # arg after -g
> -       group_list=`sed -n <group -e 's/$/ /' -e "/^[0-9][0-9][0-9].*
> $r /"'{
> -s/ .*//p
> -}'`
> +       group_list=$(sed -n < group \
> +                       -e 's/#.*//' \
> +                       -e 's/$/ /' \
> +                       -e "/^[0-9][0-9][0-9].* $r /"'{ s/ .*//p }')
>         if [ -z "$group_list" ]
>         then
>             echo "Group \"$r\" is empty or not defined?"
> 
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs



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