diff options
| author | Colin Walters <walters@verbum.org> | 2008-05-30 16:53:35 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2008-05-30 16:53:35 -0400 |
| commit | a73a79a155e97a3bd0d3ce5001ca6b9db803eeeb (patch) | |
| tree | f1c3baeb481bcc0f485a7f9371f1fdc43f0efe08 /test/name-test/Makefile.am | |
| parent | 9d8989cfec02e6ca41f8ffa0ccda16c93ddcb23c (diff) | |
Add noinst convenience test library, add a test-shutdown
* test/Makefile.am: New convenience library
libdbus_testutils_la. Reorder build so that
test/ gets built before test/name-test so
name-test files can depend on it.
* test/name-test/test-shutdown.c: New file,
exercises dbus_shutdown () a bit.
* test/name-test/run-test.sh Run test-shutdown.
* test/test-utils.h: In some cases we already have
DBUS_COMPILATION defined, avoid double definition
warning.
Diffstat (limited to 'test/name-test/Makefile.am')
| -rw-r--r-- | test/name-test/Makefile.am | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index fbc80c42..37a56335 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_COMPILATION +INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_TEST_CFLAGS) -DDBUS_COMPILATION ## note that TESTS has special meaning (stuff to use in make check) ## so if adding tests not to be run in make check, don't add them to @@ -16,7 +16,7 @@ if DBUS_BUILD_TESTS ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we ## build even when not doing "make check" -noinst_PROGRAMS=test-names test-pending-call-dispatch test-threads-init test-ids +noinst_PROGRAMS=test-names test-pending-call-dispatch test-threads-init test-ids test-shutdown test_names_SOURCES= \ test-names.c @@ -42,5 +42,11 @@ test_ids_SOURCES = \ test_ids_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS) test_ids_LDFLAGS=@R_DYNAMIC_LDFLAG@ -endif +test_shutdown_SOURCES = \ + test-shutdown.c + +test_shutdown_CFLAGS= +test_shutdown_LDADD=$(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) +test_shutdown_LDFLAGS=@R_DYNAMIC_LDFLAG@ +endif |