diff mbox

[4/4] kvm-xfstests: create test disks in proper directory

Message ID 1470265093-86525-5-git-send-email-kirill.shutemov@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kirill A . Shutemov Aug. 3, 2016, 10:58 p.m. UTC
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(-)

Comments

Theodore Ts'o Aug. 5, 2016, 10:05 p.m. UTC | #1
On Thu, Aug 04, 2016 at 01:58:13AM +0300, Kirill A. Shutemov wrote:
> 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>

This has already been fixed in my tree, thanks.

							- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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