------------------------------------------------------------ revno: 1494 committer: James Hunt <[email protected]> branch nick: upstart timestamp: Fri 2013-06-28 11:30:01 +0100 message: * init/Makefile.am - Avoid defining test list twice. - Append $(EXEEXT) where appropriate to appease automake. modified: ChangeLog init/Makefile.am
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'ChangeLog' --- ChangeLog 2013-06-27 15:14:30 +0000 +++ ChangeLog 2013-06-28 10:30:01 +0000 @@ -1,3 +1,9 @@ +2013-06-28 James Hunt <[email protected]> + + * init/Makefile.am: + - Avoid defining test list twice. + - Append $(EXEEXT) where appropriate to appease automake. + 2013-06-27 James Hunt <[email protected]> * lib/Makefile.am: Added dependency on libtest_util_common. === modified file 'init/Makefile.am' --- init/Makefile.am 2013-06-28 09:50:19 +0000 +++ init/Makefile.am 2013-06-28 10:30:01 +0000 @@ -142,56 +142,40 @@ $(TEST_DATA_DIR)/upstart-1.8+apparmor.json \ $(TEST_DATA_DIR)/upstart-1.8+full_serialisation+apparmor.json +upstart_test_programs = \ + test_system \ + test_environ \ + test_process \ + test_job_class \ + test_job_process \ + test_job \ + test_log \ + test_state \ + test_event \ + test_event_operator \ + test_blocked \ + test_parse_job \ + test_parse_conf \ + test_conf_static \ + test_xdg \ + test_control \ + test_main TESTS = \ - test_system \ - test_environ \ - test_process \ - test_conf_preload.sh \ - test_job_class \ - test_job_process \ - test_job \ - test_log \ - test_state \ - test_event \ - test_event_operator \ - test_blocked \ - test_parse_job \ - test_parse_conf \ - test_conf_static \ - test_xdg \ - test_control \ - test_main + $(upstart_test_programs) \ + test_conf_preload.sh$(EXEEXT) EXTRA_DIST = init.supp $(TEST_DATA_FILES) tests/test_conf_preload.sh.in -test_conf_preload.sh: tests/test_conf_preload.sh.in Makefile test_conf +test_conf_preload.sh$(EXEEXT): tests/test_conf_preload.sh.in Makefile test_conf sed -e 's|[@]abs_builddir[@]|$(abs_builddir)|g' \ -e 's|[@]inotify_preload_library[@]|$(check_LTLIBRARIES)|g' \ $< > $@ chmod +x $@ -check_PROGRAMS = \ - test_system \ - test_environ \ - test_process \ - test_conf \ - test_job_class \ - test_job_process \ - test_job \ - test_log \ - test_state \ - test_event \ - test_event_operator \ - test_blocked \ - test_parse_job \ - test_parse_conf \ - test_conf_static \ - test_xdg \ - test_control \ - test_main +check_PROGRAMS = $(upstart_test_programs) test_conf -check_SCRIPTS = test_conf_preload.sh +check_SCRIPTS = test_conf_preload.sh$(EXEEXT) CLEANFILES += $(check_SCRIPTS) tests: $(BUILT_SOURCES) $(check_PROGRAMS) $(check_LTLIBRARIES) $(top_builddir)/util/initctl $(top_builddir)/test/libtest_util_common.a
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
