[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/1.1.0-3-1-g22913a0

Guido Günther agx at sigxcpu.org
Wed Jul 17 14:52:31 UTC 2013


The following commit has been merged in the master branch:
commit 22913a096aa88f47cbbfec07047c689bb7d0aac6
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Jul 17 13:57:44 2013 +0200

    Skip tests on all architectures except for i386 and amd64
    
    as we did with cdbs

diff --git a/debian/rules b/debian/rules
index 4b089eb..fdd1b33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,9 @@ export VIR_TEST_DEBUG=1
 
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
   ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
-    DEB_MAKE_CHECK_TARGET = check
     WITH_XEN = --with-xen
     WITH_VBOX = --with-vbox
+    MAKE_CHECK = 1
   else
     WITH_XEN            = --without-xen
     WITH_VBOX           = --without-vbox
@@ -110,8 +110,9 @@ override_dh_auto_install:
 	DEB_BUILDDIR=$(DEB_BUILDDIR) make -f debian/python.mk install
 
 override_dh_auto_test:
-	export LD_PRELOAD=""; \
-	dh_auto_test -O--builddirectory=$(DEB_BUILDDIR)
+	export LD_PRELOAD="";     \
+	[ -z "$(MAKE_CHECK)" ] || \
+	  dh_auto_test -O--builddirectory=$(DEB_BUILDDIR)
 
 override_dh_install:
 	dh_install

-- 
Libvirt Debian packaging



More information about the Pkg-libvirt-commits mailing list