From patchwork Tue Feb 28 12:18:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9595331 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 D9AE560429 for ; Tue, 28 Feb 2017 12:20:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C980F284E8 for ; Tue, 28 Feb 2017 12:20:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE355284EC; Tue, 28 Feb 2017 12:20:24 +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 6D10E284E8 for ; Tue, 28 Feb 2017 12:20:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752364AbdB1MUW (ORCPT ); Tue, 28 Feb 2017 07:20:22 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33128 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751737AbdB1MUQ (ORCPT ); Tue, 28 Feb 2017 07:20:16 -0500 Received: by mail-wm0-f67.google.com with SMTP id v77so2068462wmv.0; Tue, 28 Feb 2017 04:18:48 -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=+4dIgBUQTsWl+hEf7BcftFzpge2/28ML3ZTQlpIt2M8=; b=rHAMXXxaW/Kn9pvqMewwVOM7PEp2L/WSJRtpqUc6iP9dFJWOowKXSqqTzRLQqJG/lo Q6XjA06k61CeiamKfsTsF+qbqNM7bHJzZH26PGtm3PJ62LKTl2fBkv75+5VP3kHaSgiq CgEe5vY3dSwMBRP6qW9ddKoGcKMv17ocKyMAeFtEby50le02HBWhzF6ZVwalbW4RyP57 KSmC1e4kR0w2D/QoQIENVP5ZAKFtt3sN3OmFqBriBcxuPaWPSj3ERG0Y88P7q+ZCVVsX cgMiiM9b61XIGXpdsuzeBIoZdimDGuOhBOp08FIY9Dn3Dl/YTUCj4Sd9Vd1dDXbTfzZO PFAA== 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=+4dIgBUQTsWl+hEf7BcftFzpge2/28ML3ZTQlpIt2M8=; b=Cj/k26Hm872yE7pxRlp+2Fq9jaUXvUPHPkgkwGiuJJXJMeULtyVD93EbzEyaLU6txa 3xlG8yexv3MTi4muidGgMYg7/F97XJo2s0BBLcgALSXRr9kEB7laoqTPlgONAhwFDu+d T5hyjhHlCgHLbtoCdeOTTb6UqTSFOW5TyLmLU1E53Nw8BmELsHqXP1e6De+TqF8oFRpJ VsRV54sJ5nUHVIEgNcHOeCJfj/j7hZXfc8P7RoAuA61jCJ1oOfHDMObQ1fQYtEYi3A/p WktW+aGns6NirYKEWkf7tPFK2AODVJYaBdDwMdOykffLMUink1R6gNaA8ZpFQ9cgPT2l ODsA== X-Gm-Message-State: AMke39kjLnW8sOE6L164LVoVQgbGklbb0FSekX1EMQcNwZw/ede7Pa9KzcjdvT1Iru168A== X-Received: by 10.28.133.9 with SMTP id h9mr16904555wmd.132.1488284327251; Tue, 28 Feb 2017 04:18:47 -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.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 04:18:46 -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 03/10] fstests: canonicalize mount points on every config section Date: Tue, 28 Feb 2017 14:18:30 +0200 Message-Id: <1488284317-3119-4-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 Create helper _canonicalize_mountpoint() to check and canonicalize a mount point path. Use helper to canonicalize TEST_DIR and SCRATCH_MNT after parse of every config section. This is needed for overlay base fs mount. Signed-off-by: Amir Goldstein --- common/config | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/common/config b/common/config index 3ef401b..c402576 100644 --- a/common/config +++ b/common/config @@ -455,6 +455,20 @@ _check_device() fi } +# check and return a canonical mount point path +_canonicalize_mountpoint() +{ + local name=$1 + local dir=$2 + + if [ ! -d "$dir" ]; then + _fatal "common/config: $name ($dir) is not a directory" + fi + + # this follows symlinks and removes all trailing "/"s + readlink -e "$dir" +} + # Parse config section options. This function will parse all the configuration # within a single section which name is passed as an argument. For section # name format see comments in get_config_sections(). @@ -543,10 +557,7 @@ get_next_config() { fi _check_device TEST_DEV required $TEST_DEV - if [ ! -d "$TEST_DIR" ]; then - echo "common/config: Error: \$TEST_DIR ($TEST_DIR) is not a directory" - exit 1 - fi + export TEST_DIR=`_canonicalize_mountpoint TEST_DIR $TEST_DIR` # a btrfs tester will set only SCRATCH_DEV_POOL, we will put first of its dev # to SCRATCH_DEV and rest to SCRATCH_DEV_POOL to maintain the backward compatibility @@ -561,10 +572,7 @@ get_next_config() { fi _check_device SCRATCH_DEV optional $SCRATCH_DEV - if [ ! -z "$SCRATCH_MNT" -a ! -d "$SCRATCH_MNT" ]; then - echo "common/config: Error: \$SCRATCH_MNT ($SCRATCH_MNT) is not a directory" - exit 1 - fi + export SCRATCH_MNT=`_canonicalize_mountpoint SCRATCH_MNT $SCRATCH_MNT` if [ -n "$USE_EXTERNAL" ]; then _check_device TEST_RTDEV optional $TEST_RTDEV @@ -591,12 +599,12 @@ if [ -z "$CONFIG_INCLUDED" ]; then [ -z "$TEST_FS_MOUNT_OPTS" ] && _test_mount_opts [ -z "$MKFS_OPTIONS" ] && _mkfs_opts [ -z "$FSCK_OPTIONS" ] && _fsck_opts +else + # canonicalize the mount points + # this follows symlinks and removes all trailing "/"s + export TEST_DIR=`_canonicalize_mountpoint TEST_DIR $TEST_DIR` + export SCRATCH_MNT=`_canonicalize_mountpoint SCRATCH_MNT $SCRATCH_MNT` fi -# canonicalize the mount points -# this follows symlinks and removes all trailing "/"s -export TEST_DIR=`readlink -e "$TEST_DIR"` -export SCRATCH_MNT=`readlink -e "$SCRATCH_MNT"` - # make sure this script returns success /bin/true