From 74ded0dbc17b84638cc06c0b4d028484d114c00f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 7 Feb 2017 17:34:14 +0000
Subject: [PATCH] RHEL 5: tests: Don't use 'truncate' command.

The coreutils 'truncate' command does not exist in RHEL 5.  Replace
use of this command in tests with the guestfish 'disk-create' command.
---
 test-data/blank-disks/Makefile.am | 9 +++------
 tests/regressions/rhbz1285847.sh  | 2 +-
 v2v/test-v2v-i-ova-formats.sh     | 2 +-
 v2v/test-v2v-i-ova-gz.sh          | 2 +-
 v2v/test-v2v-i-ova-subfolders.sh  | 2 +-
 v2v/test-v2v-i-ova-tar.sh         | 2 +-
 v2v/test-v2v-i-ova-two-disks.sh   | 4 ++--
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/test-data/blank-disks/Makefile.am b/test-data/blank-disks/Makefile.am
index f372a8ed3..b22f7c92b 100644
--- a/test-data/blank-disks/Makefile.am
+++ b/test-data/blank-disks/Makefile.am
@@ -32,22 +32,19 @@ CLEANFILES += $(files)
 
 # Blank disk images in various sizes and formats.
 blank-disk-1s.raw:
-	rm -f $@
-	truncate -s 512 $@
+	guestfish disk-create $@ raw 512
 
 blank-disk-1s.qcow2:
 	qemu-img create -f qcow2 -o preallocation=metadata $@ 512
 
 blank-disk-1K.raw:
-	rm -f $@
-	truncate -s 1K $@
+	guestfish disk-create $@ raw 1K
 
 blank-disk-1K.qcow2:
 	qemu-img create -f qcow2 -o preallocation=metadata $@ 1K
 
 blank-disk-1M.raw:
-	rm -f $@
-	truncate -s 1M $@
+	guestfish disk-create $@ raw 1M
 
 blank-disk-1M.qcow2:
 	qemu-img create -f qcow2 -o preallocation=metadata $@ 1M
diff --git a/tests/regressions/rhbz1285847.sh b/tests/regressions/rhbz1285847.sh
index 0aa0611ae..b72ec8932 100755
--- a/tests/regressions/rhbz1285847.sh
+++ b/tests/regressions/rhbz1285847.sh
@@ -55,7 +55,7 @@ guestfish <<EOF
   list-filesystems
 EOF
 
-truncate -s 10G rhbz1285847-2.img
+guestfish disk-create rhbz1285847-2.img raw 10G
 virt-resize rhbz1285847.img rhbz1285847-2.img --expand /dev/sda2
 
 # Check that the filesystems made it across.
diff --git a/v2v/test-v2v-i-ova-formats.sh b/v2v/test-v2v-i-ova-formats.sh
index 0eec600eb..dccf5741b 100755
--- a/v2v/test-v2v-i-ova-formats.sh
+++ b/v2v/test-v2v-i-ova-formats.sh
@@ -56,7 +56,7 @@ pushd $d
 
 # Create a phony OVA.  This is only a test of source parsing, not
 # conversion, so the contents of the disks doesn't matter.
-truncate -s 10k disk1.vmdk
+guestfish disk-create disk1.vmdk raw 10K
 sha=`do_sha1 disk1.vmdk`
 echo -e "SHA1(disk1.vmdk)= $sha\r" > disk1.mf
 cp ../test-v2v-i-ova-formats.ovf .
diff --git a/v2v/test-v2v-i-ova-gz.sh b/v2v/test-v2v-i-ova-gz.sh
index e015456d8..32ffff84e 100755
--- a/v2v/test-v2v-i-ova-gz.sh
+++ b/v2v/test-v2v-i-ova-gz.sh
@@ -42,7 +42,7 @@ mkdir $d
 
 pushd $d
 
-truncate -s 10k disk1.vmdk
+guestfish disk-create disk1.vmdk raw 10K
 gzip disk1.vmdk
 sha=`do_sha1 disk1.vmdk.gz`
 echo -e "SHA1(disk1.vmdk.gz)= $sha\r" > disk1.mf
diff --git a/v2v/test-v2v-i-ova-subfolders.sh b/v2v/test-v2v-i-ova-subfolders.sh
index 184d06c20..0bc109ef3 100755
--- a/v2v/test-v2v-i-ova-subfolders.sh
+++ b/v2v/test-v2v-i-ova-subfolders.sh
@@ -44,7 +44,7 @@ cp test-v2v-i-ova-subfolders.ovf $d/subfolder/
 
 pushd $d/subfolder
 
-truncate -s 10k disk1.vmdk
+guestfish disk-create disk1.vmdk raw 10K
 sha=`do_sha1 disk1.vmdk`
 echo -e "SHA1(disk1.vmdk)= $sha\r" > disk1.mf
 
diff --git a/v2v/test-v2v-i-ova-tar.sh b/v2v/test-v2v-i-ova-tar.sh
index c3b0588f4..358b442b3 100755
--- a/v2v/test-v2v-i-ova-tar.sh
+++ b/v2v/test-v2v-i-ova-tar.sh
@@ -44,7 +44,7 @@ pushd $d
 
 # Create a phony OVA.  This is only a test of source parsing, not
 # conversion, so the contents of the disks doesn't matter.
-truncate -s 10k disk1.vmdk
+guestfish disk-create disk1.vmdk raw 10k
 sha=`do_sha1 disk1.vmdk`
 echo -e "SHA1(disk1.vmdk)= $sha\r" > disk1.mf
 cp ../test-v2v-i-ova-tar.ovf .
diff --git a/v2v/test-v2v-i-ova-two-disks.sh b/v2v/test-v2v-i-ova-two-disks.sh
index 310aff1b9..89d13093b 100755
--- a/v2v/test-v2v-i-ova-two-disks.sh
+++ b/v2v/test-v2v-i-ova-two-disks.sh
@@ -45,10 +45,10 @@ pushd $d
 
 # Create a phony OVA.  This is only a test of source parsing, not
 # conversion, so the contents of the disks doesn't matter.
-truncate -s 10k disk1.vmdk
+guestfish disk-create disk1.vmdk raw 10K
 sha=`do_sha1 disk1.vmdk`
 echo -e "SHA1(disk1.vmdk)= $sha\r" > disk1.mf
-truncate -s 100k disk2.vmdk
+guestfish disk-create disk2.vmdk raw 100K
 sha=`do_sha1 disk2.vmdk`
 echo -e "SHA1(disk2.vmdk)= $sha\r" > disk2.mf
 cp ../test-v2v-i-ova-two-disks.ovf .