From patchwork Wed Aug 3 22:58:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 9262297 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 AF4916089F for ; Wed, 3 Aug 2016 22:59:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2C3727FA8 for ; Wed, 3 Aug 2016 22:59:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97D8928068; Wed, 3 Aug 2016 22:59:23 +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 30BCA2804C for ; Wed, 3 Aug 2016 22:59:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933016AbcHCW7R (ORCPT ); Wed, 3 Aug 2016 18:59:17 -0400 Received: from mga02.intel.com ([134.134.136.20]:47510 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932949AbcHCW7P (ORCPT ); Wed, 3 Aug 2016 18:59:15 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP; 03 Aug 2016 15:58:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,468,1464678000"; d="scan'208";a="743857405" Received: from black.fi.intel.com ([10.237.72.93]) by FMSMGA003.fm.intel.com with ESMTP; 03 Aug 2016 15:58:24 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id B3585471; Thu, 4 Aug 2016 01:58:21 +0300 (EEST) From: "Kirill A. Shutemov" To: Theodore Ts'o Cc: linux-fsdevel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 4/4] kvm-xfstests: create test disks in proper directory Date: Thu, 4 Aug 2016 01:58:13 +0300 Message-Id: <1470265093-86525-5-git-send-email-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1470265093-86525-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1470265093-86525-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP kvm-xfstests/setup creates disks in current directory instead of place we are expect them to be. Let's fix that. Signed-off-by: Kirill A. Shutemov --- kvm-xfstests/kvm-xfstests | 1 + kvm-xfstests/setup | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/kvm-xfstests/kvm-xfstests b/kvm-xfstests/kvm-xfstests index b781902ef6d5..ac1eabe0a9ae 100755 --- a/kvm-xfstests/kvm-xfstests +++ b/kvm-xfstests/kvm-xfstests @@ -37,6 +37,7 @@ fi if ! test -e $VDB -a -e $VDC -a -e $VDD -a -e $VDE -a -e $VDF -a -e $VDG then echo "Test disks don't exist, running setup..." + export VDB VDC VDD VDE VDF VDG $DIR/setup fi diff --git a/kvm-xfstests/setup b/kvm-xfstests/setup index 1d61099ca399..25d0789cf276 100755 --- a/kvm-xfstests/setup +++ b/kvm-xfstests/setup @@ -1,12 +1,12 @@ -#!/bin/sh -qemu-img create -f raw vdb 5g -qemu-img create -f raw vdc 5g -qemu-img create -f raw vdd 5g -qemu-img create -f raw vde 20g -qemu-img create -f raw vdf 20g -qemu-img create -f raw vdg 5g -/sbin/mke2fs -t ext4 -F vdb -/sbin/mke2fs -t ext4 -b 1024 -F vdd -/sbin/mke2fs -t ext4 -F vdg +#!/bin/sh -efu +qemu-img create -f raw $VDB 5g +qemu-img create -f raw $VDC 5g +qemu-img create -f raw $VDD 5g +qemu-img create -f raw $VDE 20g +qemu-img create -f raw $VDF 20g +qemu-img create -f raw $VDG 5g +/sbin/mke2fs -t ext4 -F $VDB +/sbin/mke2fs -t ext4 -b 1024 -F $VDD +/sbin/mke2fs -t ext4 -F $VDG