← Back to branch summary

~jamesodhunt/upstart/bug-530779-tmp

« back to all changes in this revision

Viewing changes to init/Makefile.am

  • Committer: James Hunt
  • Date: 2013-11-27 13:49:49 UTC
  • mfrom: (1538.2.40 upstart)
  • Revision ID: james.hunt@ubuntu.com-20131127134949-l16igbtl5q47ukj9
* Sync with lp:upstart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/Makefile.am
144
144
        $(TEST_DATA_DIR)/upstart-session.json \
145
145
        $(TEST_DATA_DIR)/upstart-session2.json \
146
146
        $(TEST_DATA_DIR)/upstart-session-infinity.json \
147
 
        $(TEST_DATA_DIR)/upstart-reload-signal.json
 
147
        $(TEST_DATA_DIR)/upstart-1.9.json \
 
148
        $(TEST_DATA_DIR)/upstart-1.11.json
148
149
 
149
150
upstart_test_programs = \
150
151
        test_system \
165
166
        test_control \
166
167
        test_main
167
168
 
 
169
if ENABLE_TAP_OUTPUT
 
170
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh
 
171
else
 
172
LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
 
173
endif
 
174
 
 
175
# Ensure a clean test environment (that will not touch the running users
 
176
# one). Tests that need the variables listed below are expected to set
 
177
# them to appropriate temporary values as needed.
 
178
AM_TESTS_ENVIRONMENT= \
 
179
        unset -v \
 
180
                XDG_RUNTIME_DIR \
 
181
                DBUS_SESSION_BUS_ADDRESS \
 
182
                UPSTART_SESSION \
 
183
                UPSTART_INSTANCE \
 
184
                UPSTART_EVENTS \
 
185
                UPSTART_JOB;
 
186
 
168
187
TESTS = \
169
188
        $(upstart_test_programs) \
170
189
        test_conf_preload.sh$(EXEEXT)
392
411
        xdg.o \
393
412
        environ.o \
394
413
        $(NIH_LIBS) \
 
414
        $(top_builddir)/test/libtest_util_common.a \
 
415
        $(NIH_LIBS) \
 
416
        $(NIH_DBUS_LIBS) \
 
417
        $(DBUS_LIBS) \
395
418
        -lrt
396
419
 
397
420
test_control_SOURCES = tests/test_control.c