r35450 - in /desktop/experimental/glib2.0/debian: changelog patches/06_thread_test_ignore_prctl_fail.patch patches/series rules

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Jun 26 10:38:13 2012
New Revision: 35450

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35450
Log:
* Add 06_thread_test_ignore_prctl_fail.patch: Do not fail the
  /thread/thread4 test if prctrl() fails. This happens on the Debian
  buildds.
* debian/rules: Set G_HOME to not clutter $HOME with ~/.dbus-keyrings and
  avoid failure on the buildds where creating /home/buildd/.dbus-keyrings
  fails.
* debian/rules: Fail the build on failed tests.

Added:
    desktop/experimental/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series
    desktop/experimental/glib2.0/debian/rules

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=35450&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Tue Jun 26 10:38:13 2012
@@ -5,6 +5,13 @@
   * Add debian/tests/build: autopkgtest check: Build and run a program against
     glib, to verify that the headers and pkg-config file are installed
     correctly.
+  * Add 06_thread_test_ignore_prctl_fail.patch: Do not fail the
+    /thread/thread4 test if prctrl() fails. This happens on the Debian
+    buildds.
+  * debian/rules: Set G_HOME to not clutter $HOME with ~/.dbus-keyrings and
+    avoid failure on the buildds where creating /home/buildd/.dbus-keyrings
+    fails.
+  * debian/rules: Fail the build on failed tests.
 
  -- Martin Pitt <mpitt at debian.org>  Tue, 26 Jun 2012 09:29:35 +0200
 

Added: desktop/experimental/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch?rev=35450&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch [utf-8] Tue Jun 26 10:38:13 2012
@@ -1,0 +1,22 @@
+Description: Do not fail the /thread/thread4 test if prctrl() fails. This happens on the Debian buildds.
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Forwarded: No, Debian buildd specific
+
+Index: glib2.0-2.33.2/glib/tests/thread.c
+===================================================================
+--- glib2.0-2.33.2.orig/glib/tests/thread.c	2012-04-13 01:39:20.000000000 +0200
++++ glib2.0-2.33.2/glib/tests/thread.c	2012-06-26 11:30:28.844881358 +0200
+@@ -138,9 +138,11 @@
+ 
+   getrlimit (RLIMIT_NPROC, &nl);
+   nl.rlim_cur = 1;
+-
+   if ((ret = prlimit (getpid(), RLIMIT_NPROC, &nl, &ol)) != 0)
+-    g_error ("prlimit failed: %s\n", g_strerror (ret));
++    {
++      g_debug ("prlimit failed: %s\n", g_strerror (ret));
++      return;
++    }
+ 
+   error = NULL;
+   thread = g_thread_try_new ("a", thread1_func, NULL, &error);

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35450&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Tue Jun 26 10:38:13 2012
@@ -2,6 +2,7 @@
 02_gettext-desktopfiles-ubuntu.patch
 04_homedir_env.patch
 05_run-gio-tests-with-a-dbus-session.patch
+06_thread_test_ignore_prctl_fail.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
 91_revert_schema_path_warning.patch

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=35450&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules [utf-8] Tue Jun 26 10:38:13 2012
@@ -50,7 +50,11 @@
 # Don't put the symbols in the -dbg package
 DEB_DH_STRIP_ARGS_$(UDEB_PKG) =
 
-DEB_MAKE_CHECK_TARGET = -k check || true
+# Do not clutter $HOME with ~/.dbus-keyrings and avoid failure on the buildds
+# where creating /home/buildd/.dbus-keyrings fails
+export G_HOME=$(CURDIR)/debian/build
+
+DEB_MAKE_CHECK_TARGET = -k check
 
 # configure flags
 DEB_CONFIGURE_EXTRA_FLAGS := \