From patchwork Tue Dec 13 06:15:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9471819 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 3760060760 for ; Tue, 13 Dec 2016 06:15:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E148284F9 for ; Tue, 13 Dec 2016 06:15:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12AC028528; Tue, 13 Dec 2016 06:15:53 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 7C4E1284F9 for ; Tue, 13 Dec 2016 06:15:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752805AbcLMGPv (ORCPT ); Tue, 13 Dec 2016 01:15:51 -0500 Received: from mail-wj0-f195.google.com ([209.85.210.195]:34793 "EHLO mail-wj0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751237AbcLMGPv (ORCPT ); Tue, 13 Dec 2016 01:15:51 -0500 Received: by mail-wj0-f195.google.com with SMTP id xy5so14650941wjc.1; Mon, 12 Dec 2016 22:15:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=9gCkiKJDlrqWjRzLnzH9ms4IX8pNO6rDRDu6PJiTQ4A=; b=KsE/tV8KNFWqxcdeW5WBlc6bYiuFVykAt9AAe+BduXrFKYcaoJcAdRTE7vEDKeH9e4 SXv5sZvggr2P2n6iYb6VrOghhOofoG3LPj4VhAQ+omG+CCbyw+mP+NnutI422MJoUhi+ lFvIP9px+pCShgpIJzEJezxSUvPVCFWBRc35UL89Rqt96fkmwT8onfldtN/GqiNsQLO9 I9ZwDrql+oDZi05FDnrLsNzYu9mizwkvvOaH2ru/a1e4Gu2uRBOuHACHOsBQKrWusHGy x1jvjlLFq24to8HwbvBa91dvszmDrtC9r49rwMm2VzZxnmUbLPU8Oabba1ZxDXEXhxYI M7jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9gCkiKJDlrqWjRzLnzH9ms4IX8pNO6rDRDu6PJiTQ4A=; b=iBrH1iTDQbr4T0QlRF41LSVDYovnaEvTpwk1B+zGtA3hfaoRhrwS437vwPPq+LcViX xt2eurFI9iXh+cKLh/7aSOAi1ehm2W02A0WgyEZ4N2qui6j0MwfeCJSWyjYo4VognPt/ 4zmX0b/WjHtK9gVnNzzEvaYzAUYD8MMQzK3w/eoTS6DHJS3h228uykurKniLidM3TJF+ uI/yYQK4142PUq9NK36ATU6yYp7tVY438F42lhnqwNSrTYCGpXnqawQySzbc593i1cy6 ERTVniQLSAYhaWqwu1RO+l10RXGSX29D8nEYy5he3MLe9RRZoXFdvP90PPtYFDTthDyR puQw== X-Gm-Message-State: AKaTC01boJxrweXQ5u7WeIdE1DyafkqbI20QOEjD0upbbjG+NvcLIq8Lhus+aECjdjNzPA== X-Received: by 10.194.203.135 with SMTP id kq7mr98501150wjc.26.1481609749517; Mon, 12 Dec 2016 22:15:49 -0800 (PST) Received: from amir-VirtualBox.Home (bzq-109-65-102-174.red.bezeqint.net. [109.65.102.174]) by smtp.gmail.com with ESMTPSA id up5sm17786854wjc.12.2016.12.12.22.15.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Dec 2016 22:15:47 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2] overlay/016: do not cd into $SCRATCH_MNT Date: Tue, 13 Dec 2016 08:15:29 +0200 Message-Id: <1481609729-12341-1-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Avoid cd into $SCRATCH_MNT Signed-off-by: Amir Goldstein --- tests/overlay/016 | 13 ++++++------- tests/overlay/016.out | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) v2: - undo cleanup of _cleanup() - sperate patch for 016 diff --git a/tests/overlay/016 b/tests/overlay/016 index 041ab3d..cffcde7 100755 --- a/tests/overlay/016 +++ b/tests/overlay/016 @@ -64,7 +64,6 @@ echo "This is old news" > $lowerdir/bar _scratch_mount -cd $SCRATCH_MNT # # case #1: @@ -73,12 +72,12 @@ cd $SCRATCH_MNT # write to rwfd # read from rofd # -$XFS_IO_PROG -r foo \ - -C "open foo" \ +$XFS_IO_PROG -r $SCRATCH_MNT/foo \ + -C "open $SCRATCH_MNT/foo" \ -C "pwrite -S 0x61 0 16" \ -C "file 0" \ -C "pread -v 0 16" \ -| _filter_xfs_io +| _filter_xfs_io | _filter_scratch # # case #2: @@ -86,12 +85,12 @@ $XFS_IO_PROG -r foo \ # write to rwfd # read from mapped memory # -$XFS_IO_PROG -r bar \ +$XFS_IO_PROG -r $SCRATCH_MNT/bar \ -C "mmap -r 0 16" \ - -C "open bar" \ + -C "open $SCRATCH_MNT/bar" \ -C "pwrite -S 0x61 0 16" \ -C "mread -v 0 16" \ -| _filter_xfs_io +| _filter_xfs_io | _filter_scratch status=0 exit diff --git a/tests/overlay/016.out b/tests/overlay/016.out index c49f8dc..a28aaa6 100644 --- a/tests/overlay/016.out +++ b/tests/overlay/016.out @@ -1,8 +1,8 @@ QA output created by 016 wrote 16/16 bytes at offset 0 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -[000] foo (foreign,non-sync,non-direct,read-only) - 001 foo (foreign,non-sync,non-direct,read-write) +[000] SCRATCH_MNT/foo (foreign,non-sync,non-direct,read-only) + 001 SCRATCH_MNT/foo (foreign,non-sync,non-direct,read-write) 00000000: 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 aaaaaaaaaaaaaaaa read 16/16 bytes at offset 0 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)