r37691 - in /desktop/unstable/libsoup2.4/debian: changelog rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri May 10 10:46:18 2013
New Revision: 37691

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37691
Log:
Don't run the test-suite via DEB_MAKE_CHECK_TARGET but use a separate make
target. This way we can avoid having to run the complete build under xvfb
and we can set HOME to a writable location.

Modified:
    desktop/unstable/libsoup2.4/debian/changelog
    desktop/unstable/libsoup2.4/debian/rules

Modified: desktop/unstable/libsoup2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/changelog?rev=37691&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/changelog [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/changelog [utf-8] Fri May 10 10:46:18 2013
@@ -1,3 +1,11 @@
+libsoup2.4 (2.42.2-3) UNRELEASED; urgency=low
+
+  * Don't run the test-suite via DEB_MAKE_CHECK_TARGET but use a separate make
+    target. This way we can avoid having to run the complete build under xvfb
+    and we can set HOME to a writable location.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 10 May 2013 06:07:20 +0200
+
 libsoup2.4 (2.42.2-2) unstable; urgency=low
 
   [ Thomas Bechtold ]

Modified: desktop/unstable/libsoup2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/rules?rev=37691&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/rules [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/rules [utf-8] Fri May 10 10:46:18 2013
@@ -13,11 +13,19 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
         --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
-# Make test suite failures non-fatal as long as
+# The test-suite currently fails on various architectures
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663056
-# and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643906
-# aren't fixed yet.
-DEB_MAKE_CHECK_TARGET = check
-# Currently there is no better way to run the test-suite under xvfb
-# http://lists.alioth.debian.org/pipermail/build-common-hackers/2013-March/007826.html
-DEB_MAKE_INVOKE = xvfb-run $(MAKE)
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643906
+
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+common-build-arch common-build-indep:: debian/stamp-makefile-check
+debian/stamp-makefile-check: debian/stamp-makefile-build
+	mkdir -p $(CURDIR)/debian/tmp/home
+	export HOME=$(CURDIR)/debian/tmp/home
+	xvfb-run -s -noreset $(MAKE) check
+	touch $@
+
+makefile-clean::
+	rm -f debian/stamp-makefile-check
+endif
+