r44345 - in /desktop/unstable/glib2.0/debian: changelog patches/07_disable_tests_on_slow_archs.patch patches/GDBus-tests-change-progress-noise-from-if-not-quiet-.patch patches/series
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Mon May 11 18:07:45 UTC 2015
Author: smcv
Date: Mon May 11 18:07:44 2015
New Revision: 44345
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44345
Log:
d/p/GDBus-tests-change-progress-noise-from-if-not-quiet-.patch: add patch fixing potential test failures caused by corrupt TAP output. Applied upstream for 2.45.2.
Added:
desktop/unstable/glib2.0/debian/patches/GDBus-tests-change-progress-noise-from-if-not-quiet-.patch
Modified:
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
desktop/unstable/glib2.0/debian/patches/series
Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=44345&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Mon May 11 18:07:44 2015
@@ -15,6 +15,9 @@
* d/p/gdbus-peer-test-let-GDBusServer-start-before-notifyi.patch:
add patch fixing a race condition in the gdbus-peer test.
Applied upstream for 2.45.2.
+ * d/p/GDBus-tests-change-progress-noise-from-if-not-quiet-.patch:
+ add patch fixing potential test failures caused by corrupt TAP
+ output. Applied upstream for 2.45.2.
-- Simon McVittie <smcv at debian.org> Mon, 04 May 2015 09:53:53 +0100
Modified: desktop/unstable/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch?rev=44345&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] Mon May 11 18:07:44 2015
@@ -62,5 +62,5 @@
g_assert_cmpint (elapsed_msec, <, 8000);
+#endif
- if (!g_test_quiet ())
+ if (g_test_verbose ())
g_print (" ");
Added: desktop/unstable/glib2.0/debian/patches/GDBus-tests-change-progress-noise-from-if-not-quiet-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/GDBus-tests-change-progress-noise-from-if-not-quiet-.patch?rev=44345&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/GDBus-tests-change-progress-noise-from-if-not-quiet-.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/GDBus-tests-change-progress-noise-from-if-not-quiet-.patch [utf-8] Mon May 11 18:07:44 2015
@@ -0,0 +1,91 @@
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Thu, 7 May 2015 17:36:01 +0100
+Subject: GDBus tests: change progress noise from "if not quiet" to
+ "if verbose"
+
+It seems that even after Bug #711796, these can still interfere
+with TAP testing:
+
+PASS: gdbus-proxy-threads 1 /gdbus/proxy/vs-threads
+tap-driver.sh: internal error getting exit status
+tap-driver.sh: fatal: I/O or internal error
+
+Let's shut them up unless --verbose is used (which would be appropriate
+when running them interactively).
+
+Similar symptoms have been seen in Debian:
+https://buildd.debian.org/status/fetch.php?pkg=glib2.0&arch=mipsel&ver=2.39.91-1&stamp=1394394568
+and in Guix:
+https://lists.gnu.org/archive/html/bug-guix/2014-12/msg00002.html
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=725981
+Reviewed-by: Philip Withnall <philip.withnall at collabora.co.uk>
+Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Applied-upstream: 2.45.2, commit:bced30cfbb9d98fdaf71225bae3330e95ea548fa
+---
+ gio/tests/gdbus-proxy-threads.c | 4 ++--
+ gio/tests/gdbus-threading.c | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gio/tests/gdbus-proxy-threads.c b/gio/tests/gdbus-proxy-threads.c
+index 5181a9a..a019efe 100644
+--- a/gio/tests/gdbus-proxy-threads.c
++++ b/gio/tests/gdbus-proxy-threads.c
+@@ -71,7 +71,7 @@ run_proxy_thread (gpointer data)
+ GError *error = NULL;
+ GVariant *ret;
+
+- if (!g_test_quiet ())
++ if (g_test_verbose ())
+ g_print (".");
+
+ proxy = g_dbus_proxy_new_sync (connection,
+@@ -232,7 +232,7 @@ test_proxy (void)
+ /* TODO: should call session_bus_down() but that requires waiting
+ * for all the oustanding method calls to complete...
+ */
+- if (!g_test_quiet ())
++ if (g_test_verbose ())
+ g_print ("\n");
+ }
+
+diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
+index c62b223..0f5253b 100644
+--- a/gio/tests/gdbus-threading.c
++++ b/gio/tests/gdbus-threading.c
+@@ -295,7 +295,7 @@ test_sleep_in_thread_func (gpointer _data)
+ (GAsyncReadyCallback) sleep_cb,
+ data);
+ g_main_loop_run (data->thread_loop);
+- if (!g_test_quiet ())
++ if (g_test_verbose ())
+ g_print ("A");
+ //g_debug ("done invoking async (%p)", g_thread_self ());
+ }
+@@ -313,7 +313,7 @@ test_sleep_in_thread_func (gpointer _data)
+ -1,
+ NULL,
+ &error);
+- if (!g_test_quiet ())
++ if (g_test_verbose ())
+ g_print ("S");
+ //g_debug ("done invoking sync (%p)", g_thread_self ());
+ g_assert_no_error (error);
+@@ -408,7 +408,7 @@ test_method_calls_on_proxy (GDBusProxy *proxy)
+ g_assert_cmpint (elapsed_msec, >=, 3950);
+ g_assert_cmpint (elapsed_msec, <, 8000);
+
+- if (!g_test_quiet ())
++ if (g_test_verbose ())
+ g_print (" ");
+ }
+ }
+@@ -446,7 +446,7 @@ test_method_calls_in_thread (void)
+ g_object_unref (proxy);
+ g_object_unref (connection);
+
+- if (!g_test_quiet ())
++ if (g_test_verbose ())
+ g_print ("\n");
+ }
+
Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=44345&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Mon May 11 18:07:44 2015
@@ -3,6 +3,7 @@
03_disble_glib_compile_schemas_warning.patch
04_homedir_env.patch
06_thread_test_ignore_prctl_fail.patch
+GDBus-tests-change-progress-noise-from-if-not-quiet-.patch
07_disable_tests_on_slow_archs.patch
10_kfreebsd_issetugid_prototype.patch
11_kfreebsd_pthread_condattr_setclock_prototype.patch
More information about the pkg-gnome-commits
mailing list