2010-05-06 20:13:59 +02:00
|
|
|
NULL =
|
|
|
|
|
|
2008-01-07 07:14:40 +01:00
|
|
|
include $(top_srcdir)/Makefile.decl
|
|
|
|
|
|
|
|
|
|
INCLUDES = \
|
|
|
|
|
-g \
|
|
|
|
|
-I$(top_srcdir) \
|
|
|
|
|
-I$(top_srcdir)/glib \
|
|
|
|
|
-I$(top_srcdir)/gmodule \
|
|
|
|
|
-I$(top_srcdir)/gobject \
|
|
|
|
|
-I$(top_srcdir)/gio \
|
2009-06-17 02:22:58 +02:00
|
|
|
$(GLIB_DEBUG_FLAGS) \
|
|
|
|
|
-DSRCDIR=\""$(srcdir)"\"
|
2008-01-07 07:14:40 +01:00
|
|
|
|
2010-04-19 11:25:22 +02:00
|
|
|
noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS)
|
|
|
|
|
noinst_DATA = $(MISC_STUFF)
|
|
|
|
|
|
2008-01-07 07:14:40 +01:00
|
|
|
progs_ldadd = \
|
|
|
|
|
$(top_builddir)/glib/libglib-2.0.la \
|
2010-05-15 10:17:35 +02:00
|
|
|
$(top_builddir)/gthread/libgthread-2.0.la \
|
2008-01-07 07:14:40 +01:00
|
|
|
$(top_builddir)/gobject/libgobject-2.0.la \
|
|
|
|
|
$(top_builddir)/gio/libgio-2.0.la
|
|
|
|
|
|
2008-06-30 05:47:27 +02:00
|
|
|
TEST_PROGS += \
|
|
|
|
|
memory-input-stream \
|
|
|
|
|
memory-output-stream \
|
2009-05-13 13:06:58 +02:00
|
|
|
readwrite \
|
2008-06-30 05:47:27 +02:00
|
|
|
g-file \
|
|
|
|
|
g-file-info \
|
2009-10-23 19:59:03 +02:00
|
|
|
converter-stream \
|
2008-06-30 05:47:27 +02:00
|
|
|
data-input-stream \
|
2008-10-21 13:51:48 +02:00
|
|
|
data-output-stream \
|
2008-11-28 06:57:07 +01:00
|
|
|
g-icon \
|
2009-01-05 07:58:22 +01:00
|
|
|
buffered-input-stream \
|
2009-01-28 17:39:39 +01:00
|
|
|
sleepy-stream \
|
2009-01-21 15:09:56 +01:00
|
|
|
filter-streams \
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
simple-async-result \
|
2009-06-17 02:22:58 +02:00
|
|
|
srvtarget \
|
2010-04-17 07:43:58 +02:00
|
|
|
contexts \
|
2010-04-19 17:31:21 +02:00
|
|
|
gsettings \
|
2010-05-07 11:55:40 +02:00
|
|
|
gschema-compile \
|
2010-05-14 05:08:34 +02:00
|
|
|
async-close-output-stream \
|
2010-05-06 20:13:59 +02:00
|
|
|
gdbus-addresses \
|
2010-05-24 10:22:41 +02:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
if OS_UNIX
|
|
|
|
|
TEST_PROGS += \
|
2010-05-06 20:13:59 +02:00
|
|
|
gdbus-connection \
|
|
|
|
|
gdbus-names \
|
|
|
|
|
gdbus-proxy \
|
|
|
|
|
gdbus-introspection \
|
|
|
|
|
gdbus-threading \
|
|
|
|
|
gdbus-export \
|
|
|
|
|
gdbus-error \
|
|
|
|
|
gdbus-peer \
|
|
|
|
|
gdbus-exit-on-close \
|
|
|
|
|
$(NULL)
|
2010-05-24 10:22:41 +02:00
|
|
|
endif
|
2010-05-06 20:13:59 +02:00
|
|
|
|
|
|
|
|
SAMPLE_PROGS = \
|
|
|
|
|
resolver \
|
|
|
|
|
socket-server \
|
|
|
|
|
socket-client \
|
|
|
|
|
echo-server \
|
|
|
|
|
httpd \
|
|
|
|
|
send-data \
|
|
|
|
|
filter-cat \
|
2010-05-13 06:39:26 +02:00
|
|
|
gdbus-example-export \
|
2010-05-06 20:13:59 +02:00
|
|
|
gdbus-example-own-name \
|
|
|
|
|
gdbus-example-watch-name \
|
|
|
|
|
gdbus-example-watch-proxy \
|
|
|
|
|
gdbus-example-server \
|
|
|
|
|
gdbus-example-subtree \
|
|
|
|
|
gdbus-example-peer \
|
2010-05-12 21:49:48 +02:00
|
|
|
gdbus-example-proxy-subclass \
|
2010-05-06 20:13:59 +02:00
|
|
|
$(NULL)
|
2008-02-07 10:56:25 +01:00
|
|
|
|
2008-12-29 18:53:47 +01:00
|
|
|
|
2008-02-07 10:56:25 +01:00
|
|
|
if OS_UNIX
|
2010-04-18 02:54:53 +02:00
|
|
|
TEST_PROGS += live-g-file desktop-app-info unix-fd #unix-streams
|
2010-05-06 20:13:59 +02:00
|
|
|
SAMPLE_PROGS += gdbus-example-unix-fd-client
|
2008-02-07 10:56:25 +01:00
|
|
|
endif
|
2008-01-22 10:13:28 +01:00
|
|
|
|
2010-04-19 10:32:05 +02:00
|
|
|
if OS_WIN32
|
|
|
|
|
TEST_PROGS += win32-streams
|
|
|
|
|
endif
|
|
|
|
|
|
2008-01-07 07:14:40 +01:00
|
|
|
memory_input_stream_SOURCES = memory-input-stream.c
|
|
|
|
|
memory_input_stream_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2008-06-30 05:47:27 +02:00
|
|
|
memory_output_stream_SOURCES = memory-output-stream.c
|
|
|
|
|
memory_output_stream_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2008-01-22 10:13:28 +01:00
|
|
|
g_file_SOURCES = g-file.c
|
|
|
|
|
g_file_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2009-05-13 13:06:58 +02:00
|
|
|
readwrite_SOURCES = readwrite.c
|
|
|
|
|
readwrite_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2008-01-22 10:13:28 +01:00
|
|
|
g_file_info_SOURCES = g-file-info.c
|
|
|
|
|
g_file_info_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2009-10-23 19:59:03 +02:00
|
|
|
converter_stream_SOURCES = converter-stream.c
|
|
|
|
|
converter_stream_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2008-01-22 10:13:28 +01:00
|
|
|
data_input_stream_SOURCES = data-input-stream.c
|
|
|
|
|
data_input_stream_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
data_output_stream_SOURCES = data-output-stream.c
|
|
|
|
|
data_output_stream_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2010-05-07 11:55:40 +02:00
|
|
|
async_close_output_stream_SOURCES = async-close-output-stream.c
|
|
|
|
|
async_close_output_stream_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2009-11-18 16:07:16 +01:00
|
|
|
filter_cat_SOURCES = filter-cat.c
|
|
|
|
|
filter_cat_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2008-10-21 13:51:48 +02:00
|
|
|
g_icon_SOURCES = g-icon.c
|
|
|
|
|
g_icon_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2008-11-28 06:57:07 +01:00
|
|
|
buffered_input_stream_SOURCES = buffered-input-stream.c
|
|
|
|
|
buffered_input_stream_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2008-02-06 14:52:07 +01:00
|
|
|
live_g_file_SOURCES = live-g-file.c
|
|
|
|
|
live_g_file_LDADD = $(progs_ldadd)
|
2008-09-26 18:19:35 +02:00
|
|
|
|
2008-09-26 21:57:36 +02:00
|
|
|
desktop_app_info_SOURCES = desktop-app-info.c
|
|
|
|
|
desktop_app_info_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2010-04-19 11:25:22 +02:00
|
|
|
#unix_streams_SOURCES = unix-streams.c
|
|
|
|
|
#unix_streams_LDADD = $(progs_ldadd) \
|
|
|
|
|
# $(top_builddir)/gthread/libgthread-2.0.la
|
2008-12-15 21:01:49 +01:00
|
|
|
|
2010-04-19 10:32:05 +02:00
|
|
|
win32_streams_SOURCES = win32-streams.c
|
|
|
|
|
win32_streams_LDADD = $(progs_ldadd) \
|
|
|
|
|
$(top_builddir)/gthread/libgthread-2.0.la
|
|
|
|
|
|
2009-11-12 04:40:28 +01:00
|
|
|
unix_fd_SOURCES = unix-fd.c
|
|
|
|
|
unix_fd_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2009-01-05 07:58:22 +01:00
|
|
|
simple_async_result_SOURCES = simple-async-result.c
|
|
|
|
|
simple_async_result_LDADD = $(progs_ldadd)
|
2008-12-15 21:01:49 +01:00
|
|
|
|
2009-01-28 17:39:39 +01:00
|
|
|
sleepy_stream_SOURCES = sleepy-stream.c
|
|
|
|
|
sleepy_stream_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2009-01-21 15:09:56 +01:00
|
|
|
filter_streams_SOURCES = filter-streams.c
|
|
|
|
|
filter_streams_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2008-12-29 18:53:47 +01:00
|
|
|
resolver_SOURCES = resolver.c
|
|
|
|
|
resolver_LDADD = $(progs_ldadd) \
|
|
|
|
|
$(top_builddir)/gthread/libgthread-2.0.la
|
|
|
|
|
|
2009-05-15 10:08:18 +02:00
|
|
|
socket_server_SOURCES = socket-server.c
|
|
|
|
|
socket_server_LDADD = $(progs_ldadd) \
|
|
|
|
|
$(top_builddir)/gthread/libgthread-2.0.la
|
|
|
|
|
|
|
|
|
|
socket_client_SOURCES = socket-client.c
|
|
|
|
|
socket_client_LDADD = $(progs_ldadd) \
|
|
|
|
|
$(top_builddir)/gthread/libgthread-2.0.la
|
|
|
|
|
|
2009-05-15 21:34:14 +02:00
|
|
|
echo_server_SOURCES = echo-server.c
|
|
|
|
|
echo_server_LDADD = $(progs_ldadd) \
|
|
|
|
|
$(top_builddir)/gthread/libgthread-2.0.la
|
|
|
|
|
|
|
|
|
|
httpd_SOURCES = httpd.c
|
|
|
|
|
httpd_LDADD = $(progs_ldadd) \
|
|
|
|
|
$(top_builddir)/gthread/libgthread-2.0.la
|
|
|
|
|
|
2009-05-19 13:44:11 +02:00
|
|
|
send_data_SOURCES = send-data.c
|
|
|
|
|
send_data_LDADD = $(progs_ldadd) \
|
|
|
|
|
$(top_builddir)/gthread/libgthread-2.0.la
|
|
|
|
|
|
Fix multiple bugs in g_srv_target_list_sort()
In particular, targets with weight 0 should be very UNlikely to be
selected, not very likely, as they were before. However, even ignoring
that bug in the logic, there was an additional bug (swapping list
items would cause the 0-weight items to get re-ordered incorrectly
anyway), and the code contained several fencepost errors.
This patch also adds gio/tests/srvtarget.c, which confirms that for a
sample list of targets, we now generate all possible correct random
sortings and no incorrect sortings, and the correct sortings occur in
roughly the expected proportions (though if the current code is
still wrong, those proportions may be wrong as well).
http://bugzilla.gnome.org/show_bug.cgi?id=583398
2009-05-28 21:27:04 +02:00
|
|
|
srvtarget_SOURCES = srvtarget.c
|
|
|
|
|
srvtarget_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2009-06-17 02:22:58 +02:00
|
|
|
contexts_SOURCES = contexts.c
|
|
|
|
|
contexts_LDADD = $(progs_ldadd) \
|
|
|
|
|
$(top_builddir)/gthread/libgthread-2.0.la
|
|
|
|
|
|
2010-04-18 02:54:53 +02:00
|
|
|
gsettings_SOURCES = gsettings.c
|
2010-04-17 07:43:58 +02:00
|
|
|
gsettings_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2010-04-19 17:31:21 +02:00
|
|
|
gschema_compile_SOURCES = gschema-compile.c
|
|
|
|
|
gschema_compile_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2010-05-06 20:13:59 +02:00
|
|
|
if HAVE_DBUS1
|
|
|
|
|
TEST_PROGS += gdbus-serialization
|
|
|
|
|
gdbus_serialization_SOURCES = gdbus-serialization.c gdbus-tests.h gdbus-tests.c
|
|
|
|
|
gdbus_serialization_CFLAGS = $(DBUS1_CFLAGS)
|
|
|
|
|
gdbus_serialization_LDADD = $(progs_ldadd) $(DBUS1_LIBS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
gdbus_addresses_SOURCES = gdbus-addresses.c
|
|
|
|
|
gdbus_addresses_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_connection_SOURCES = gdbus-connection.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
|
|
|
|
|
gdbus_connection_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_names_SOURCES = gdbus-names.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
|
|
|
|
|
gdbus_names_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_proxy_SOURCES = gdbus-proxy.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
|
|
|
|
|
gdbus_proxy_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_introspection_SOURCES = gdbus-introspection.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
|
|
|
|
|
gdbus_introspection_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_threading_SOURCES = gdbus-threading.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
|
|
|
|
|
gdbus_threading_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_export_SOURCES = gdbus-export.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
|
|
|
|
|
gdbus_export_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_error_SOURCES = gdbus-error.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
|
|
|
|
|
gdbus_error_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2010-05-24 10:22:41 +02:00
|
|
|
gdbus_peer_SOURCES = gdbus-peer.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
|
2010-05-06 20:13:59 +02:00
|
|
|
gdbus_peer_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_exit_on_close_SOURCES = gdbus-exit-on-close.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
|
|
|
|
|
gdbus_exit_on_close_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_example_watch_name_SOURCES = gdbus-example-watch-name.c
|
|
|
|
|
gdbus_example_watch_name_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_example_watch_proxy_SOURCES = gdbus-example-watch-proxy.c
|
|
|
|
|
gdbus_example_watch_proxy_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_example_own_name_SOURCES = gdbus-example-own-name.c
|
|
|
|
|
gdbus_example_own_name_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_example_server_SOURCES = gdbus-example-server.c
|
|
|
|
|
gdbus_example_server_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_example_unix_fd_client_SOURCES = gdbus-example-unix-fd-client.c
|
|
|
|
|
gdbus_example_unix_fd_client_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_example_subtree_SOURCES = gdbus-example-subtree.c
|
|
|
|
|
gdbus_example_subtree_LDADD = $(progs_ldadd)
|
|
|
|
|
|
|
|
|
|
gdbus_example_peer_SOURCES = gdbus-example-peer.c
|
|
|
|
|
gdbus_example_peer_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2010-05-12 21:49:48 +02:00
|
|
|
gdbus_example_proxy_subclass_SOURCES = gdbus-example-proxy-subclass.c
|
|
|
|
|
gdbus_example_proxy_subclass_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2010-05-13 06:39:26 +02:00
|
|
|
gdbus_example_export_SOURCES = gdbus-example-export.c
|
|
|
|
|
gdbus_example_export_LDADD = $(progs_ldadd)
|
|
|
|
|
|
2010-04-26 03:07:26 +02:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
socket-common.c \
|
|
|
|
|
org.gtk.test.gschema \
|
|
|
|
|
org.gtk.test.gschema.xml \
|
|
|
|
|
de.po \
|
|
|
|
|
schema-tests/bad-type.gschema.xml \
|
|
|
|
|
schema-tests/incomplete-list.gschema.xml \
|
|
|
|
|
schema-tests/missing-quotes.gschema.xml \
|
|
|
|
|
schema-tests/no-default.gschema.xml \
|
|
|
|
|
schema-tests/wrong-category.gschema.xml \
|
|
|
|
|
schema-tests/overflow.gschema.xml \
|
|
|
|
|
schema-tests/bad-key.gschema.xml \
|
|
|
|
|
schema-tests/bad-key2.gschema.xml \
|
|
|
|
|
schema-tests/bad-key3.gschema.xml \
|
|
|
|
|
schema-tests/bad-key4.gschema.xml \
|
|
|
|
|
schema-tests/empty-key.gschema.xml \
|
|
|
|
|
schema-tests/array-default-not-in-choices.gschema.xml \
|
|
|
|
|
schema-tests/bad-type.gschema.xml \
|
|
|
|
|
schema-tests/choice-missing-value.gschema.xml \
|
|
|
|
|
schema-tests/choices-wrong-type.gschema.xml \
|
|
|
|
|
schema-tests/default-not-in-choices.gschema.xml \
|
|
|
|
|
schema-tests/default-out-of-range.gschema.xml \
|
|
|
|
|
schema-tests/incomplete-list.gschema.xml \
|
|
|
|
|
schema-tests/missing-quotes.gschema.xml \
|
|
|
|
|
schema-tests/no-default.gschema.xml \
|
|
|
|
|
schema-tests/overflow.gschema.xml \
|
|
|
|
|
schema-tests/range-missing-max.gschema.xml \
|
|
|
|
|
schema-tests/range-missing-min.gschema.xml \
|
|
|
|
|
schema-tests/range-wrong-type.gschema.xml \
|
2010-05-14 16:49:03 +02:00
|
|
|
schema-tests/wrong-category.gschema.xml \
|
|
|
|
|
gdbus-testserver.py
|
2010-04-26 03:07:26 +02:00
|
|
|
|
2010-04-19 14:48:30 +02:00
|
|
|
MISC_STUFF = gschemas.compiled test.mo
|
2010-04-17 07:43:58 +02:00
|
|
|
|
|
|
|
|
test.mo: de.po
|
2010-04-18 02:54:53 +02:00
|
|
|
$(MSGFMT) -o test.mo $(srcdir)/de.po; \
|
2010-04-17 07:43:58 +02:00
|
|
|
$(MKDIR_P) de/LC_MESSAGES; \
|
|
|
|
|
cp -f test.mo de/LC_MESSAGES
|
|
|
|
|
|
2010-04-18 02:54:53 +02:00
|
|
|
gschemas.compiled:
|
2010-04-24 01:57:14 +02:00
|
|
|
$(top_builddir)/gio/glib-compile-schemas --targetdir=$(abs_builddir) $(srcdir)
|
2010-04-17 07:43:58 +02:00
|
|
|
|
2010-04-19 19:14:30 +02:00
|
|
|
DISTCLEANFILES = \
|
|
|
|
|
applications/mimeinfo.cache \
|
|
|
|
|
de/LC_MESSAGES/test.mo \
|
|
|
|
|
test.mo \
|
|
|
|
|
gsettings.store \
|
2010-04-19 23:30:42 +02:00
|
|
|
gschemas.compiled
|
