rpms/perl-Sys-Virt-TCK/devel Sys-Virt-TCK-0.1.0-clone-api.patch, NONE, 1.1 Sys-Virt-TCK-0.1.0-i686-pae-kernels.patch, NONE, 1.1 Sys-Virt-TCK-0.1.0-skip-dom0.patch, NONE, 1.1 perl-Sys-Virt-TCK.spec, 1.3, 1.4

Daniel P. Berrange berrange at fedoraproject.org
Wed Aug 26 15:44:49 UTC 2009 

Author: berrange

Update of /cvs/pkgs/rpms/perl-Sys-Virt-TCK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11412

Modified Files:
	perl-Sys-Virt-TCK.spec 
Added Files:
	Sys-Virt-TCK-0.1.0-clone-api.patch 
	Sys-Virt-TCK-0.1.0-i686-pae-kernels.patch 
	Sys-Virt-TCK-0.1.0-skip-dom0.patch 
Log Message:
Fix Xen portability issues & re-enable clone test

Sys-Virt-TCK-0.1.0-clone-api.patch:
 200-clone-vol-dir.t |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Sys-Virt-TCK-0.1.0-clone-api.patch ---
diff -rup Sys-Virt-TCK-0.1.0.orig/scripts/storage/200-clone-vol-dir.t Sys-Virt-TCK-0.1.0.new/scripts/storage/200-clone-vol-dir.t
--- Sys-Virt-TCK-0.1.0.orig/scripts/storage/200-clone-vol-dir.t	2009-07-22 18:33:55.000000000 +0100
+++ Sys-Virt-TCK-0.1.0.new/scripts/storage/200-clone-vol-dir.t	2009-08-26 16:42:01.000000000 +0100
@@ -102,7 +102,7 @@ foreach my $format (@formats) {
     my $volclonexml = $tck->generic_volume("test$format", $format, 1024*1024*50)->as_xml;
 
     my $clone;
-    ok_volume { $clone = $pool->create_volume($volclonexml, $vol) } "clone to $format volume";
+    ok_volume { $clone = $pool->clone_volume($volclonexml, $vol) } "clone to $format volume";
 
     $path = xpath($clone, "string(/volume/target/path)");
     $st = stat($path);
@@ -113,7 +113,7 @@ foreach my $format (@formats) {
     diag "Cloning cloned volume back to raw format";
     my $voldstxml = $tck->generic_volume("testdst", "raw", 1024*1024*50)->as_xml;
     my $result;
-    ok_volume { $result = $pool->create_volume($voldstxml, $clone) } "clone back to raw volume";
+    ok_volume { $result = $pool->clone_volume($voldstxml, $clone) } "clone back to raw volume";
 
 
     $path = xpath($result, "string(/volume/target/path)");

Sys-Virt-TCK-0.1.0-i686-pae-kernels.patch:
 default.cfg |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Sys-Virt-TCK-0.1.0-i686-pae-kernels.patch ---
diff -rup Sys-Virt-TCK-0.1.0.orig/conf/default.cfg Sys-Virt-TCK-0.1.0.new/conf/default.cfg
--- Sys-Virt-TCK-0.1.0.orig/conf/default.cfg	2009-07-22 18:33:55.000000000 +0100
+++ Sys-Virt-TCK-0.1.0.new/conf/default.cfg	2009-08-26 16:17:10.000000000 +0100
@@ -54,8 +54,8 @@ kernels = (
        hvm
        xen
      )
-     kernel = http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Fedora/i386/os/images/pxeboot/vmlinuz
-     initrd = http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Fedora/i386/os/images/pxeboot/initrd.img
+     kernel = http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Fedora/i386/os/images/pxeboot/vmlinuz-PAE
+     initrd = http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Fedora/i386/os/images/pxeboot/initrd-PAE.img
    }
    # Fedora 11 x86_64 has pv_ops, so one kernel can do both Xen and KVM guests here
    {

Sys-Virt-TCK-0.1.0-skip-dom0.patch:
 TCK.pm |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE Sys-Virt-TCK-0.1.0-skip-dom0.patch ---
diff -rup Sys-Virt-TCK-0.1.0.orig/lib/Sys/Virt/TCK.pm Sys-Virt-TCK-0.1.0.new/lib/Sys/Virt/TCK.pm
--- Sys-Virt-TCK-0.1.0.orig/lib/Sys/Virt/TCK.pm	2009-08-26 16:13:28.000000000 +0100
+++ Sys-Virt-TCK-0.1.0.new/lib/Sys/Virt/TCK.pm	2009-08-26 16:16:19.000000000 +0100
@@ -72,7 +72,7 @@ sub setup {
 sub sanity_check {
     my $self = shift;
 
-    my @doms = $self->{conn}->list_domains;
+    my @doms = grep { $_->get_id > 0 } $self->{conn}->list_domains;
     if (@doms) {
 	die "there is/are " . int(@doms) . " pre-existing active domain(s) in this driver";
     }
@@ -96,11 +96,9 @@ sub sanity_check {
 sub reset {
     my $self = shift;
 
-    my @doms = $self->{conn}->list_domains;
+    my @doms = grep { $_->get_id > 0 } $self->{conn}->list_domains;
     foreach my $dom (@doms) {
-	if ($dom->get_id != 0) {
-	    $dom->destroy;
-	}
+	$dom->destroy;
     }
 
     @doms = $self->{conn}->list_defined_domains();


Index: perl-Sys-Virt-TCK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sys-Virt-TCK/devel/perl-Sys-Virt-TCK.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Sys-Virt-TCK.spec	5 Aug 2009 16:41:25 -0000	1.3
+++ perl-Sys-Virt-TCK.spec	26 Aug 2009 15:44:49 -0000	1.4
@@ -10,14 +10,17 @@
 Summary: Sys::Virt::TCK - libvirt Technology Compatibility Kit
 Name: perl-%{appname}
 Version: 0.1.0
-Release: 5%{dist}
+Release: 6%{dist}
 License: GPLv2 or Artistic
 Group: Development/Tools
 Source: http://libvirt.org/sources/tck/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-cleanup-skip.patch
+Patch2: %{appname}-%{version}-skip-dom0.patch
+Patch3: %{appname}-%{version}-i686-pae-kernels.patch
+Patch4: %{appname}-%{version}-clone-api.patch
 Url: http://libvirt.org/
 BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libvirt >= 0.6.2
+Requires: libvirt >= 0.6.4
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl(accessors)
 BuildRequires: perl(App::Prove)
@@ -37,14 +40,18 @@ BuildRequires: perl(TAP::Harness::Archiv
 BuildRequires: perl(Test::Builder)
 BuildRequires: perl(Test::More)
 BuildRequires: perl(Sub::Uplevel)
-BuildRequires: perl(Sys::Virt) >= 0.2.0
+BuildRequires: perl(Sys::Virt) >= 0.2.1
 BuildRequires: perl(XML::Twig)
 BuildRequires: perl(XML::Writer)
 BuildRequires: perl(XML::XPath)
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
-# RPM autoprovides mising this
+# RPM autoprovides misses these 3
 Requires: perl(Test::Exception)
+Requires: perl(TAP::Formatter::HTML)
+Requires: perl(TAP::Harness::Archive)
+# Want to force this minimal version, so don't rely on RPM autoprov
+Requires: perl(Sys::Virt) >= 0.2.1
 BuildArchitectures: noarch
 
 %description
@@ -55,6 +62,9 @@ technology.
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__perl} Build.PL installdirs=vendor
@@ -72,9 +82,6 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 
 %__install -m 0755 -d $RPM_BUILD_ROOT%{_localstatedir}/cache/libvirt-tck
 
-# Requires newer libvirt perl binding
-rm -f $RPM_BUILD_ROOT/%{_datadir}/libvirt-tck/tests/storage/200-clone-vol-dir.t
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -97,6 +104,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/cache/libvirt-tck
 
 %changelog
+* Wed Aug 26 2009 Daniel P. Berrange <berrange at redhat.com> - 0.1.0-6
+- Skip over Xen dom0 domains
+- Use PAE kernel for i686 by default so it works with Xen
+- Re-enable cloning test now newer Sys-Virt exists in rawhide
+
 * Wed Aug  5 2009 Daniel P. Berrange <berrange at redhat.com> - 0.1.0-5
 - Add missing perl-Test-Exception dep
 - Skip cleanup if sanity check fails

More information about the fedora-extras-commits mailing list