From: Ján Tomko Date: Mon, 22 Jul 2013 13:44:06 +0000 (+0200) Subject: Move volume XMLs out of storagevolxml2argvdata X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3a75fca28964a320e5590ff2d14e36c5ea8bf7f5;p=libvirt.git Move volume XMLs out of storagevolxml2argvdata Reuse the XML files in storagevolxml2xmlin. (This requires changing a few backing files to /dev/null, since virStorageBackendCreateQemuImgCmd checks for its presence) --- diff --git a/tests/storagevolxml2argvdata/vol-file.xml b/tests/storagevolxml2argvdata/vol-file.xml deleted file mode 100644 index d3f65f654b..0000000000 --- a/tests/storagevolxml2argvdata/vol-file.xml +++ /dev/null @@ -1,20 +0,0 @@ - - sparse.img - - 1 - 0 - - /var/lib/libvirt/images/sparse.img - - 0 - 0744 - 0 - - - - 1341933637.273190990 - 1341930622.047245868 - 1341930622.047245868 - - - diff --git a/tests/storagevolxml2argvdata/vol-qcow2-0.10-lazy.xml b/tests/storagevolxml2argvdata/vol-qcow2-0.10-lazy.xml deleted file mode 100644 index 5bf98b7c84..0000000000 --- a/tests/storagevolxml2argvdata/vol-qcow2-0.10-lazy.xml +++ /dev/null @@ -1,35 +0,0 @@ - - OtherDemo.img - /var/lib/libvirt/images/OtherDemo.img - - - 5 - 294912 - - /var/lib/libvirt/images/OtherDemo.img - - - 0644 - 0 - 0 - - - - - - 0.10 - - - - - - /dev/null - - - 0644 - 0 - 0 - - - - diff --git a/tests/storagevolxml2argvdata/vol-qcow2-1.1.xml b/tests/storagevolxml2argvdata/vol-qcow2-1.1.xml deleted file mode 100644 index 696e1e0750..0000000000 --- a/tests/storagevolxml2argvdata/vol-qcow2-1.1.xml +++ /dev/null @@ -1,32 +0,0 @@ - - OtherDemo.img - /var/lib/libvirt/images/OtherDemo.img - - - 5 - 294912 - - /var/lib/libvirt/images/OtherDemo.img - - - 0644 - 0 - 0 - - - - - - - - - /dev/null - - - 0644 - 0 - 0 - - - - diff --git a/tests/storagevolxml2argvdata/vol-qcow2-lazy.xml b/tests/storagevolxml2argvdata/vol-qcow2-lazy.xml deleted file mode 100644 index c1d7875d66..0000000000 --- a/tests/storagevolxml2argvdata/vol-qcow2-lazy.xml +++ /dev/null @@ -1,35 +0,0 @@ - - OtherDemo.img - /var/lib/libvirt/images/OtherDemo.img - - - 5 - 294912 - - /var/lib/libvirt/images/OtherDemo.img - - - 0644 - 0 - 0 - - - - - - 1.1 - - - - - - /dev/null - - - 0644 - 0 - 0 - - - - diff --git a/tests/storagevolxml2argvdata/vol-qcow2-nobacking.xml b/tests/storagevolxml2argvdata/vol-qcow2-nobacking.xml deleted file mode 100644 index 6a6bd5bef3..0000000000 --- a/tests/storagevolxml2argvdata/vol-qcow2-nobacking.xml +++ /dev/null @@ -1,21 +0,0 @@ - - OtherDemo.img - /var/lib/libvirt/images/OtherDemo.img - - - 5 - 294912 - - /var/lib/libvirt/images/OtherDemo.img - - - 0644 - 0 - 0 - - - - - - - diff --git a/tests/storagevolxml2argvdata/vol-qcow2.xml b/tests/storagevolxml2argvdata/vol-qcow2.xml deleted file mode 100644 index 49a7de33d3..0000000000 --- a/tests/storagevolxml2argvdata/vol-qcow2.xml +++ /dev/null @@ -1,31 +0,0 @@ - - OtherDemo.img - /var/lib/libvirt/images/OtherDemo.img - - - 5 - 294912 - - /var/lib/libvirt/images/OtherDemo.img - - - 0644 - 0 - 0 - - - - - - - - /dev/null - - - 0644 - 0 - 0 - - - - diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 8ef438fff9..5561f51894 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -121,12 +121,12 @@ testCompareXMLToArgvHelper(const void *data) char *cmdline = NULL; if (info->inputvol && - virAsprintf(&inputvolxml, "%s/storagevolxml2argvdata/%s.xml", + virAsprintf(&inputvolxml, "%s/storagevolxml2xmlin/%s.xml", abs_srcdir, info->inputvol) < 0) goto cleanup; if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", abs_srcdir, info->pool) < 0 || - virAsprintf(&volxml, "%s/storagevolxml2argvdata/%s.xml", + virAsprintf(&volxml, "%s/storagevolxml2xmlin/%s.xml", abs_srcdir, info->vol) < 0) { goto cleanup; } diff --git a/tests/storagevolxml2xmlin/vol-qcow2-0.10-lazy.xml b/tests/storagevolxml2xmlin/vol-qcow2-0.10-lazy.xml new file mode 100644 index 0000000000..5bf98b7c84 --- /dev/null +++ b/tests/storagevolxml2xmlin/vol-qcow2-0.10-lazy.xml @@ -0,0 +1,35 @@ + + OtherDemo.img + /var/lib/libvirt/images/OtherDemo.img + + + 5 + 294912 + + /var/lib/libvirt/images/OtherDemo.img + + + 0644 + 0 + 0 + + + + + + 0.10 + + + + + + /dev/null + + + 0644 + 0 + 0 + + + + diff --git a/tests/storagevolxml2xmlin/vol-qcow2-1.1.xml b/tests/storagevolxml2xmlin/vol-qcow2-1.1.xml index e8df8b3014..696e1e0750 100644 --- a/tests/storagevolxml2xmlin/vol-qcow2-1.1.xml +++ b/tests/storagevolxml2xmlin/vol-qcow2-1.1.xml @@ -20,7 +20,7 @@ - /var/lib/libvirt/images/BaseDemo.img + /dev/null 0644 diff --git a/tests/storagevolxml2xmlin/vol-qcow2-lazy.xml b/tests/storagevolxml2xmlin/vol-qcow2-lazy.xml index 336342a4f8..c1d7875d66 100644 --- a/tests/storagevolxml2xmlin/vol-qcow2-lazy.xml +++ b/tests/storagevolxml2xmlin/vol-qcow2-lazy.xml @@ -23,7 +23,7 @@ - /var/lib/libvirt/images/BaseDemo.img + /dev/null 0644 diff --git a/tests/storagevolxml2xmlin/vol-qcow2-nobacking.xml b/tests/storagevolxml2xmlin/vol-qcow2-nobacking.xml new file mode 100644 index 0000000000..6a6bd5bef3 --- /dev/null +++ b/tests/storagevolxml2xmlin/vol-qcow2-nobacking.xml @@ -0,0 +1,21 @@ + + OtherDemo.img + /var/lib/libvirt/images/OtherDemo.img + + + 5 + 294912 + + /var/lib/libvirt/images/OtherDemo.img + + + 0644 + 0 + 0 + + + + + + + diff --git a/tests/storagevolxml2xmlin/vol-qcow2.xml b/tests/storagevolxml2xmlin/vol-qcow2.xml index b4924de840..49a7de33d3 100644 --- a/tests/storagevolxml2xmlin/vol-qcow2.xml +++ b/tests/storagevolxml2xmlin/vol-qcow2.xml @@ -19,7 +19,7 @@ - /var/lib/libvirt/images/BaseDemo.img + /dev/null 0644 diff --git a/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml b/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml new file mode 100644 index 0000000000..a7b5fedfb8 --- /dev/null +++ b/tests/storagevolxml2xmlout/vol-qcow2-0.10-lazy.xml @@ -0,0 +1,35 @@ + + OtherDemo.img + (null) + + + 5368709120 + 294912 + + /var/lib/libvirt/images/OtherDemo.img + + + 0644 + 0 + 0 + + + + + + 0.10 + + + + + + /dev/null + + + 0644 + 0 + 0 + + + + diff --git a/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml b/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml index 454ac11299..b7df8a6cae 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-1.1.xml @@ -21,7 +21,7 @@ - /var/lib/libvirt/images/BaseDemo.img + /dev/null 0644 diff --git a/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml b/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml index 4e30edef98..92b7875668 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-lazy.xml @@ -23,7 +23,7 @@ - /var/lib/libvirt/images/BaseDemo.img + /dev/null 0644 diff --git a/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml b/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml new file mode 100644 index 0000000000..e2da702bcd --- /dev/null +++ b/tests/storagevolxml2xmlout/vol-qcow2-nobacking.xml @@ -0,0 +1,21 @@ + + OtherDemo.img + (null) + + + 5368709120 + 294912 + + /var/lib/libvirt/images/OtherDemo.img + + + 0644 + 0 + 0 + + + + + + + diff --git a/tests/storagevolxml2xmlout/vol-qcow2.xml b/tests/storagevolxml2xmlout/vol-qcow2.xml index 4490931f18..f931a629cd 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2.xml @@ -19,7 +19,7 @@ - /var/lib/libvirt/images/BaseDemo.img + /dev/null 0644 diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 05d2306f45..5b0a60b640 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -114,6 +114,8 @@ mymain(void) DO_TEST("pool-dir", "vol-qcow2"); DO_TEST("pool-dir", "vol-qcow2-1.1"); DO_TEST("pool-dir", "vol-qcow2-lazy"); + DO_TEST("pool-dir", "vol-qcow2-0.10-lazy"); + DO_TEST("pool-dir", "vol-qcow2-nobacking"); DO_TEST("pool-disk", "vol-partition"); DO_TEST("pool-logical", "vol-logical"); DO_TEST("pool-logical", "vol-logical-backing");