diff options
| author | Simon McVittie <smcv@collabora.com> | 2019-01-21 18:45:38 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2019-01-21 18:45:38 +0000 |
| commit | e0ea7a130c84ac9d68a380c399096688a1da065a (patch) | |
| tree | 4b11249995955ef5235a259bb60836bc826a440d /test/name-test | |
| parent | 2938c2125ebcd001e470aeac1ffac45b6b1ebe89 (diff) | |
| download | dbus-e0ea7a130c84ac9d68a380c399096688a1da065a.tar.gz | |
Consistently add CODE_COVERAGE_LIBS everywhere
We need to link the code coverage objects, directly or indirectly,
into every executable and every shared library. The rule I've followed
to make it clear that we do this, without too much repetition, is:
each executable, shared library or convenience library has
CODE_COVERAGE_LIBS in its LDADD or LIBADD, unless it is linked to a
convenience library in the same directory that has CODE_COVERAGE_LIBS
in *its* LIBADD.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'test/name-test')
| -rw-r--r-- | test/name-test/Makefile.am | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 37d1472d..63b07753 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -68,14 +68,38 @@ if DBUS_ENABLE_EMBEDDED_TESTS ## build even when not doing "make check" noinst_PROGRAMS=test-pending-call-dispatch test-pending-call-timeout test-pending-call-disconnected test-threads-init test-ids test-shutdown test-privserver-client test-autolaunch -test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-1.la -test_pending_call_timeout_LDADD=$(top_builddir)/dbus/libdbus-1.la -test_pending_call_disconnected_LDADD=$(top_builddir)/dbus/libdbus-1.la -test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-1.la -test_ids_LDADD=$(top_builddir)/dbus/libdbus-1.la +test_pending_call_dispatch_LDADD = \ + $(CODE_COVERAGE_LIBS) \ + $(top_builddir)/dbus/libdbus-1.la \ + $(NULL) +test_pending_call_timeout_LDADD = \ + $(CODE_COVERAGE_LIBS) \ + $(top_builddir)/dbus/libdbus-1.la \ + $(NULL) +test_pending_call_disconnected_LDADD = \ + $(CODE_COVERAGE_LIBS) \ + $(top_builddir)/dbus/libdbus-1.la \ + $(NULL) +test_threads_init_LDADD = \ + $(CODE_COVERAGE_LIBS) \ + $(top_builddir)/dbus/libdbus-1.la \ + $(NULL) +test_ids_LDADD = \ + $(CODE_COVERAGE_LIBS) \ + $(top_builddir)/dbus/libdbus-1.la \ + $(NULL) -test_shutdown_LDADD=../libdbus-testutils.la -test_privserver_client_LDADD=../libdbus-testutils.la -test_autolaunch_LDADD=../libdbus-testutils.la +test_shutdown_LDADD = \ + $(CODE_COVERAGE_LIBS) \ + ../libdbus-testutils.la \ + $(NULL) +test_privserver_client_LDADD = \ + $(CODE_COVERAGE_LIBS) \ + ../libdbus-testutils.la \ + $(NULL) +test_autolaunch_LDADD = \ + $(CODE_COVERAGE_LIBS) \ + ../libdbus-testutils.la \ + $(NULL) endif |