← Back to branch summary

~vorlon/ubuntu/raring/upstart/lp.1199778

« back to all changes in this revision

Viewing changes to init/Makefile.am

  • Committer: Steve Langasek
  • Date: 2013-11-07 03:06:51 UTC
  • Revision ID: steve.langasek@canonical.com-20131107030651-f1jzeyi7ifvvw1h8
Attempt to cherry-pick fixes for bug #1199778 to raring; something is still
missing though, the test suite segfaults on one of the json loads.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/Makefile.am
17
17
        -DCONFDIR="\"$(initconfdir)\"" \
18
18
        -DSBINDIR="\"$(sbindir)\"" \
19
19
        -I$(top_builddir) -I$(top_srcdir) -iquote$(builddir) -iquote$(srcdir) \
20
 
        -I$(top_srcdir)/intl
21
 
 
 
20
        -I$(top_srcdir)/intl \
 
21
        -I$(top_srcdir)/test -iquote$(top_srcdir)/test
22
22
 
23
23
dist_man_MANS = \
24
24
        man/init.8 \
136
136
AM_CPPFLAGS += -DTEST_DATA_DIR="\"$(TEST_DATA_DIR)\""
137
137
 
138
138
TEST_DATA_FILES = \
139
 
        $(TEST_DATA_DIR)/upstart-1.6.json
 
139
        $(TEST_DATA_DIR)/upstart-1.6.json \
 
140
        $(TEST_DATA_DIR)/upstart-1.8+full_serialisation-apparmor.json \
 
141
        $(TEST_DATA_DIR)/upstart-1.8.json \
 
142
        $(TEST_DATA_DIR)/upstart-session.json \
 
143
        $(TEST_DATA_DIR)/upstart-session2.json
140
144
 
141
145
EXTRA_DIST = init.supp $(TEST_DATA_FILES)
142
146
 
143
 
test_util_SOURCES = \
144
 
        tests/test_util.c tests/test_util.h
145
147
 
146
148
TESTS = \
147
149
        test_system \
160
162
        test_conf \
161
163
        test_conf_static \
162
164
        test_xdg \
163
 
        test_control
 
165
        test_control \
 
166
        test_main
164
167
 
165
168
check_PROGRAMS = $(TESTS)
166
169
 
176
179
        environ.o \
177
180
        $(NIH_LIBS)
178
181
 
179
 
test_process_SOURCES = tests/test_process.c $(test_util_SOURCES)
 
182
test_process_SOURCES = tests/test_process.c
180
183
test_process_LDADD = \
181
184
        system.o environ.o process.o \
182
185
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
184
187
        session.o log.o state.o xdg.o \
185
188
        com.ubuntu.Upstart.o \
186
189
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 
190
        $(top_builddir)/test/libtest_util_common.a \
187
191
        $(NIH_LIBS) \
188
192
        $(NIH_DBUS_LIBS) \
189
193
        $(DBUS_LIBS) \
204
208
        $(JSON_LIBS) \
205
209
        -lrt
206
210
 
207
 
test_job_process_SOURCES = tests/test_job_process.c $(test_util_SOURCES)
 
211
test_job_process_SOURCES = tests/test_job_process.c
208
212
test_job_process_LDADD = \
209
213
        system.o environ.o process.o \
210
214
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
212
216
        session.o log.o state.o xdg.o \
213
217
        com.ubuntu.Upstart.o \
214
218
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 
219
        $(top_builddir)/test/libtest_util_common.a \
215
220
        $(NIH_LIBS) \
216
221
        $(NIH_DBUS_LIBS) \
217
222
        $(DBUS_LIBS) \
232
237
        $(JSON_LIBS) \
233
238
        -lrt
234
239
 
235
 
test_log_SOURCES = tests/test_log.c $(test_util_SOURCES)
 
240
test_log_SOURCES = tests/test_log.c
236
241
test_log_LDADD = \
237
242
        system.o environ.o process.o \
238
243
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
240
245
        session.o log.o state.o xdg.o \
241
246
        com.ubuntu.Upstart.o \
242
247
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 
248
        $(top_builddir)/test/libtest_util_common.a \
243
249
        $(NIH_LIBS) \
244
250
        $(NIH_DBUS_LIBS) \
245
251
        $(DBUS_LIBS) \
246
252
        $(JSON_LIBS) \
247
253
        -lrt -lutil
248
254
 
249
 
test_state_SOURCES = tests/test_state.c $(test_util_SOURCES)
 
255
test_state_SOURCES = tests/test_state.c tests/test_util.c tests/test_util.h
250
256
test_state_LDADD = \
251
257
        system.o environ.o process.o \
252
258
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
254
260
        session.o log.o state.o xdg.o \
255
261
        com.ubuntu.Upstart.o \
256
262
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 
263
        $(top_builddir)/test/libtest_util_common.a \
257
264
        $(NIH_LIBS) \
258
265
        $(NIH_DBUS_LIBS) \
259
266
        $(DBUS_LIBS) \
274
281
        $(JSON_LIBS) \
275
282
        -lrt
276
283
 
277
 
test_event_operator_SOURCES = tests/test_event_operator.c $(test_util_SOURCES)
 
284
test_event_operator_SOURCES = tests/test_event_operator.c tests/test_util.c tests/test_util.h
278
285
test_event_operator_LDADD = \
279
286
        system.o environ.o process.o \
280
287
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
282
289
        session.o log.o state.o xdg.o \
283
290
        com.ubuntu.Upstart.o \
284
291
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 
292
        $(top_builddir)/test/libtest_util_common.a \
285
293
        $(NIH_LIBS) \
286
294
        $(NIH_DBUS_LIBS) \
287
295
        $(DBUS_LIBS) \
330
338
        $(JSON_LIBS) \
331
339
        -lrt
332
340
 
333
 
test_conf_SOURCES = tests/test_conf.c $(test_util_SOURCES)
 
341
test_conf_SOURCES = tests/test_conf.c
334
342
test_conf_LDADD = \
335
343
        system.o environ.o process.o \
336
344
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
338
346
        session.o log.o state.o xdg.o \
339
347
        com.ubuntu.Upstart.o \
340
348
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 
349
        $(top_builddir)/test/libtest_util_common.a \
341
350
        $(NIH_LIBS) \
342
351
        $(NIH_DBUS_LIBS) \
343
352
        $(DBUS_LIBS) \
379
388
        $(JSON_LIBS) \
380
389
        -lrt
381
390
 
 
391
test_main_SOURCES = tests/test_main.c
 
392
test_main_LDADD = \
 
393
        system.o environ.o process.o \
 
394
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 
395
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
 
396
        session.o log.o state.o xdg.o \
 
397
        com.ubuntu.Upstart.o \
 
398
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 
399
        $(top_builddir)/test/libtest_util_common.a \
 
400
        $(NIH_LIBS) \
 
401
        $(NIH_DBUS_LIBS) \
 
402
        $(DBUS_LIBS) \
 
403
        $(JSON_LIBS) \
 
404
        -lrt
382
405
 
383
406
install-data-local:
384
407
        $(MKDIR_P) $(DESTDIR)$(initconfdir)