~serge-hallyn/ubuntu/raring/libvirt/libvirt-hugepages

« back to all changes in this revision

Viewing changes to tests/domainsnapshotxml2xmltest.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-13 15:44:12 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20120513154412-fgmn5sxqdzgnzlx3
Tags: 0.9.12-0ubuntu1
* New upstream version:
  * Synchronize with debian packaging:
    - debian/control: Update build depends.
    - debian/libvirt-bin.postrm: Cleanup /var/log/libvirt
      on purge.
    - Bump standards verson (no changes).
    - debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch: Added
  * Dropped patches:
    - debian/patches/Debianize-libvirt-guests.patch
    - debian/patches/rewrite-lxc-controller-eof-handling-yet-again
    - debian/patches/ubuntu/libnl13.patch
    - debian/patches/ubuntu/fix-lxc-startup-error.patch
    - debian/patches/ubuntu/fix-bridge-fd.patch
    - debian/patches/ubuntu/skip-labelling-network-disks.patch
    - debian/patches/ubuntu/xen-xend-shutdown-detection.patch
    - debian/patches/ubuntu/xen-config-no-vfb-for-hvm.patch
    - debian/patches/debian/Disable-daemon-start-test.patch
    - debian/patches/debian/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
    - debian/patches/ubuntu/9006-default-config-test-case.patch
    - debian/patches/fix-block-migration.patch
    - debian/patches/ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
    - debian/patches/ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
    - debian/patches/9025-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/arm-gcc-workaround.patch
  * Rediffed:
    - debian/patches/Allow-libvirt-group-to-access-the-socket.patch
    - debian/patches/Disable-failing-virnetsockettest.patch
    - debian/patches/dnsmasq-as-priv-user
    - debian/patches/9002-better_default_uri_virsh.patch
  * debian/control: Add libnl-route-3-dev ass a build depends.
  * debian/patches/libnl3-build-fix.patch: Fix build with libnl3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
51
51
 
52
52
    ret = 0;
53
53
 fail:
54
 
    free(inXmlData);
55
 
    free(actual);
 
54
    VIR_FREE(inXmlData);
 
55
    VIR_FREE(actual);
56
56
    virDomainSnapshotDefFree(def);
57
57
    return ret;
58
58
}
77
77
    ret = testCompareXMLToXMLFiles(xml_in, info->uuid, info->internal);
78
78
 
79
79
cleanup:
80
 
    free(xml_in);
 
80
    VIR_FREE(xml_in);
81
81
    return ret;
82
82
}
83
83
 
88
88
    int ret = 0;
89
89
 
90
90
    if ((driver.caps = testQemuCapsInit()) == NULL)
91
 
        return (EXIT_FAILURE);
 
91
        return EXIT_FAILURE;
92
92
 
93
93
# define DO_TEST(name, uuid, internal)                                  \
94
94
    do {                                                                \
109
109
    DO_TEST("noparent_nodescription_noactive", NULL, 0);
110
110
    DO_TEST("noparent_nodescription", NULL, 1);
111
111
    DO_TEST("noparent", "9d37b878-a7cc-9f9a-b78f-49b3abad25a8", 0);
 
112
    DO_TEST("metadata", "c7a5fdbd-edaf-9455-926a-d65c16db1809", 0);
112
113
 
113
114
    virCapabilitiesFree(driver.caps);
114
115
 
115
 
    return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
 
116
    return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE;
116
117
}
117
118
 
118
119
VIRT_TEST_MAIN(mymain)