From patchwork Tue Sep 10 11:36:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 11139233 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D5C13912 for ; Tue, 10 Sep 2019 11:36:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BCAC62081B for ; Tue, 10 Sep 2019 11:36:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730046AbfIJLgS (ORCPT ); Tue, 10 Sep 2019 07:36:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33002 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726849AbfIJLgS (ORCPT ); Tue, 10 Sep 2019 07:36:18 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3B93030860C7 for ; Tue, 10 Sep 2019 11:36:18 +0000 (UTC) Received: from dhcp-12-171.nay.redhat.com (dhcp-12-171.nay.redhat.com [10.66.12.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D7151001948 for ; Tue, 10 Sep 2019 11:36:17 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH] generic/566: use _require_xfs_quota_foreign to replace the hard -f option Date: Tue, 10 Sep 2019 19:36:11 +0800 Message-Id: <20190910113611.31247-1-zlang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 10 Sep 2019 11:36:18 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org xfstests should decide if xfs_quota need the -f option by _require_xfs_quota_foreign, not write the -f option after $XFS_QUOTA_PROG manually. The later way will cause unexpected error on an old system which xfsprogs doesn't support the -f option. Signed-off-by: Zorro Lang --- tests/generic/566 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/generic/566 b/tests/generic/566 index e8491e54..fb239a00 100755 --- a/tests/generic/566 +++ b/tests/generic/566 @@ -34,6 +34,7 @@ _supported_os Linux _supported_fs generic _require_scratch _require_quota +_require_xfs_quota_foreign _require_user rm -f $seqres.full @@ -45,7 +46,7 @@ _qmount dir="$SCRATCH_MNT/dummy" mkdir -p $dir chown $qa_user $dir -$XFS_QUOTA_PROG -x -f -c "limit -g bsoft=100k bhard=100k $qa_user" $SCRATCH_MNT +$XFS_QUOTA_PROG -x -c "limit -g bsoft=100k bhard=100k $qa_user" $SCRATCH_MNT $XFS_IO_PROG -f -c 'pwrite -S 0x58 0 1m' $dir/foo >> $seqres.full chown $qa_user "${dir}/foo"