summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-03-13 03:52:58 +0000
committerHavoc Pennington <hp@redhat.com>2003-03-13 03:52:58 +0000
commit6ecc14ffabcffb69aa938a67940db48272e05046 (patch)
tree76e4c12cdc5c0ef9b3a9fc4913afdfa1fac6478c /test
parent29560adcc79a259a0be3511c056ee7453aa26c04 (diff)
2003-03-12 Havoc Pennington <hp@pobox.com>
Throughout: purge global variables, introduce BusActivation, BusConnections, BusRegistry, etc. objects instead. * bus/bus.h, bus/bus.c: introduce BusContext as a global message bus object * test/Makefile.am (TEST_BINARIES): disable bus-test for now, going to redo this a bit differently I think
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am17
1 files changed, 8 insertions, 9 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 47e96689..8c527bef 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,7 +2,7 @@
INCLUDES=-I$(top_srcdir) $(DBUS_TEST_CFLAGS)
if DBUS_BUILD_TESTS
-TEST_BINARIES=echo-client echo-server unbase64 bus-test break-loader spawn-test
+TEST_BINARIES=echo-client echo-server unbase64 break-loader spawn-test
else
TEST_BINARIES=
endif
@@ -22,13 +22,12 @@ echo_server_SOURCES= \
unbase64_SOURCES= \
unbase64.c
-
-bus_test_SOURCES = \
- debug-thread.c \
- debug-thread.h \
- bus-test.c \
- bus-test-loop.c \
- bus-test-loop.h
+# bus_test_SOURCES = \
+# debug-thread.c \
+# debug-thread.h \
+# bus-test.c \
+# bus-test-loop.c \
+# bus-test-loop.h
break_loader_SOURCES= \
break-loader.c
@@ -42,7 +41,7 @@ echo_client_LDADD=$(TEST_LIBS)
echo_server_LDADD=$(TEST_LIBS)
unbase64_LDADD=$(TEST_LIBS)
break_loader_LDADD= $(TEST_LIBS)
-bus_test_LDADD=$(TEST_LIBS) $(top_builddir)/bus/libdbus-daemon.la
+#bus_test_LDADD=$(TEST_LIBS) $(top_builddir)/bus/libdbus-daemon.la
spawn_test_LDADD=$(TEST_LIBS)
dist-hook: