From patchwork Sun Feb 12 20:43:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9568519 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 3652060574 for ; Sun, 12 Feb 2017 20:44:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27FCF281C3 for ; Sun, 12 Feb 2017 20:44:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CF3A2823E; Sun, 12 Feb 2017 20:44:08 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 C53F628249 for ; Sun, 12 Feb 2017 20:44:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751317AbdBLUoH (ORCPT ); Sun, 12 Feb 2017 15:44:07 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34994 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751269AbdBLUoG (ORCPT ); Sun, 12 Feb 2017 15:44:06 -0500 Received: by mail-wr0-f196.google.com with SMTP id o16so21474178wra.2; Sun, 12 Feb 2017 12:44:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F3BYmivx6lmLrO/FtICwl8jwxrSVROeGyRzqCslgJIk=; b=DKUgIN8E7gTXtRxr9OrLdMo+oG4Y7KnxFve0rh1HrDObEQRZAwsYfNc51NIxZeCIZx 9KN49FfW7l5fFhDxwyZrpO9Ivcea36nugpEDtJaf02f2x0m1F2WmkujCl86kbZDRiaq6 FBkoUOO+q0VV5HFzkuAdHrk0Mc0pLbeIja/9Y0gX4sxXU3XjCL9NxEjLa44m7am2QJvL amrj2jNUwE9r3vXEkCr288P26U5zjw0UEGIO/W63VGmOYJ17lmvkABrTstiltkUrnpEY 9SCTTBHpdv0xE9oJQJRVxk99WU5tGTaQwgIOM/q2Vx6A7ftG/OqjlQZtiavFzVUJ9/Uf NS1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=F3BYmivx6lmLrO/FtICwl8jwxrSVROeGyRzqCslgJIk=; b=aVR8rxKCcZJyiRWw0yWEBG0kCcY3ywTN5dP7cqDohhdqbJnbVfGvv0ZvzAauXldZcM xPt83YmAPwBao0A4coqUR/vtLWwu7hD+3omPLb1+Y+xTKFk/WHhfC8Fg4Znw0+SLdq4k R2tJbK+XGNruzh8sPTWSQoRjOp+0DpaYJIAIynGEPSa6Qk5VLrKi93gqzGmT2MdWXFhb sxJsf9QYdN8pzzTzfKN0C55sv6OzmKGeIXFs8i0oE373uhuwKq09Uvxj+rnUqAHwWGl/ TKSwxtDLtu53aud3tv7cOtOD37MTRc6uZKH/D1RT7+29vhq8EkMYbEhg2GNm6KCDt4RR b1Ag== X-Gm-Message-State: AMke39nyYSWLuC7oJ9BFqxadF1QvY7w+ZHqIgXBWvy39MfWz/UU75snFt9LzQG3L6EVGLw== X-Received: by 10.223.137.2 with SMTP id s2mr18662520wrs.20.1486932245218; Sun, 12 Feb 2017 12:44:05 -0800 (PST) Received: from localhost.localdomain (bzq-79-176-143-83.red.bezeqint.net. [79.176.143.83]) by smtp.gmail.com with ESMTPSA id o59sm8040404wrc.56.2017.02.12.12.44.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Feb 2017 12:44:04 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v3 8/9] overlay: fix test and scratch filters for overlay base fs Date: Sun, 12 Feb 2017 22:43:43 +0200 Message-Id: <1486932224-17075-9-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486932224-17075-1-git-send-email-amir73il@gmail.com> References: <1486932224-17075-1-git-send-email-amir73il@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When configuring overlay base fs, TEST_DEV/DIR and SCRATCH_DEV/MNT are derived from the base fs mount points, where *_DEV are the path of the base fs mount point and TEST_DIR/SCRATCH_MNT are a directory under the base fs mount point. This means that the overlay DEV paths are prefixes of the overlay mount points. Fix the test and sctach filters to try and match TEST_DIR/SCRATCH_MNT first and only then try and match the shorter *_DEV. Signed-off-by: Amir Goldstein --- common/filter | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/filter b/common/filter index 4328159..ef20ea6 100644 --- a/common/filter +++ b/common/filter @@ -280,13 +280,14 @@ _filter_xfs_io_pages_modified() _filter_test_dir() { - sed -e "s,$TEST_DEV,TEST_DEV,g" -e "s,$TEST_DIR,TEST_DIR,g" + sed -e "s,$TEST_DIR,TEST_DIR,g" \ + -e "s,$TEST_DEV,TEST_DEV,g" } _filter_scratch() { - sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" \ - -e "s,$SCRATCH_MNT,SCRATCH_MNT,g" \ + sed -e "s,$SCRATCH_MNT,SCRATCH_MNT,g" \ + -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" \ -e "/.use_space/d" }