From patchwork Wed Mar 8 07:26:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 9610627 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 15AB160414 for ; Wed, 8 Mar 2017 09:20:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFE622851D for ; Wed, 8 Mar 2017 09:20:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C435C28574; Wed, 8 Mar 2017 09:20:22 +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 7069B2851D for ; Wed, 8 Mar 2017 09:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750783AbdCHJUW (ORCPT ); Wed, 8 Mar 2017 04:20:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49554 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751336AbdCHJUV (ORCPT ); Wed, 8 Mar 2017 04:20:21 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (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 C97606AAE6; Wed, 8 Mar 2017 07:26:36 +0000 (UTC) Received: from dhcp-12-168.nay.redhat.com (dhcp12-168.nay.redhat.com [10.66.12.168] (may be forged)) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v287QZNi021383; Wed, 8 Mar 2017 02:26:35 -0500 From: Zorro Lang To: fstests@vger.kernel.org Cc: darrick.wong@oracle.com Subject: [PATCH] generic/411: change sub-path name that's duplicate of TEST_DIR Date: Wed, 8 Mar 2017 15:26:31 +0800 Message-Id: <1488957991-18194-1-git-send-email-zlang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 08 Mar 2017 07:26:36 +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 Darrick found generic/411 golden output mismatch if use TEST_DIR=/mnt. Because g/411 use some test path named /mnt/XXXX/mnt1/mnt2, _filter_test_dir will replace all "/mnt" things to "TEST_DIR". For stop this failure, change all directory names to be "$seq-XXX", that's less likely to be mistaken for TEST_* and SCRATCH_*. Reported-by: Darrick J. Wong Signed-off-by: Zorro Lang --- tests/generic/411 | 10 +++++----- tests/generic/411.out | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/generic/411 b/tests/generic/411 index 414d3a5..8a45f14 100755 --- a/tests/generic/411 +++ b/tests/generic/411 @@ -123,18 +123,18 @@ crash_test() start_test shared _get_mount $SCRATCH_DEV $mpA - mkdir $mpA/mnt1 + mkdir $mpA/${seq}-mnt1 $MOUNT_PROG --make-shared $mpA _get_mount --bind $mpA $mpB _get_mount --bind $mpA $mpC $MOUNT_PROG --make-slave $mpB $MOUNT_PROG --make-slave $mpC - _get_mount $SCRATCH_DEV $mpA/mnt1 - mkdir $mpA/mnt1/mnt2 + _get_mount $SCRATCH_DEV $mpA/${seq}-mnt1 + mkdir $mpA/${seq}-mnt1/${seq}-mnt2 - _get_mount $SCRATCH_DEV $mpB/mnt1/mnt2 + _get_mount $SCRATCH_DEV $mpB/${seq}-mnt1/${seq}-mnt2 find_mnt - fs_stress $mpB/mnt1/mnt2 + fs_stress $mpB/${seq}-mnt1/${seq}-mnt2 end_test echo "crash test passed" diff --git a/tests/generic/411.out b/tests/generic/411.out index 16dadaf..01a0cdd 100644 --- a/tests/generic/411.out +++ b/tests/generic/411.out @@ -2,11 +2,11 @@ QA output created by 411 ------ TEST_DIR/411 SCRATCH_DEV mpA SCRATCH_DEV -mpA/mnt1 SCRATCH_DEV +mpA/411-mnt1 SCRATCH_DEV mpB SCRATCH_DEV -mpB/mnt1 SCRATCH_DEV -mpB/mnt1/mnt2 SCRATCH_DEV +mpB/411-mnt1 SCRATCH_DEV +mpB/411-mnt1/411-mnt2 SCRATCH_DEV mpC SCRATCH_DEV -mpC/mnt1 SCRATCH_DEV +mpC/411-mnt1 SCRATCH_DEV ====== crash test passed