aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--tests/Makefile.am5
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 9240973..5cad751 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (12.10.3+15.04.20150410.2-0ubuntu2) xenial; urgency=high
+
+ * Disable test-json-instruction, hangs on buildds, see launchpad bug
+ 1429291.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 07 Dec 2015 10:13:22 +0000
+
libdbusmenu (12.10.3+15.04.20150410.2-0ubuntu1) vivid; urgency=medium
[ CI Train Bot ]
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9e3e472..64e3e75 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,8 +17,9 @@ TESTS = \
if WANT_DBUSMENUDUMPER
if HAVE_VALGRIND
TESTS += \
- test-json \
- test-json-instruction
+ test-json
+# Hangs see https://bugs.launchpad.net/ubuntu/+source/libdbusmenu/+bug/1429291
+# test-json-instruction
endif
endif