[kdbus] Fix problem with receiving async messages

[platform/upstream/glib.git] / gio / tests / Makefile.am

diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index d3a2162..5127de7 100644 (file)
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/glib-tap.mk
 dist_uninstalled_test_data =
 test_ltlibraries =
 
-SUBDIRS = gdbus-object-manager-example services
+SUBDIRS = gdbus-object-manager-example services modules
 
 LDADD = \
        $(top_builddir)/gio/libgio-2.0.la               \
@@ -31,8 +31,10 @@ test_programs = \
        credentials                             \
        data-input-stream                       \
        data-output-stream                      \
+       defaultvalue                            \
        fileattributematcher                    \
        filter-streams                          \
+       giomodule                               \
        gsubprocess                             \
        g-file                                  \
        g-file-info                             \
@@ -54,6 +56,7 @@ test_programs = \
        simple-proxy                            \
        sleepy-stream                           \
        socket                                  \
+       socket-listener                         \
        srvtarget                               \
        task                                    \
        tls-interaction                         \
@@ -239,6 +242,7 @@ test_programs += \
        gdbus-peer-object-manager               \
        live-g-file                             \
        socket-address                          \
+       stream-rw_all                           \
        unix-fd                                 \
        unix-streams                            \
        $(NULL)
@@ -302,7 +306,7 @@ dist_test_data += \
        x-content/image-dcf/DCIM/Camera/20130831_203925.jpg \
        x-content/image-dcf/DCIM/Camera/20130831_203928.jpg \
        x-content/unix-software/autorun.sh      \
-       x-content/win32-software/autorun.exe    \       
+       x-content/win32-software/autorun.exe    \
        $(NULL)
 
 test_extra_programs += \
@@ -317,11 +321,11 @@ uninstalled_test_extra_programs += \
 test_programs += mimeapps
 clean-local: clean-mimeapps
 clean-mimeapps:
-       rm -rf xdgdatadir xdgdatahome
+       rm -rf xdgdatadir xdgdatahome xdgconfighome
 
 uninstalled_test_programs += gsettings gschema-compile
 gsettings_DEPENDENCIES = test.mo
-CLEANFILES += test.mo de/LC_MESSAGES/test.mo
+CLEANFILES += test.mo de/LC_MESSAGES/test.mo keyfile/gsettings.store
 gsettings_CFLAGS = $(AM_CFLAGS) -DSRCDIR=\"$(abs_srcdir)\"
 test.mo: de.po
        $(AM_V_GEN) $(MSGFMT) -o test.mo $(srcdir)/de.po; \
@@ -433,8 +437,9 @@ gdbus_threading_SOURCES                  = $(gdbus_sessionbus_sources) gdbus-thr
 gmenumodel_SOURCES                       = $(gdbus_sessionbus_sources) gmenumodel.c
 gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotification.c gnotification-server.h gnotification-server.c
 
+BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
 gdbus-test-codegen.o: gdbus-test-codegen-generated.h
-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
        $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
                UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
                $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
@@ -453,6 +458,8 @@ gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml
                --annotate "org.project.Bar::TestSignal[array_of_strings]" Key8 Value8 \
                $(srcdir)/test-codegen.xml \
                $(NULL)
+gdbus-test-codegen-generated.c: gdbus-test-codegen-generated.h
+       @: # Generated as side-effect of .h
 
 EXTRA_DIST += test-codegen.xml
 CLEANFILES += gdbus-test-codegen-generated.[ch] gdbus-test-codegen-generated-doc-*.xml
@@ -527,3 +534,22 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --
 EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml
 
 CLEANFILES += test_resources.c test_resources2.[ch] plugin_resources.c test.gresource
+
+BUILT_SOURCES += giotypefuncs.c
+
+giotypefuncs.c: Makefile
+       $(AM_V_GEN) echo '#include <gio/gio.h>' > xgen-giosrc.c && \
+         echo "G_GNUC_BEGIN_IGNORE_DEPRECATIONS" > xgen-gio && \
+         ${CPP} $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-giosrc.c | \
+         $(GREP) -o '\bg_.*_get_type\b' | \
+         $(GREP) -v 'g_io_extension_get_type\|g_variant_get_type' | \
+         sort | uniq | \
+         $(SED) -e 's/^/*tp++ = /' -e 's/$$/ ();/' >> xgen-gio && \
+         cp xgen-gio $@ # && rm -f xgen-gio xgen-giosrc.c
+
+CLEANFILES += xgen-giosrc.c xgen-gio giotypefuncs.c
+
+if ENABLE_INSTALLED_TESTS
+install-data-hook:
+       $(AM_V_at) chmod a+x $(DESTDIR)$(installed_testdir)/x-content/win32-software/autorun.exe
+endif