[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.0.61-1

[Guido Günther]

The following commit has been merged in the master branch:
commit b85412ef3454d908dd83fca8d2cd5ac623d8e900
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Jul 17 09:51:05 2009 +0200

    run checks
    
    but disable currently failing tests

diff --git a/debian/rules b/debian/rules
index 5fa4c6e..6d813b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,12 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
+DEBIAN_SKIP_TEST := \
+	SKIP_TEST_HEXDUMP_0 \
+	SKIP_TEST_HEXDUMP_1 \
+	SKIP_TEST_VGS_1
+
+
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--with-readline		\
 	--with-repo=${REPO}     \
@@ -20,6 +26,21 @@ DEB_DBG_PACKAGES = libguestfs0-dbg
 DEB_PYTHON_SETUP_CMD := /dev/null
 DEB_DH_MAKESHLIBS_ARGS_python-guestfs = -X usr/lib/pyshared
 
+# make sure the debirf symlinks get created:
+configure/guestfish::
+	cd appliance; make stamp-debirf-modules
+
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+debian/check-stamp:
+	for TEST in ${DEBIAN_SKIP_TEST}; do \
+	    export $$TEST=1; \
+	done; \
+	make check
+	touch debian/check-stamp
+
+build/guestfish:: debian/check-stamp
+endif
+
 install/python-guestfs::
 	rm -f debian/tmp/usr/lib/python*/*/libguestfsmod.so
 	for mod in debian/tmp/usr/lib/python*/*/libguestfsmod.so.0.0.0; do \
@@ -29,9 +50,6 @@ install/python-guestfs::
 install/guestfish::
 	install -m 755 inspector/virt-inspector.pl debian/tmp/usr/bin/virt-inspector
 
-configure/guestfish::
-	cd appliance; make stamp-debirf-modules
-
 clean::
 	rm -rf appliance/debian/root \
 	       appliance/debian/nest \
@@ -40,4 +58,4 @@ clean::
 	       appliance/*.bak
 	rm -rf perl/blib/ perl/*.o
 	rm -f src/.pod2text.data po/*.gmo
-	rm -f debian/autogen.stamp
+	rm -f debian/check-stamp

-- 
Libguestfs Debian packaging