Hi,
On Fri, Mar 25, 2016 at 02:58:13PM +0100, Philipp Matthias Hahn wrote:
[..snip..]
> I started working on libvirt from wheezy-backports, where the test suite
> is not yet disabled. Maybe I run the build as root in some VM, where a
> different set of tests are executed.
>
> I re-run the build in a new jessie-pbuilder environment as non-root and
> it work there, so the FTBFS patches are not needed for now.
Great, so we're on the safe side for jessie.
> But you will have to fix them some time if you wan't to re-enable
> running test ests.
We will need to fix libxml first.
>
> > > diff -Nru
> > > libvirt-1.2.9/debian/patches/Disable-failing-virnetsockettest.patch
> > > libvirt-1.2.9/debian/patches/Disable-failing-virnetsockettest.patch
> > > --- libvirt-1.2.9/debian/patches/Disable-failing-virnetsockettest.patch
> > > 2015-08-24 16:20:54.000000000 +0200
> > > +++ libvirt-1.2.9/debian/patches/Disable-failing-virnetsockettest.patch
> > > 2016-03-04 14:47:12.000000000 +0100
> > > @@ -7,11 +7,25 @@
> > > tests/virnetsockettest.c | 2 ++
> > > 1 file changed, 2 insertions(+)
> > >
> > > -diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
> > > -index 5d91f26..1f283a3 100644
> > > --- a/tests/virnetsockettest.c
> > > +++ b/tests/virnetsockettest.c
> > > -@@ -501,10 +501,12 @@ mymain(void)
> > > +@@ -333,6 +333,7 @@ static int testSocketUNIXAddrs(const voi
> > > + return ret;
> > > + }
> > > +
> > > ++#if 0
> > > + static int testSocketCommandNormal(const void *data ATTRIBUTE_UNUSED)
> > > + {
> > > + virNetSocketPtr csock = NULL; /* Client socket */
> > > +@@ -383,6 +384,7 @@ static int testSocketCommandFail(const v
> > > + virObjectUnref(csock);
> > > + return ret;
> > > + }
> > > ++#endif
> >
> > Why did you disable this one?
>
> The alling site is disabled by
> debian/patches/Disable-failing-virnetsockettest.patch, but the functions
> are still defines. After running autoreconf gcc complains about defines
> but unused functions.
> My patch also puts the function definitions in a conditional block to
> fix that issue.
O.k. since I'd rather not introduce autoreconf for the stable release we
can skip this one (dh_autoreconf defaults to on in sid already).
> > > diff -Nru libvirt-1.2.9/debian/patches/series
> > > libvirt-1.2.9/debian/patches/series
> > > --- libvirt-1.2.9/debian/patches/series 2015-08-24 16:20:54.000000000
> > > +0200
> > > +++ libvirt-1.2.9/debian/patches/series 2016-03-05 08:18:07.000000000
> > > +0100
> > > @@ -31,3 +31,5 @@
> > > Allow-access-to-libnl-3-config-files.patch
> > > Fix-crash-on-live-migration.patch
> > > upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
> > > +security/CVE-2015-5313-storage-don-t-allow-in-filesystem-volu.patch
> > > +debian/Debianize-bridge-helper-path.patch
> > > diff -Nru
> > > libvirt-1.2.9/debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
> > >
> > > libvirt-1.2.9/debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
> > > ---
> > > libvirt-1.2.9/debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
> > > 2015-08-24 16:20:54.000000000 +0200
> > > +++
> > > libvirt-1.2.9/debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
> > > 2016-03-04 14:47:12.000000000 +0100
> > > @@ -176,7 +176,7 @@
> > >
> > > if (virQEMUCapsParseHelpStr("QEMU", help, flags,
> > > - &version, &is_kvm, &kvm_version, false)
> > > == -1)
> > > -+ &version, &is_kvm, &kvm_version, false,
> > > NULL) == -1) {
> > > ++ &version, &is_kvm, &kvm_version, false,
> > > NULL) == -1)
> > > goto cleanup;
> >
> > I wonder why this one changed as well.
>
>
> # tail -n 12
> debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
>
> | index 975edf3..271fddc 100644
> | --- a/tests/qemuhelptest.c
> | +++ b/tests/qemuhelptest.c
> | @@ -58,7 +58,7 @@ static int testHelpStrParsing(const void *data)
> | goto cleanup;
> |
> | if (virQEMUCapsParseHelpStr("QEMU", help, flags,
> | - &version, &is_kvm, &kvm_version, false) ==
> -1)
> | + &version, &is_kvm, &kvm_version, false,
> NULL) == -1) {
> | goto cleanup;
This one will manifest in the Wheezy backports then, I'll cp it when
preparing the update.
[..snip..]
>
>
> How to proceed from here: Are you going to upload your version or should
> I redo my work and do the upload?
I picked your patches and uploaded the package (to hopefully meet the
deadline for the point release this weekend).
I've also added your README.Debian improvements to the debian/sid branch
in git. Thanks a lot for your patches!
Cheers,
-- Guido
