From patchwork Thu Jan 12 17:18:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Disseldorp X-Patchwork-Id: 9513673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B96C560476 for ; Thu, 12 Jan 2017 17:19:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9369286F5 for ; Thu, 12 Jan 2017 17:19:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DC55286FC; Thu, 12 Jan 2017 17:19:52 +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=-6.9 required=2.0 tests=BAYES_00,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 8220D286F5 for ; Thu, 12 Jan 2017 17:19:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750791AbdALRTM (ORCPT ); Thu, 12 Jan 2017 12:19:12 -0500 Received: from mx2.suse.de ([195.135.220.15]:41505 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751131AbdALRTB (ORCPT ); Thu, 12 Jan 2017 12:19:01 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id ED5DBAC6A for ; Thu, 12 Jan 2017 17:18:58 +0000 (UTC) From: David Disseldorp To: fstests@vger.kernel.org Cc: David Disseldorp Subject: [PATCH 1/3] xfs/188: add and use _require_xfs_mkfs_ciname Date: Thu, 12 Jan 2017 18:18:47 +0100 Message-Id: <20170112171849.10784-1-ddiss@suse.de> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170112132656.7caa64dd@suse.de> References: <20170112132656.7caa64dd@suse.de> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use an explicit mkfs -n version=ci test to check whether the test should run, instead of checking the xfsprogs version. Suggested-by: Eryu Guan Signed-off-by: David Disseldorp --- common/xfs | 7 +++++++ tests/xfs/188 | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/xfs b/common/xfs index fbd139a..767a481 100644 --- a/common/xfs +++ b/common/xfs @@ -587,3 +587,10 @@ _require_meta_uuid() || _notrun "Kernel doesn't support meta_uuid feature" _scratch_unmount } + +# this test requires mkfs.xfs have case-insensitive naming support +_require_xfs_mkfs_ciname() +{ + _scratch_mkfs_xfs_supported -n version=ci >/dev/null 2>&1 \ + || _notrun "need case-insensitive naming support in mkfs.xfs" +} diff --git a/tests/xfs/188 b/tests/xfs/188 index 6332085..8798ecf 100755 --- a/tests/xfs/188 +++ b/tests/xfs/188 @@ -52,12 +52,8 @@ _cleanup() # real QA test starts here _supported_fs xfs _supported_os IRIX Linux - -if [ $XFSPROGS_VERSION -lt 21000 ]; then - _notrun "this test requires case-insensitive support" -fi - _require_scratch +_require_xfs_mkfs_ciname rm -f $seqres.full _scratch_mkfs -n version=ci >/dev/null 2>&1