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 /fish | |
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 'fish')
-rwxr-xr-x | fish/test-copy.sh | 6 | ||||
-rwxr-xr-x | fish/test-find0.sh | 2 | ||||
-rwxr-xr-x | fish/test-read_file.sh | 4 | ||||
-rwxr-xr-x | fish/test-upload-to-dir.sh | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/fish/test-copy.sh b/fish/test-copy.sh index ea6a4cc5..b6f34226 100755 --- a/fish/test-copy.sh +++ b/fish/test-copy.sh @@ -32,13 +32,13 @@ rm -f test1.img rm -rf original copy mkdir original -cp $srcdir/../images/known* original -cp -P $srcdir/../images/abssymlink* original +cp $srcdir/../tests/data/known* original +cp -P $srcdir/../tests/data/abssymlink* original output=$( ../fish/guestfish -N fs -m /dev/sda1 <<EOF mkdir /data -# This creates a directory /data/images/ +# This creates a directory /data/data/ copy-in original /data is-file /data/original/known-1 is-file /data/original/known-3 diff --git a/fish/test-find0.sh b/fish/test-find0.sh index 726469c1..5fd31856 100755 --- a/fish/test-find0.sh +++ b/fish/test-find0.sh @@ -23,7 +23,7 @@ set -e rm -f test.out ../fish/guestfish <<'EOF' -add-ro ../images/test.iso +add-ro ../tests/data/test.iso run mount-ro /dev/sda / find0 / test.out diff --git a/fish/test-read_file.sh b/fish/test-read_file.sh index cd016e30..c6e41580 100755 --- a/fish/test-read_file.sh +++ b/fish/test-read_file.sh @@ -23,12 +23,12 @@ set -e rm -f test.out ../fish/guestfish <<'EOF' > test.out -add-ro ../images/test.iso +add-ro ../tests/data/test.iso run mount-ro /dev/sda / read-file /helloworld.tar EOF -cmp ../images/helloworld.tar test.out +cmp ../tests/data/helloworld.tar test.out rm -f test.out
\ No newline at end of file diff --git a/fish/test-upload-to-dir.sh b/fish/test-upload-to-dir.sh index 41ce5e5a..1ef24a01 100755 --- a/fish/test-upload-to-dir.sh +++ b/fish/test-upload-to-dir.sh @@ -24,7 +24,7 @@ set -e rm -f test1.img test.out -if ../fish/guestfish -N fs -m /dev/sda1 upload ../images/test.iso / 2>test.out +if ../fish/guestfish -N fs -m /dev/sda1 upload ../tests/data/test.iso / 2>test.out then echo "$0: expecting guestfish to return an error" exit 1 |