[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.7_rc1-2

[Guido Günther]

The following commit has been merged in the experimental branch:
commit c0292f7fda8e0ebab5b1949f15d3b67f1601b2dd
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Nov 2 19:05:45 2011 +0100

    New patch Skip-socket-test-if-we-exceed-UNIX_PATH_MAX.patch
    
    Skip socket test if we exceed UNIX_PATH_MAX.

diff --git a/debian/patches/Skip-socket-test-if-we-exceed-UNIX_PATH_MAX.patch b/debian/patches/Skip-socket-test-if-we-exceed-UNIX_PATH_MAX.patch
new file mode 100644
index 0000000..f92478f
--- /dev/null
+++ b/debian/patches/Skip-socket-test-if-we-exceed-UNIX_PATH_MAX.patch
@@ -0,0 +1,44 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 2 Nov 2011 19:02:42 +0100
+Subject: Skip socket test if we exceed UNIX_PATH_MAX.
+
+As seen on the amd64 buildd with:
+
+ 5) Socket UNIX Accept... libvir: RPC error : Path /build/buildd-libvirt_0.9.7~rc1-1-amd64-EGXZTE/libvirt-0.9.7~rc1/debian/build/tests/virnetsockettest-test.sock too long for unix socket: Cannot allocate memory
+---
+ tests/virnetsockettest.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
+index 1b88605..d7c0c4f 100644
+--- a/tests/virnetsockettest.c
++++ b/tests/virnetsockettest.c
+@@ -205,11 +205,13 @@ static int testSocketUNIXAccept(const void *data ATTRIBUTE_UNUSED)
+     if (progname[0] == '/') {
+         if (virAsprintf(&path, "%s-test.sock", progname) < 0) {
+             virReportOOMError();
++            ret = EXIT_AM_SKIP;
+             goto cleanup;
+         }
+     } else {
+         if (virAsprintf(&path, "%s/%s-test.sock", abs_builddir, progname) < 0) {
+             virReportOOMError();
++            ret = EXIT_AM_SKIP;
+             goto cleanup;
+         }
+     }
+@@ -254,11 +256,13 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED)
+     if (progname[0] == '/') {
+         if (virAsprintf(&path, "%s-test.sock", progname) < 0) {
+             virReportOOMError();
++            ret = EXIT_AM_SKIP;
+             goto cleanup;
+         }
+     } else {
+         if (virAsprintf(&path, "%s/%s-test.sock", abs_builddir, progname) < 0) {
+             virReportOOMError();
++            ret = EXIT_AM_SKIP;
+             goto cleanup;
+         }
+     }
+-- 

-- 
Libvirt Debian packaging