xfs
[Top] [All Lists]

[PATCH -v2] check: add support for an external file containing tests to

To: xfs@xxxxxxxxxxx
Subject: [PATCH -v2] check: add support for an external file containing tests to exclude
From: Theodore Ts'o <tytso@xxxxxxx>
Date: Wed, 16 Apr 2014 00:58:22 -0400
Cc: Ext4 Developers List <linux-ext4@xxxxxxxxxxxxxxx>, Theodore Ts'o <tytso@xxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=simple/simple; d=thunk.org; s=ef5046eb; t=1397624306; bh=PXcDIpGad/UQeXpztQuZ8eP8oDnAPwpamnfycssnrJk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h6xSJ3qXQbc/530Kd9G7pPd07ZO2bZo2tv9A5+dJV+CS2KUM1d9swWOosfUAiNn1X 81+SEZ88bRT6PTIEC9Oq1ttgWFV4z9lw9lms99XPLsalLBdXPtSkFXP3If7l7KEMgb psdbMQ9VXv8Sfqa/Ytnp0eekApNP9DyW1F+ShyLo=
In-reply-to: <20140416001530.GU15995@dastard>
References: <20140416001530.GU15995@dastard>
Currently the -X option is intended to specify a set of expunging
files which are stored in each test/* subdirectory.  As described in
the commit description for 0b1e8abd4, in order to exclude the test
generic/280, the -X option is used as follows:

    $ cat tests/generic/3.0-stable-avoid
    280
    $ sudo ./check -X 3.0-stable-avoid generic/280

However, it is sometimes useful to store the set of expunged tests in
a single file, outside of tests/* subdirectories.  This commit enables
the following:

    $ cat /root/conf/data_journal.exclude
    generic/068
    ext4/301
    $ sudo ./check -E /root/conf/data_journal.exclude -g auto

Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
---
 check | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/check b/check
index e7ace63..b1eaed2 100755
--- a/check
+++ b/check
@@ -81,6 +81,7 @@ testlist options
     -g group[,group...]        include tests from these groups
     -x group[,group...]        exclude tests from these groups
     -X file            exclude individual tests
+    -E external_file   exclude individual tests
     [testlist]         include tests matching names in testlist
 '
            exit 0
@@ -222,6 +223,11 @@ while [ $# -gt 0 ]; do
                        done
                done
                ;;
+       -E)     xfile=$2; shift ;
+               if [ -f $xfile ]; then
+                       cat "$xfile" >> $tmp.xlist
+               fi
+               ;;
        -s)     RUN_SECTION="$RUN_SECTION $2"; shift ;;
        -l)     diff="diff" ;;
        -udiff) diff="$diff -u" ;;
-- 
1.9.0

<Prev in Thread] Current Thread [Next in Thread>