From patchwork Tue Feb 28 12:18:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9595345 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 94EE860429 for ; Tue, 28 Feb 2017 12:20:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8638528452 for ; Tue, 28 Feb 2017 12:20:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A865284E7; Tue, 28 Feb 2017 12:20:54 +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 25A4028452 for ; Tue, 28 Feb 2017 12:20:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751445AbdB1MUp (ORCPT ); Tue, 28 Feb 2017 07:20:45 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:34203 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751768AbdB1MUQ (ORCPT ); Tue, 28 Feb 2017 07:20:16 -0500 Received: by mail-wr0-f193.google.com with SMTP id u48so1408188wrc.1; Tue, 28 Feb 2017 04:18:49 -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=j6rr9mq/bfcJOL+VnT/XqmATeV308V1N/81F+wzy3Vc=; b=vLb8Kdj0FTUOesu92nOkHZqV8n1zi3uLqwJyBRKlrHgDfDEBjKEBfi7om1UfBnHk7k tI8OgBTA4ZJNS5FeMWsfnfMRQMFjYCxr7XNch5L+d6tDn/2sjKSiY6/0Af0rqWIx8LYc gKCi7kjFcUNw6JRt7nlWj6baQKvsSTr3TijPDu5BuEfqWyrDop+ZlgPxElOlVsQy4SIp VHUOQJ8giHhnOuStgHNAHXfaHq5bY8QD0V2iYBjSsuJimWejF/8ZV5bD6lRT90yaCj3K YRdzRjBfVOM14PFtyukmo6BFLBcrIq3q+92DvWDlehcfz/+psCU/AA9QHsFK90JpJd5Q rHNQ== 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=j6rr9mq/bfcJOL+VnT/XqmATeV308V1N/81F+wzy3Vc=; b=M/n/Yl5BYXNjzAFgUW0qIEJpIfAKTT93gl/DmaZuRYK6NHsTlJbMNDZyVQhxk4ph+y 9Oz2L6i0t7MyxaZLibpG8B5s9AxuSrltudUb21tnArnuWcyQ+DHV7XqZxVx+BO5rzyaQ kdXYicpwx9Db5SCPXctTizE6hx/dlmQvO+/jbYwkJ50cFN4BxiS3b0NmtFinf+yiZkAS LizgG5Hfv/6OELjgK3XiRAoqtEjAYA3ZzYKwmH5hIRrgoqe+uEXmaL+9eBZIRsyfbE7v Gqhy984kcrdFN2ClcwpWmau7mvEQMOeQXpwVJHwcAAgRXmAXp9KaE14Gna+hN6pr8dG5 Vm+w== X-Gm-Message-State: AMke39nyNXTZhadhFourPN27RGf9CX0jlx4hI8HOXqyGv4LrlaGrNXy+Y+5R4Bq5VgFSDQ== X-Received: by 10.223.136.183 with SMTP id f52mr1957113wrf.68.1488284328963; Tue, 28 Feb 2017 04:18:48 -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 b58sm2105796wra.47.2017.02.28.04.18.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 04:18:48 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , Xiong Zhou , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v5 04/10] fstests: fix test and scratch filters for overlapping DEV/MNT paths Date: Tue, 28 Feb 2017 14:18:31 +0200 Message-Id: <1488284317-3119-5-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488284317-3119-1-git-send-email-amir73il@gmail.com> References: <1488284317-3119-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 check if TEST_DEV/SCRATCH_DEV is a substring of TEST_DIR/SCRATCH_MNT and try and match the longer string first. Signed-off-by: Amir Goldstein --- common/filter | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/common/filter b/common/filter index 4328159..010f080 100644 --- a/common/filter +++ b/common/filter @@ -280,14 +280,32 @@ _filter_xfs_io_pages_modified() _filter_test_dir() { - sed -e "s,$TEST_DEV,TEST_DEV,g" -e "s,$TEST_DIR,TEST_DIR,g" + if ( echo $TEST_DIR | grep -q $TEST_DEV ); then + # TEST_DEV is substr of TEST_DIR (e.g. /mnt and /mnt/ovl-mnt) + # substitute TEST_DIR first + sed -e "s,$TEST_DIR,TEST_DIR,g" \ + -e "s,$TEST_DEV,TEST_DEV,g" + else + # TEST_DIR maybe a substr of TEST_DIR (e.g. /vdc and /dev/vdc) + # substitute TEST_DEV first + sed -e "s,$TEST_DEV,TEST_DEV,g" \ + -e "s,$TEST_DIR,TEST_DIR,g" + fi } _filter_scratch() { - sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" \ - -e "s,$SCRATCH_MNT,SCRATCH_MNT,g" \ - -e "/.use_space/d" + if ( echo $SCRATCH_MNT | grep -q $SCRATCH_DEV ); then + # SCRATCH_DEV is substr of SCRATCH_MNT + sed -e "s,$SCRATCH_MNT,SCRATCH_MNT,g" \ + -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" \ + -e "/.use_space/d" + else + # SCRATCH_MNT maybe a substr of SCRATCH_DEV + sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" \ + -e "s,$SCRATCH_MNT,SCRATCH_MNT,g" \ + -e "/.use_space/d" + fi } # Turn any device in the scratch pool into SCRATCH_DEV