fish: Use size_t instead of int when counting strings.

[libguestfs.git] / regressions / test-guestfish-d.sh

diff --git a/regressions/test-guestfish-d.sh b/regressions/test-guestfish-d.sh
index be20748..ab03944 100755 (executable)
--- a/regressions/test-guestfish-d.sh
+++ b/regressions/test-guestfish-d.sh
@@ -20,11 +20,11 @@
 
 set -e
 
-rm -f test1.img test2.img test3.img test.xml test.out
+rm -f test1.img test2.img test3.img test4.img test.xml test.out
 
 cwd="$(pwd)"
 
-truncate -s 1M test1.img test2.img test3.img
+truncate -s 1M test1.img test2.img test3.img test4.img
 
 # Libvirt test XML, see libvirt.git/examples/xml/test/testnode.xml
 cat > test.xml <<EOF
@@ -51,16 +51,23 @@ cat > test.xml <<EOF
         <source file="$cwd/test3.img"/>
         <target dev="hdc"/>
       </disk>
+      <disk type="file">
+        <driver name="qemu" type="raw"/>
+        <source file="$cwd/test4.img"/>
+        <target dev="hdd"/>
+        <readonly/>
+      </disk>
     </devices>
   </domain>
 </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-drives </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
+grep -sq "test4.img.*snapshot=on.*format=raw" test.out
 
-rm -f test1.img test2.img test3.img test.xml test.out
+rm -f test1.img test2.img test3.img test4.img test.xml test.out