[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.2-4-2-gedaf33a

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 008e65dfcffa4f12e7754a85330b0d4fbdee53f9
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Jun 12 21:59:25 2011 +0200

    New patch Skip-nodeinfo-test-on-non-intel-architectures.patch
    
    Skip nodeinfo test on non intel architectures since the testfiles assume
    a /proc/cpuinfo specific to this architecture.

diff --git a/debian/patches/Skip-nodeinfo-test-on-non-intel-architectures.patch b/debian/patches/Skip-nodeinfo-test-on-non-intel-architectures.patch
new file mode 100644
index 0000000..10da1f2
--- /dev/null
+++ b/debian/patches/Skip-nodeinfo-test-on-non-intel-architectures.patch
@@ -0,0 +1,26 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sun, 12 Jun 2011 21:57:01 +0200
+Subject: Skip nodeinfo test on non intel architectures
+
+since the testfiles assume a /proc/cpuinfo specific to this
+architecture.
+---
+ tests/nodeinfotest.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c
+index b4e81b3..71e2926 100644
+--- a/tests/nodeinfotest.c
++++ b/tests/nodeinfotest.c
+@@ -11,7 +11,9 @@
+ #include "util.h"
+ #include "files.h"
+ 
+-#ifndef __linux__
++#if ! (defined __linux__  &&  (defined(__x86_64__) || \
++                               defined(__amd64__)  || \
++                               defined(__i386__)))
+ 
+ static int
+ mymain(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 5bf41dc..3f896fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ Debianize-libvirt-guests.patch
 virsh-Initialize-library-before-calling-virResetLast.patch
 Disable-daemon-start-test.patch
 nodeinfo-remove-superfluous-braces.patch
+Skip-nodeinfo-test-on-non-intel-architectures.patch

-- 
Libvirt Debian packaging