summaryrefslogtreecommitdiffstats
path: root/regressions
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2010-11-09 18:56:00 +0000
committerRichard W.M. Jones <rjones@redhat.com>2010-11-11 11:24:13 +0000
commit7509c91a71c729b3223eef4cde10d70daca66c72 (patch)
tree927c56e258c843439d545081d8af3c27125a8b9a /regressions
parentf08fe63761d4186d49212b1d2382b1a5a2b8a62f (diff)
downloadlibguestfs-7509c91a71c729b3223eef4cde10d70daca66c72.tar.gz
libguestfs-7509c91a71c729b3223eef4cde10d70daca66c72.tar.xz
libguestfs-7509c91a71c729b3223eef4cde10d70daca66c72.zip
fish: Use core add-domain API to implement '-d' option.
This also makes libxml2 and libvirt into optional dependencies. If they are missing then the core API will print an error, as will the '-d' option to guestfish.
Diffstat (limited to 'regressions')
-rwxr-xr-xregressions/test-guestfish-d.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/regressions/test-guestfish-d.sh b/regressions/test-guestfish-d.sh
index be207482..7fc52518 100755
--- a/regressions/test-guestfish-d.sh
+++ b/regressions/test-guestfish-d.sh
@@ -56,11 +56,11 @@ cat > test.xml <<EOF
</node>
EOF
-../fish/guestfish -c "test://$cwd/test.xml" --ro -d guest -x \
- </dev/null >test.out 2>&1
-grep -sq '^add_drive.*test1.img.*readonly:true' test.out
-! grep -sq '^add_drive.*test1.img.*format' test.out
-grep -sq '^add_drive.*test2.img.*readonly:true.*format:raw' test.out
-grep -sq '^add_drive.*test3.img.*readonly:true.*format:qcow2' test.out
+../fish/guestfish -c "test://$cwd/test.xml" --ro -d guest \
+ debug-cmdline </dev/null >test.out
+grep -sq "test1.img.*snapshot=on" test.out
+! grep -sq "test1.img.*format" test.out
+grep -sq "test2.img.*snapshot=on.*format=raw" test.out
+grep -sq "test3.img.*snapshot=on.*format=qcow2" test.out
rm -f test1.img test2.img test3.img test.xml test.out