diff options
| author | Ted Gould <ted@gould.cx> | 2014-11-03 20:57:33 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-11-03 20:57:33 +0000 |
| commit | 2d4009b5dd4e3951f1b0ffedc97d3db3a626062c (patch) | |
| tree | 124d670064e4fece7a34bc1d14c5feca80530103 | |
| parent | 01ce8c36c74f0adfffbd14c9923c68181dc2ec32 (diff) | |
| parent | c3c628dcf3f92c30d167f73daaea6c408123ffa6 (diff) | |
| download | ayatana-ido-2d4009b5dd4e3951f1b0ffedc97d3db3a626062c.tar.gz ayatana-ido-2d4009b5dd4e3951f1b0ffedc97d3db3a626062c.tar.bz2 ayatana-ido-2d4009b5dd4e3951f1b0ffedc97d3db3a626062c.zip | |
Update tags for newer GObject Introsepction Scanner and disable xorg-gtest tests Fixes: 1382020
Approved by: PS Jenkins bot
| -rw-r--r-- | m4/gcov.m4 | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/idomessagedialog.c | 4 | ||||
| -rw-r--r-- | src/idoprogressmenuitem.c | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 8 |
5 files changed, 13 insertions, 10 deletions
@@ -30,7 +30,7 @@ AC_DEFUN([AC_TDD_GCOV], AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) fi - lcov_version_list="1.6 1.7 1.8 1.9 1.10" + lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11" AC_CHECK_PROG(LCOV, lcov, lcov) AC_CHECK_PROG(GENHTML, genhtml, genhtml) diff --git a/src/Makefile.am b/src/Makefile.am index 9b722cb..e18fb70 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -113,11 +113,12 @@ libidoinclude_HEADERS = \ libido_0_1_la_LIBADD = $(GTK_LIBS) $(LIBM) libido_0_1_la_LDFLAGS = \ $(GTK_LT_LDFLAGS) \ - $(COVERAGE_LDFLAGS) + $(COVERAGE_LDFLAGS) \ + -no-undefined \ + -export-symbols-regex "^[^_].*" libido3_0_1_la_LIBADD = $(libido_0_1_la_LIBADD) libido3_0_1_la_LDFLAGS = \ - $(libido_0_1_la_LDFLAGS) \ - $(COVERAGE_LDFLAGS) + $(libido_0_1_la_LDFLAGS) DISTCLEANFILES = \ stamp-idotypebuiltins.h \ diff --git a/src/idomessagedialog.c b/src/idomessagedialog.c index f2c2e93..5b73950 100644 --- a/src/idomessagedialog.c +++ b/src/idomessagedialog.c @@ -248,7 +248,7 @@ ido_message_dialog_init (IdoMessageDialog *dialog) * @type: type of message * @buttons: a set of buttons to use * @message_format: printf()-style format string, or %NULL - * @Varargs: arguments for @message_format + * @...: arguments for @message_format * * Creates a new message dialog, which is based upon * GtkMessageDialog so it shares API and functionality @@ -312,7 +312,7 @@ ido_message_dialog_new (GtkWindow *parent, * @type: type of message * @buttons: a set of buttons to use * @message_format: printf()-style format string, or %NULL - * @Varargs: arguments for @message_format. They will be escaped to allow valid XML. + * @...: arguments for @message_format. They will be escaped to allow valid XML. * * Creates a new message dialog, which is based upon * GtkMessageDialog so it shares API and functionality diff --git a/src/idoprogressmenuitem.c b/src/idoprogressmenuitem.c index 9d456b8..4fda202 100644 --- a/src/idoprogressmenuitem.c +++ b/src/idoprogressmenuitem.c @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 Canonical Ltd. * * Authors: diff --git a/tests/Makefile.am b/tests/Makefile.am index f45114e..f3c035b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,8 @@ VER=3 IDOLIB = $(top_builddir)/src/libido3-0.1.la -check_LIBRARIES = libgtest.a +# xorg-gtest isn't buildable https://bugs.launchpad.net/ubuntu/+source/xorg-gtest/+bug/1388892 +# check_LIBRARIES = libgtest.a check_PROGRAMS = TESTS = @@ -28,8 +29,9 @@ libgtest_a_CXXFLAGS = \ # Menuitem tests ############################# -TESTS += gtest-menuitems -check_PROGRAMS += gtest-menuitems +# xorg-gtest isn't buildable https://bugs.launchpad.net/ubuntu/+source/xorg-gtest/+bug/1388892 +# TESTS += gtest-menuitems +# check_PROGRAMS += gtest-menuitems gtest_menuitems_SOURCES = \ gtest-menuitems.cpp |