summaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2010-01-28 10:08:51 +0100
committerMurray Cumming <murrayc@murrayc.com>2010-03-08 15:49:53 +0100
commit1af070ad51f63ebe34dec81b3d19b26b6464ebfd (patch)
tree5b9d94c6310b9f7061effd6c211787fa37c18b16 /tests/Makefile.am
parentc579749fa8af27cb5b26d0c172148ac4ea575296 (diff)
downloadglibmm-1af070ad51f63ebe34dec81b3d19b26b6464ebfd.tar.gz
AsyncResult: Add get_source_object_base(), deprecating get_source_object().
* gio/asyncresult.[hg|ccg]: Deprecate get_source_object(), replacing it with get_source_object_base(), because in giomm, the C++ wrapper object might be a Glib::Interface, but not a Glib::Object (though the underlying C instance must be a GObject). This happens if giomm does not know about the GType of the underlying C Object, which is a legitimate situation. * tests/giomm_asyncresult_sourceobject/main.cc: Added this test case from Michael Hasselmann, from bug #608269.
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index af6ccb28..fb090d3f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,12 +20,13 @@ AUTOMAKE_OPTIONS = subdir-objects
check_PROGRAMS = \
giomm_ioerror/test \
giomm_simple/test \
+ giomm_asyncresult_sourceobject/test \
glibmm_btree/test \
glibmm_date/test \
glibmm_nodetree/test \
glibmm_ustring_compose/test \
glibmm_value/test \
- glibmm_valuearray/test
+ glibmm_valuearray/test
glibmm_includes = -I$(top_builddir)/glib $(if $(srcdir:.=),-I$(top_srcdir)/glib)
giomm_includes = -I$(top_builddir)/gio $(if $(srcdir:.=),-I$(top_srcdir)/gio)
@@ -42,9 +43,13 @@ giomm_ldadd = $(GIOMM_LIBS) $(local_libglibmm) $(local_libgiomm)
giomm_ioerror_test_SOURCES = giomm_ioerror/main.cc
giomm_ioerror_test_LDADD = $(giomm_ldadd)
+
giomm_simple_test_SOURCES = giomm_simple/main.cc
giomm_simple_test_LDADD = $(giomm_ldadd)
+giomm_asyncresult_sourceobject_test_SOURCES = giomm_asyncresult_sourceobject/main.cc
+giomm_asyncresult_sourceobject_test_LDADD = $(giomm_ldadd)
+
glibmm_btree_test_SOURCES = glibmm_btree/main.cc
glibmm_date_test_SOURCES = glibmm_date/main.cc
glibmm_nodetree_test_SOURCES = glibmm_nodetree/main.cc