linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: Theodore Ts'o <tytso@mit.edu>
Cc: linux-fsdevel@vger.kernel.org,
	"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCH 4/4] kvm-xfstests: create test disks in proper directory
Date: Thu,  4 Aug 2016 01:58:13 +0300	[thread overview]
Message-ID: <1470265093-86525-5-git-send-email-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <1470265093-86525-1-git-send-email-kirill.shutemov@linux.intel.com>

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 <kirill.shutemov@linux.intel.com>
---
 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
 
 
-- 
2.8.1


  parent reply	other threads:[~2016-08-03 22:59 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-03 22:58 [PATCH 0/4] Few random tweaks for xfstests-bld Kirill A. Shutemov
2016-08-03 22:58 ` [PATCH 1/4] kvm-xfstests: qemu: prefer KVM over TCG Kirill A. Shutemov
2016-08-05 20:58   ` Theodore Ts'o
2016-08-03 22:58 ` [PATCH 2/4] kvm-xfstests: do not try to insert modules Kirill A. Shutemov
2016-08-05 20:59   ` Theodore Ts'o
2016-08-03 22:58 ` [PATCH 3/4] kvm-xfstests: do not assume /sbin/ in PATH Kirill A. Shutemov
2016-08-05 21:25   ` Theodore Ts'o
2016-08-03 22:58 ` Kirill A. Shutemov [this message]
2016-08-05 22:05   ` [PATCH 4/4] kvm-xfstests: create test disks in proper directory Theodore Ts'o

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1470265093-86525-5-git-send-email-kirill.shutemov@linux.intel.com \
    --to=kirill.shutemov@linux.intel.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).