From patchwork Wed Apr 16 04:58:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 339430 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5D95514007F for ; Wed, 16 Apr 2014 14:58:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752196AbaDPE6a (ORCPT ); Wed, 16 Apr 2014 00:58:30 -0400 Received: from imap.thunk.org ([74.207.234.97]:54941 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750893AbaDPE63 (ORCPT ); Wed, 16 Apr 2014 00:58:29 -0400 Received: from root (helo=closure.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.80) (envelope-from ) id 1WaHvX-0004sn-CQ; Wed, 16 Apr 2014 04:58:27 +0000 Received: by closure.thunk.org (Postfix, from userid 15806) id 76403580893; Wed, 16 Apr 2014 00:58:26 -0400 (EDT) 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= From: Theodore Ts'o To: xfs@oss.sgi.com Cc: Ext4 Developers List , Theodore Ts'o Subject: [PATCH -v2] check: add support for an external file containing tests to exclude Date: Wed, 16 Apr 2014 00:58:22 -0400 Message-Id: <1397624302-9577-1-git-send-email-tytso@mit.edu> X-Mailer: git-send-email 1.9.0 In-Reply-To: <20140416001530.GU15995@dastard> References: <20140416001530.GU15995@dastard> X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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" Reviewed-by: Dave Chinner --- 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" ;;