diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-12-22 12:15:06 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-12-22 15:48:11 +0000 |
| commit | cd077b8229731e292798f34dd56892cbfa6f1e0e (patch) | |
| tree | d7c2fb6e9d8c34b8f73152c297f243eee74dc450 /cat | |
| parent | c649817586e5b4df53b251d1290422f5ef046045 (diff) | |
| download | libguestfs-cd077b8229731e292798f34dd56892cbfa6f1e0e.tar.gz libguestfs-cd077b8229731e292798f34dd56892cbfa6f1e0e.tar.xz libguestfs-cd077b8229731e292798f34dd56892cbfa6f1e0e.zip | |
tests: Split images -> tests/data + tests/guests
Diffstat (limited to 'cat')
| -rwxr-xr-x | cat/test-virt-cat.sh | 4 | ||||
| -rwxr-xr-x | cat/test-virt-filesystems.sh | 4 | ||||
| -rwxr-xr-x | cat/test-virt-ls.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cat/test-virt-cat.sh b/cat/test-virt-cat.sh index 19b8d875..79844562 100755 --- a/cat/test-virt-cat.sh +++ b/cat/test-virt-cat.sh @@ -4,11 +4,11 @@ export LANG=C set -e # Read out the test files from the image using virt-cat. -if [ "$(./virt-cat ../images/fedora.img /etc/test1)" != "abcdefg" ]; then +if [ "$(./virt-cat ../tests/guests/fedora.img /etc/test1)" != "abcdefg" ]; then echo "$0: error: mismatch in file test1" exit 1 fi -if [ "$(./virt-cat ../images/fedora.img /etc/test2)" != "" ]; then +if [ "$(./virt-cat ../tests/guests/fedora.img /etc/test2)" != "" ]; then echo "$0: error: mismatch in file test2" exit 1 fi diff --git a/cat/test-virt-filesystems.sh b/cat/test-virt-filesystems.sh index f3c325c6..e664e1a2 100755 --- a/cat/test-virt-filesystems.sh +++ b/cat/test-virt-filesystems.sh @@ -3,7 +3,7 @@ export LANG=C set -e -output="$(./virt-filesystems -a ../images/fedora.img | sort)" +output="$(./virt-filesystems -a ../tests/guests/fedora.img | sort)" expected="/dev/VG/LV1 /dev/VG/LV2 /dev/VG/LV3 @@ -16,7 +16,7 @@ if [ "$output" != "$expected" ]; then exit 1 fi -output="$(./virt-filesystems -a ../images/fedora.img --all --long --uuid -h --no-title | awk '{print $1}' | sort -u)" +output="$(./virt-filesystems -a ../tests/guests/fedora.img --all --long --uuid -h --no-title | awk '{print $1}' | sort -u)" expected="/dev/VG /dev/VG/LV1 /dev/VG/LV2 diff --git a/cat/test-virt-ls.sh b/cat/test-virt-ls.sh index 3f702b7c..b7b02a34 100755 --- a/cat/test-virt-ls.sh +++ b/cat/test-virt-ls.sh @@ -4,7 +4,7 @@ export LANG=C set -e # Read out the test directory using virt-ls. -if [ "$(./virt-ls ../images/fedora.img /bin)" != "ls +if [ "$(./virt-ls ../tests/guests/fedora.img /bin)" != "ls test1 test2 test3 @@ -17,7 +17,7 @@ test7" ]; then fi # Try the -lR option. -output="$(./virt-ls -lR ../images/fedora.img /boot | awk '{print $1 $2 $4}')" +output="$(./virt-ls -lR ../tests/guests/fedora.img /boot | awk '{print $1 $2 $4}')" expected="d0755/boot d0755/boot/grub -0644/boot/grub/grub.conf |