← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/dbus/oneiric

« back to all changes in this revision

Viewing changes to test/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-07-07 12:23:51 UTC
  • mfrom: (1.1.27 upstream) (1.3.18 sid)
  • Revision ID: james.westby@ubuntu.com-20110707122351-v9trnw2yt9g1xjux
Tags: 1.4.12-4ubuntu1
* Merge with Debian unstable. Remaining changes:
  - Install binaries into / rather than /usr:
    + debian/rules: Set --exec-prefix=/
    + debian/dbus.install, debian/dbus-x11.install: Install from /bin
  - Use upstart to start:
    + Add debian/dbus.upstart.
    + debian/control: Add upstart dependency.
    + debian/dbus.postinst: Use upstart call instead of invoking the init.d
      script for checking if we are already running. 
    + debian/control: versioned dependency on netbase that emits the new
      deconfiguring-networking event used in upstart script.
  - 20_system_conf_limit.patch: Increase max_match_rules_per_connection for
    the system bus to 5000 (LP #454093)
  - 81-session.conf-timeout.patch: Raise the service startup timeout from 25
    to 60 seconds. It may be too short on the live CD with slow machines.
  - Add 0001-activation-allow-for-more-variation-than-just-system.patch,
    0002-bus-change-systemd-activation-to-activation-systemd.patch,
    0003-upstart-add-upstart-as-a-possible-activation-type.patch,
    0004-upstart-add-UpstartJob-to-service-desktop-files.patch,
    0005-activation-implement-upstart-activation.patch: Patches from Scott
    James Remnant to implement Upstart service activation. Not upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/Makefile.am
52
52
test_sleep_forever_SOURCES =                    \
53
53
        test-sleep-forever.c
54
54
 
55
 
# When any programs are not linked to libdbus-internal, fix this.
 
55
# This assumes that most tests will be linked to libdbus-internal;
 
56
# tests linked to only the public libdbus have their own CPPFLAGS.
56
57
AM_CPPFLAGS=-DDBUS_STATIC_BUILD
57
58
TEST_LIBS=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
58
59
 
69
70
spawn_test_LDADD=$(TEST_LIBS)
70
71
spawn_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
71
72
 
72
 
EXTRA_DIST=
 
73
EXTRA_DIST = dbus-test-runner
 
74
 
 
75
testexecdir = $(libdir)/dbus-1.0/test
 
76
 
 
77
testexec_PROGRAMS =
 
78
 
 
79
installable_tests = \
 
80
        test-corrupt \
 
81
        test-dbus-daemon \
 
82
        test-loopback \
 
83
        test-marshal \
 
84
        test-relay \
 
85
        $(NULL)
 
86
 
 
87
installcheck_tests =
 
88
installcheck_environment = \
 
89
        DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT) \
 
90
        DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir)
 
91
 
 
92
TESTS_ENVIRONMENT = \
 
93
        DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
 
94
        DBUS_TEST_DATA=@abs_top_builddir@/test/data
 
95
 
 
96
test_corrupt_SOURCES = corrupt.c
 
97
test_corrupt_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
 
98
test_corrupt_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
99
test_corrupt_LDADD = $(top_builddir)/dbus/libdbus-1.la \
 
100
    $(GLIB_LIBS) \
 
101
    $(DBUS_GLIB_LIBS)
 
102
 
 
103
test_loopback_SOURCES = loopback.c
 
104
test_loopback_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
 
105
test_loopback_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
106
test_loopback_LDADD = $(top_builddir)/dbus/libdbus-1.la \
 
107
    $(GLIB_LIBS) \
 
108
    $(DBUS_GLIB_LIBS)
 
109
 
 
110
test_relay_SOURCES = relay.c
 
111
test_relay_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
 
112
test_relay_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
113
test_relay_LDADD = $(top_builddir)/dbus/libdbus-1.la \
 
114
    $(GLIB_LIBS) \
 
115
    $(DBUS_GLIB_LIBS)
 
116
 
 
117
test_dbus_daemon_SOURCES = dbus-daemon.c
 
118
test_dbus_daemon_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
 
119
test_dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
120
test_dbus_daemon_LDADD = $(top_builddir)/dbus/libdbus-1.la \
 
121
    $(GLIB_LIBS) \
 
122
    $(DBUS_GLIB_LIBS)
 
123
 
 
124
test_marshal_SOURCES = marshal.c
 
125
test_marshal_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
 
126
test_marshal_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
127
test_marshal_LDADD = $(top_builddir)/dbus/libdbus-1.la \
 
128
    $(GLIB_LIBS) \
 
129
    $(DBUS_GLIB_LIBS)
 
130
 
 
131
if DBUS_ENABLE_MODULAR_TESTS
 
132
TESTS += $(installable_tests)
 
133
installcheck_tests += $(installable_tests)
 
134
 
 
135
if DBUS_ENABLE_INSTALLED_TESTS
 
136
  testexec_PROGRAMS += $(installable_tests)
 
137
else !DBUS_ENABLE_INSTALLED_TESTS
 
138
  noinst_PROGRAMS += $(installable_tests)
 
139
endif !DBUS_ENABLE_INSTALLED_TESTS
 
140
 
 
141
endif DBUS_ENABLE_MODULAR_TESTS
 
142
 
 
143
# If we're installing the tests into a DESTDIR we can't run them
 
144
# again using the installed copy, because we don't know how to
 
145
# do a portable equivalent of setting LD_LIBRARY_PATH.
 
146
installcheck-local:
 
147
        $(MAKE) check-TESTS TESTS='$$(installcheck_tests)' \
 
148
                TESTS_ENVIRONMENT='$$(installcheck_environment)'
 
149
if DBUS_ENABLE_INSTALLED_TESTS
 
150
        test -n "$(DESTDIR)" || \
 
151
        $(installcheck_environment) \
 
152
                $(srcdir)/dbus-test-runner \
 
153
                $(testexecdir) \
 
154
                $(testexec_PROGRAMS)
 
155
endif DBUS_ENABLE_INSTALLED_TESTS
73
156
 
74
157
## keep these in creation order, i.e. uppermost dirs first 
75
158
TESTDIRS=                                       \