r37121 - in /desktop/experimental/pygobject/debian: changelog rules

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Fri Mar 22 06:35:22 2013
New Revision: 37121

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37121
Log:
debian/rules: The test suite causes an eternal hang on Debian's buildds,
presumably due to running on very old kernels (2.6.32). This needs more
debugging, but skip the tests for kernels < 3.4 for now.

Modified:
    desktop/experimental/pygobject/debian/changelog
    desktop/experimental/pygobject/debian/rules

Modified: desktop/experimental/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/changelog?rev=37121&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/changelog [utf-8] (original)
+++ desktop/experimental/pygobject/debian/changelog [utf-8] Fri Mar 22 06:35:22 2013
@@ -2,6 +2,9 @@
 
   * Add 01_cairo_region.patch: Add a foreign type for cairo_region_t.
     (LP: #1028115, bgo #667959)
+  * debian/rules: The test suite causes an eternal hang on Debian's buildds,
+    presumably due to running on very old kernels (2.6.32). This needs more
+    debugging, but skip the tests for kernels < 3.4 for now.
 
  -- Martin Pitt <martin.pitt at ubuntu.com>  Fri, 22 Mar 2013 07:11:51 +0100
 

Modified: desktop/experimental/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/rules?rev=37121&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/rules [utf-8] (original)
+++ desktop/experimental/pygobject/debian/rules [utf-8] Fri Mar 22 06:35:22 2013
@@ -28,12 +28,17 @@
 	done
 
 # don't run the tests under fakeroot, otherwise they will try to connect to
-# root's session D-BUS
+# root's session D-BUS; also, tests cause eternal hang on old kernels on
+# Debian's buildds, so don't run them on < 3.4
 override_dh_auto_test:
-	set -e unset LD_PRELOAD && for x in $(FLAVOURS); do \
-	    xvfb-run dh_auto_test --builddirectory=build-$$x || true; \
-	    while [ -e /tmp/.X99-lock ]; do echo "Waiting for xvfb to finish..."; sleep 0.5; done; \
-	done
+	if expr `uname -r | cut -c1-3` '>=' 3.4 > /dev/null; then \
+	    set -e; unset LD_PRELOAD && for x in $(FLAVOURS); do \
+	            xvfb-run dh_auto_test --builddirectory=build-$$x || true; \
+	            while [ -e /tmp/.X99-lock ]; do echo "Waiting for xvfb to finish..."; sleep 0.5; done; \
+	    done; \
+	else \
+	    echo "Skipping tests for old kernel version `uname -r`"; \
+	fi; \
 
 # we remove stuff that we do not need, and rename the *.so modules to what
 # Python expects for that flavor (http://www.python.org/dev/peps/pep-3149/)