summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2010-09-22 17:43:34 +0100
committerRichard W.M. Jones <rjones@redhat.com>2010-09-22 17:43:34 +0100
commitdf69543720de5bf7dd1a734c3bef6d191ceeab33 (patch)
tree5a0ef4c62d3853a90c11e81745bb11f259878fce
parent956fc5a3feacc970ea763697bf28fb686c875408 (diff)
downloadlibguestfs-df69543720de5bf7dd1a734c3bef6d191ceeab33.tar.gz
libguestfs-df69543720de5bf7dd1a734c3bef6d191ceeab33.tar.xz
libguestfs-df69543720de5bf7dd1a734c3bef6d191ceeab33.zip
regressions: Test just-built guestfish.
Instead of testing the installed /usr/bin/guestfish. This fixes commit ddda0f7bd00a37274dae38f4ce93955b8cfdf7d7.
-rwxr-xr-xregressions/test-guestfish-a.sh2
-rwxr-xr-xregressions/test-guestfish-d.sh3
2 files changed, 3 insertions, 2 deletions
diff --git a/regressions/test-guestfish-a.sh b/regressions/test-guestfish-a.sh
index 8e990eda..8847b85a 100755
--- a/regressions/test-guestfish-a.sh
+++ b/regressions/test-guestfish-a.sh
@@ -23,6 +23,6 @@ set -e
rm -f test.img
truncate -s 10M test.img
-guestfish -a test.img </dev/null
+../fish/guestfish -a test.img </dev/null
rm -f test.img
diff --git a/regressions/test-guestfish-d.sh b/regressions/test-guestfish-d.sh
index b97ad3d2..bf5d5145 100755
--- a/regressions/test-guestfish-d.sh
+++ b/regressions/test-guestfish-d.sh
@@ -46,7 +46,8 @@ cat > test.xml <<EOF
</node>
EOF
-guestfish -c "test://$cwd/test.xml" --ro -d guest -x </dev/null >test.out 2>&1
+../fish/guestfish -c "test://$cwd/test.xml" --ro -d guest -x \
+ </dev/null >test.out 2>&1
grep -sq '^add_drive_ro.*test.img' test.out
rm -f test.img test.xml test.out