From patchwork Thu Jul 14 12:43:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Tulak X-Patchwork-Id: 9229725 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 41381608A6 for ; Thu, 14 Jul 2016 12:44:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32E9127FA9 for ; Thu, 14 Jul 2016 12:44:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27CAE27FBE; Thu, 14 Jul 2016 12:44:09 +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 CAA93281A7 for ; Thu, 14 Jul 2016 12:44:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751384AbcGNMoA (ORCPT ); Thu, 14 Jul 2016 08:44:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49540 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751251AbcGNMno (ORCPT ); Thu, 14 Jul 2016 08:43:44 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E4184315D25 for ; Thu, 14 Jul 2016 12:43:43 +0000 (UTC) Received: from jtulak.brq.redhat.com (jtulak.brq.redhat.com [10.34.26.85]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6EChc2S008413; Thu, 14 Jul 2016 08:43:42 -0400 From: Jan Tulak To: fstests@vger.kernel.org Cc: Jan Tulak Subject: [PATCH 4/6] xfstests: add _require_xfs_mkfs_validation to common/rc Date: Thu, 14 Jul 2016 14:43:32 +0200 Message-Id: <1468500214-6237-5-git-send-email-jtulak@redhat.com> In-Reply-To: <1468500214-6237-1-git-send-email-jtulak@redhat.com> References: <1468500214-6237-1-git-send-email-jtulak@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 14 Jul 2016 12:43:43 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a simple way to skip a test if it is (or is not) run on mkfs correctly validating inputs. Signed-off-by: Jan Tulak --- common/rc | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/common/rc b/common/rc index 0c68e4f..72f9901 100644 --- a/common/rc +++ b/common/rc @@ -3843,6 +3843,35 @@ _get_fs_sysfs_attr() cat /sys/fs/${FSTYP}/${dname}/${attr} } +# Skip if we are running an older binary without the stricter input checks. +# Make multiple checks to be sure that there is no regression on the one +# selected feature check, which would skew the result. +_require_xfs_mkfs_validation() +{ + _require_scratch + $MKFS_XFS_PROG -f -N -s size=2s $SCRATCH_DEV >/dev/null 2>&1 + sum=$? + $MKFS_XFS_PROG -f -N -l version=2,su=$((256 * 1024 + 4096)) $SCRATCH_DEV >/dev/null 2>&1 + sum=`expr $sum + $?` + + if [ "$sum" -eq 0 ]; then + _notrun "Requires newer mkfs with stricter input checks." + fi +} + +# The oposite of _require_xfs_mkfs_validation. +_require_xfs_mkfs_without_validation() +{ + _require_scratch + $MKFS_XFS_PROG -f -N -s size=2s $SCRATCH_DEV >/dev/null 2>&1 + sum=$? + $MKFS_XFS_PROG -f -N -l version=2,su=$((256 * 1024 + 4096)) $SCRATCH_DEV >/dev/null 2>&1 + sum=`expr $sum + $?` + + if [ "$sum" -eq 2 ]; then + _notrun "Requires older mkfs without stricter input checks." + fi +} init_rc ################################################################################