From patchwork Wed Mar 11 11:15:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 5983571 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 334B89F318 for ; Wed, 11 Mar 2015 11:15:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 52FE2203A0 for ; Wed, 11 Mar 2015 11:15:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A9D220437 for ; Wed, 11 Mar 2015 11:15:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751662AbbCKLPz (ORCPT ); Wed, 11 Mar 2015 07:15:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33188 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751639AbbCKLPz (ORCPT ); Wed, 11 Mar 2015 07:15:55 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2BBFrmM024395 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 11 Mar 2015 07:15:54 -0400 Received: from localhost (dhcp12-136.nay.redhat.com [10.66.12.136] (may be forged)) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2BBFpfE023349; Wed, 11 Mar 2015 07:15:52 -0400 From: Eryu Guan To: fstests@vger.kernel.org Cc: Eryu Guan Subject: [PATCH 4/4] xfs/073: be quiet about mouting with nouuid option Date: Wed, 11 Mar 2015 19:15:34 +0800 Message-Id: <1426072534-12246-5-git-send-email-eguan@redhat.com> In-Reply-To: <1426072534-12246-1-git-send-email-eguan@redhat.com> References: <1426072534-12246-1-git-send-email-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP v4 and v5 xfs generate different outputs because v4 xfs only retries mount with nouuid option once in the test, v5 xfs tries more times(with xfs_copy running with -d option). Just be quiet about mounting with nouuid option, it's much easier than preparing two different 073.outs and selecting the proper one at runtime Signed-off-by: Eryu Guan Reviewed-by: Eric Sandeen --- tests/xfs/073 | 2 +- tests/xfs/073.out | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/xfs/073 b/tests/xfs/073 index f955771..508725f 100755 --- a/tests/xfs/073 +++ b/tests/xfs/073 @@ -88,7 +88,7 @@ _verify_copy() mount -t xfs -o loop $target $target_dir 2>/dev/null if [ $? -ne 0 ]; then - echo retrying mount with nouuid option + echo retrying mount with nouuid option >>$seqres.full mount -t xfs -o loop -o nouuid $target $target_dir if [ $? -ne 0 ]; then echo mount failed - evil! diff --git a/tests/xfs/073.out b/tests/xfs/073.out index f3b147e..3f27467 100644 --- a/tests/xfs/073.out +++ b/tests/xfs/073.out @@ -29,7 +29,6 @@ Creating file All copies completed. checking new image mounting new image on loopback -retrying mount with nouuid option comparing new image files to old comparing new image directories to old comparing new image geometry to old