From patchwork Wed Dec 19 15:41:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Disseldorp X-Patchwork-Id: 10737501 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5F71D6C5 for ; Wed, 19 Dec 2018 15:42:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F5C62B54E for ; Wed, 19 Dec 2018 15:42:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 433C12B556; Wed, 19 Dec 2018 15:42:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E25EE2B554 for ; Wed, 19 Dec 2018 15:42:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729324AbeLSPmA (ORCPT ); Wed, 19 Dec 2018 10:42:00 -0500 Received: from mx2.suse.de ([195.135.220.15]:39262 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728844AbeLSPmA (ORCPT ); Wed, 19 Dec 2018 10:42:00 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id F20B1ADD4 for ; Wed, 19 Dec 2018 15:41:58 +0000 (UTC) From: David Disseldorp To: fstests@vger.kernel.org Cc: David Disseldorp Subject: [PATCH] check: fix -X exclude_file behaviour Date: Wed, 19 Dec 2018 16:41:55 +0100 Message-Id: <20181219154155.10140-1-ddiss@suse.de> X-Mailer: git-send-email 2.13.7 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It is currently processed before FSTYP has been properly set, leading to xfs, btrfs, etc. specific exclude_files being ignored. Signed-off-by: David Disseldorp Reviewed-by: Johannes Thumshirn --- check | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/check b/check index 59f94c1c..5f8210d7 100755 --- a/check +++ b/check @@ -22,6 +22,7 @@ have_test_arg=false randomize=false export here=`pwd` xfile="" +subdir_xfile="" brief_test_summary=false do_report=false DUMP_OUTPUT=false @@ -272,13 +273,7 @@ while [ $# -gt 0 ]; do XGROUP_LIST="$XGROUP_LIST ${xgroup//,/ }" ;; - -X) xfile=$2; shift ; - for d in $SRC_GROUPS $FSTYP; do - [ -f $SRC_DIR/$d/$xfile ] || continue - for f in `sed "s/#.*$//" $SRC_DIR/$d/$xfile`; do - echo $d/$f >> $tmp.xlist - done - done + -X) subdir_xfile=$2; shift ; ;; -E) xfile=$2; shift ; if [ -f $xfile ]; then @@ -325,6 +320,15 @@ if ! . ./common/rc; then exit 1 fi +if [ -n "$subdir_xfile" ]; then + for d in $SRC_GROUPS $FSTYP; do + [ -f $SRC_DIR/$d/$subdir_xfile ] || continue + for f in `sed "s/#.*$//" $SRC_DIR/$d/$subdir_xfile`; do + echo $d/$f >> $tmp.xlist + done + done +fi + # Process tests from command line now. if $have_test_arg; then while [ $# -gt 0 ]; do