summaryrefslogtreecommitdiffstats
path: root/fish
diff options
context:
space:
mode:
Diffstat (limited to 'fish')
-rwxr-xr-xfish/test-copy.sh6
-rwxr-xr-xfish/test-find0.sh2
-rwxr-xr-xfish/test-read_file.sh4
-rwxr-xr-xfish/test-upload-to-dir.sh2
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