diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | dbus/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 6 | ||||
| -rw-r--r-- | test/break-loader.c (renamed from dbus/dbus-break-loader.c) | 13 |
4 files changed, 22 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2003-02-06 Anders Carlsson <andersca@codefactory.se> + + * dbus/Makefile.am: + * dbus/dbus-break-loader.c: + * test/Makefile.am: + * test/break-loader.c: + Move dbus-break-loader to test/ and rename it to break-loader. + 2003-02-02 Havoc Pennington <hp@pobox.com> * dbus/dbus-keyring.c, dbus/dbus-keyring.h: template files diff --git a/dbus/Makefile.am b/dbus/Makefile.am index c28b5383..f6f84a61 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -96,7 +96,7 @@ libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" ## TESTS if DBUS_BUILD_TESTS TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_srcdir)/test/data -TESTS=dbus-test dbus-break-loader +TESTS=dbus-test else TESTS= endif diff --git a/test/Makefile.am b/test/Makefile.am index fc218b7c..972d67cf 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 +TEST_BINARIES=echo-client echo-server unbase64 bus-test break-loader else TEST_BINARIES= endif @@ -26,11 +26,15 @@ unbase64_SOURCES= \ bus_test_SOURCES = \ bus-test.c +break_loader_SOURCES= \ + break-loader.c + TEST_LIBS=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la $(top_builddir)/dbus/libdbus-1.la 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 dist-hook: diff --git a/dbus/dbus-break-loader.c b/test/break-loader.c index c27299c9..95ca808e 100644 --- a/dbus/dbus-break-loader.c +++ b/test/break-loader.c @@ -21,11 +21,7 @@ * */ -#include "dbus-types.h" -#include "dbus-test.h" -#include "dbus-internals.h" -#include "dbus-sysdeps.h" -#include "dbus-marshal.h" +#include <dbus/dbus.h> #include <sys/stat.h> #include <sys/types.h> #include <fcntl.h> @@ -36,6 +32,13 @@ #include <sys/wait.h> #include <string.h> +#define DBUS_COMPILATION +#include <dbus/dbus-string.h> +#include <dbus/dbus-internals.h> +#include <dbus/dbus-test.h> +#include <dbus/dbus-marshal.h> +#undef DBUS_COMPILATION + static DBusString failure_dir; static int total_attempts; static int failures_this_iteration; |