xfstests: fix 108 through config mechanism

* xfstests: fix 108 through config mechanism
@ 2010-12-09 14:40 Boris Ranto
  2010-12-10 14:37 ` Christoph Hellwig
  0 siblings, 1 reply; 4+ messages in thread
From: Boris Ranto @ 2010-12-09 14:40 UTC (permalink / raw)
  To: xfs

Test case 108 can fail beacuse of the incorrect amount of spaces in its output.
This can be overrided by passing -b option to diff (quotation of man page):
       -b  --ignore-space-change
              Ignore changes in the amount of white space.

Since there is currently no mechanism to pass any option to diff I suggest following mechanism:
Every test can have its config file ($sef.config) where all its test-run configuration can be stored.
Also it should contain variable CONFIG_OPTIONS that specifies what options are created/modified.
The check script'll only source the config file if it exists and unset all the modified variables that are listed in CONFIG_OPTIONS variable once they're not needed.

This configuration mechanism could (with additional patch to the file check) also help handle multiple output files that might be beneficial in few test cases.

Patch that fixes test case 108 and adds described mechanism of test configuration:

diff -urpN a/xfstests/108.config b/xfstests/108.config

--- a/xfstests/108.config       1970-01-01 01:00:00.000000000 +0100
+++ b/xfstests/108.config       2010-12-09 11:24:51.626367533 +0100
@@ -0,0 +1,2 @@
+export CONFIG_OPTIONS="DIFF_OPTIONS CONFIG_OPTIONS"
+export DIFF_OPTIONS="-b"
diff -urpN a/xfstests/check b/xfstests/check
--- a/xfstests/check    2010-12-09 11:34:26.709247611 +0100
+++ b/xfstests/check    2010-12-09 11:37:13.857370558 +0100
@@ -226,6 +226,11 @@ do
     else
        # really going to try and run this one
        #
+       CONFIG_OPTIONS="CONFIG_OPTIONS"
+       if [ -f $seq.config ]
+       then
+               source $seq.config
+       fi
        rm -f $seq.out.bad
        lasttime=`sed -n -e "/^$seq /s/.* //p" <check.time`
        if [ "X$lasttime" != X ]; then
@@ -273,7 +278,7 @@ do
                echo " - no qualified output"
                err=true
            else
-               if diff $seq.out $tmp.out >/dev/null 2>&1
+               if diff $DIFF_OPTIONS $seq.out $tmp.out >/dev/null 2>&1
                then
                    if $err
                    then
@@ -286,12 +291,12 @@ do
                else
                    echo " - output mismatch (see $seq.out.bad)"
                    mv $tmp.out $seq.out.bad
-                   $diff $seq.out $seq.out.bad
+                   $diff $DIFF_OPTIONS $seq.out $seq.out.bad
                    err=true
                fi
            fi
        fi
-
+       unset $CONFIG_OPTIONS
     fi

     # come here for each test, except when $showme is true

Signed-off-by: Boris Ranto <branto@redhat.com>

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

^ permalink raw reply	[flat|nested] 4+ messages in thread