← Back to branch summary

~xnox/upstart/reload-signal

« back to all changes in this revision

Viewing changes to init/Makefile.am

  • Committer: Dmitrijs Ledkovs
  • Date: 2013-07-18 08:40:47 UTC
  • mfrom: (1505.2.9 xnox-bug-1199778)
  • Revision ID: dmitrijs.ledkovs@canonical.com-20130718084047-oit9t5mlp6svejbg
Merge lp:~jamesodhunt/upstart/bug-1199778

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/Makefile.am
140
140
        $(TEST_DATA_DIR)/upstart-pre-security.json \
141
141
        $(TEST_DATA_DIR)/upstart-1.8+full_serialisation-apparmor.json \
142
142
        $(TEST_DATA_DIR)/upstart-1.8+apparmor.json \
143
 
        $(TEST_DATA_DIR)/upstart-1.8+full_serialisation+apparmor.json
 
143
        $(TEST_DATA_DIR)/upstart-1.8+full_serialisation+apparmor.json \
 
144
        $(TEST_DATA_DIR)/upstart-session.json \
 
145
        $(TEST_DATA_DIR)/upstart-session2.json
144
146
 
145
147
upstart_test_programs = \
146
148
        test_system \