diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-06-18 13:04:46 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-06-18 15:33:04 +0100 |
| commit | 39df80dcc0e485e69048bddbf33c259ce532e50d (patch) | |
| tree | c72031819f3e9434f8050dafe2cfd3029f42b292 | |
| parent | 4846b84476015874d569c14c2c30fcd71aa4d54c (diff) | |
| download | libguestfs-39df80dcc0e485e69048bddbf33c259ce532e50d.tar.gz libguestfs-39df80dcc0e485e69048bddbf33c259ce532e50d.tar.xz libguestfs-39df80dcc0e485e69048bddbf33c259ce532e50d.zip | |
tests: Replace truncate command with 'guestfish sparse'.
RHEL 5 didn't have the truncate command, but we can replace:
truncate -s SIZE FILE
with the roughly equivalent command:
guestfish sparse FILE SIZE
| -rwxr-xr-x | fish/test-add-domain.sh | 5 | ||||
| -rwxr-xr-x | fish/test-d.sh | 5 | ||||
| -rwxr-xr-x | tests/qemu/qemu-liveness.sh | 2 | ||||
| -rwxr-xr-x | tests/qemu/qemu-snapshot-isolation.sh | 4 | ||||
| -rwxr-xr-x | tests/regressions/rhbz690819.sh | 2 | ||||
| -rwxr-xr-x | tests/regressions/rhbz811649.sh | 2 |
6 files changed, 13 insertions, 7 deletions
diff --git a/fish/test-add-domain.sh b/fish/test-add-domain.sh index 85937088..749f3bcd 100755 --- a/fish/test-add-domain.sh +++ b/fish/test-add-domain.sh @@ -24,7 +24,10 @@ rm -f test1.img test2.img test3.img test4.img test.xml test.out cwd="$(pwd)" -truncate -s 1M test1.img test2.img test3.img test4.img +./guestfish sparse test1.img 1M +./guestfish sparse test2.img 1M +./guestfish sparse test3.img 1M +./guestfish sparse test4.img 1M # Libvirt test XML, see libvirt.git/examples/xml/test/testnode.xml cat > test.xml <<EOF diff --git a/fish/test-d.sh b/fish/test-d.sh index 6475ad83..104b8f3b 100755 --- a/fish/test-d.sh +++ b/fish/test-d.sh @@ -24,7 +24,10 @@ rm -f test1.img test2.img test3.img test4.img test.xml test.out cwd="$(pwd)" -truncate -s 1M test1.img test2.img test3.img test4.img +./guestfish sparse test1.img 1M +./guestfish sparse test2.img 1M +./guestfish sparse test3.img 1M +./guestfish sparse test4.img 1M # Libvirt test XML, see libvirt.git/examples/xml/test/testnode.xml cat > test.xml <<EOF diff --git a/tests/qemu/qemu-liveness.sh b/tests/qemu/qemu-liveness.sh index 945b2a29..d95321c7 100755 --- a/tests/qemu/qemu-liveness.sh +++ b/tests/qemu/qemu-liveness.sh @@ -24,7 +24,7 @@ set -e rm -f test1.img -truncate -s 100M test1.img +../../fish/guestfish sparse test1.img 100M test1_md5sum="$(md5sum test1.img | awk '{print $1}')" ../../fish/guestfish <<'EOF' diff --git a/tests/qemu/qemu-snapshot-isolation.sh b/tests/qemu/qemu-snapshot-isolation.sh index 70b68392..17e3bab4 100755 --- a/tests/qemu/qemu-snapshot-isolation.sh +++ b/tests/qemu/qemu-snapshot-isolation.sh @@ -24,9 +24,9 @@ set -e rm -f test1.img test2.img test3.img -truncate -s 100M test1.img +../../fish/guestfish sparse test1.img 100M test1_md5sum="$(md5sum test1.img | awk '{print $1}')" -truncate -s 100M test2.img +../../fish/guestfish sparse test2.img 100M test2_md5sum="$(md5sum test2.img | awk '{print $1}')" qemu-img create -f qcow2 test3.img 100M test3_md5sum="$(md5sum test3.img | awk '{print $1}')" diff --git a/tests/regressions/rhbz690819.sh b/tests/regressions/rhbz690819.sh index ff4430f9..9d8e38ca 100755 --- a/tests/regressions/rhbz690819.sh +++ b/tests/regressions/rhbz690819.sh @@ -37,7 +37,7 @@ export LANG=C rm -f test.img -truncate -s 100M test.img +../../fish/guestfish sparse test.img 100M ../../fish/guestfish <<EOF add-drive-with-if test.img ide diff --git a/tests/regressions/rhbz811649.sh b/tests/regressions/rhbz811649.sh index b8a101c0..cc0b8a1a 100755 --- a/tests/regressions/rhbz811649.sh +++ b/tests/regressions/rhbz811649.sh @@ -36,7 +36,7 @@ filenames[5]='-hda' rm -f -- test1.img "${filenames[@]}" -truncate -s 10M test1.img +../../fish/guestfish sparse test1.img 10M for f in "${filenames[@]}"; do ln -- test1.img "$f" |