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.
This commit is contained in:
Richard W.M. Jones
2017-02-07 17:34:14 +00:00
parent 7461a8fab1
commit 74ded0dbc1
7 changed files with 10 additions and 13 deletions

View File

@@ -32,22 +32,19 @@ CLEANFILES += $(files)
# Blank disk images in various sizes and formats. # Blank disk images in various sizes and formats.
blank-disk-1s.raw: blank-disk-1s.raw:
rm -f $@ guestfish disk-create $@ raw 512
truncate -s 512 $@
blank-disk-1s.qcow2: blank-disk-1s.qcow2:
qemu-img create -f qcow2 -o preallocation=metadata $@ 512 qemu-img create -f qcow2 -o preallocation=metadata $@ 512
blank-disk-1K.raw: blank-disk-1K.raw:
rm -f $@ guestfish disk-create $@ raw 1K
truncate -s 1K $@
blank-disk-1K.qcow2: blank-disk-1K.qcow2:
qemu-img create -f qcow2 -o preallocation=metadata $@ 1K qemu-img create -f qcow2 -o preallocation=metadata $@ 1K
blank-disk-1M.raw: blank-disk-1M.raw:
rm -f $@ guestfish disk-create $@ raw 1M
truncate -s 1M $@
blank-disk-1M.qcow2: blank-disk-1M.qcow2:
qemu-img create -f qcow2 -o preallocation=metadata $@ 1M qemu-img create -f qcow2 -o preallocation=metadata $@ 1M

View File

@@ -55,7 +55,7 @@ guestfish <<EOF
list-filesystems list-filesystems
EOF 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 virt-resize rhbz1285847.img rhbz1285847-2.img --expand /dev/sda2
# Check that the filesystems made it across. # Check that the filesystems made it across.

View File

@@ -56,7 +56,7 @@ pushd $d
# Create a phony OVA. This is only a test of source parsing, not # Create a phony OVA. This is only a test of source parsing, not
# conversion, so the contents of the disks doesn't matter. # 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` sha=`do_sha1 disk1.vmdk`
echo -e "SHA1(disk1.vmdk)= $sha\r" > disk1.mf echo -e "SHA1(disk1.vmdk)= $sha\r" > disk1.mf
cp ../test-v2v-i-ova-formats.ovf . cp ../test-v2v-i-ova-formats.ovf .

View File

@@ -42,7 +42,7 @@ mkdir $d
pushd $d pushd $d
truncate -s 10k disk1.vmdk guestfish disk-create disk1.vmdk raw 10K
gzip disk1.vmdk gzip disk1.vmdk
sha=`do_sha1 disk1.vmdk.gz` sha=`do_sha1 disk1.vmdk.gz`
echo -e "SHA1(disk1.vmdk.gz)= $sha\r" > disk1.mf echo -e "SHA1(disk1.vmdk.gz)= $sha\r" > disk1.mf

View File

@@ -44,7 +44,7 @@ cp test-v2v-i-ova-subfolders.ovf $d/subfolder/
pushd $d/subfolder pushd $d/subfolder
truncate -s 10k disk1.vmdk guestfish disk-create disk1.vmdk raw 10K
sha=`do_sha1 disk1.vmdk` sha=`do_sha1 disk1.vmdk`
echo -e "SHA1(disk1.vmdk)= $sha\r" > disk1.mf echo -e "SHA1(disk1.vmdk)= $sha\r" > disk1.mf

View File

@@ -44,7 +44,7 @@ pushd $d
# Create a phony OVA. This is only a test of source parsing, not # Create a phony OVA. This is only a test of source parsing, not
# conversion, so the contents of the disks doesn't matter. # 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` sha=`do_sha1 disk1.vmdk`
echo -e "SHA1(disk1.vmdk)= $sha\r" > disk1.mf echo -e "SHA1(disk1.vmdk)= $sha\r" > disk1.mf
cp ../test-v2v-i-ova-tar.ovf . cp ../test-v2v-i-ova-tar.ovf .

View File

@@ -45,10 +45,10 @@ pushd $d
# Create a phony OVA. This is only a test of source parsing, not # Create a phony OVA. This is only a test of source parsing, not
# conversion, so the contents of the disks doesn't matter. # 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` sha=`do_sha1 disk1.vmdk`
echo -e "SHA1(disk1.vmdk)= $sha\r" > disk1.mf 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` sha=`do_sha1 disk2.vmdk`
echo -e "SHA1(disk2.vmdk)= $sha\r" > disk2.mf echo -e "SHA1(disk2.vmdk)= $sha\r" > disk2.mf
cp ../test-v2v-i-ova-two-disks.ovf . cp ../test-v2v-i-ova-two-disks.ovf .