------------------------------------------------------------ revno: 1489 committer: Dmitrijs Ledkovs <[email protected]> branch nick: upstart timestamp: Wed 2013-06-26 15:25:29 +0100 message: Allow make check targets to be invoked from init/ or util/ subdirs. ps. may the force be with you. modified: init/Makefile.am util/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 'init/Makefile.am' --- init/Makefile.am 2013-06-25 13:56:58 +0000 +++ init/Makefile.am 2013-06-26 14:25:29 +0000 @@ -174,7 +174,7 @@ check_SCRIPTS = test_conf_preload.sh CLEANFILES += $(check_SCRIPTS) -tests: $(BUILT_SOURCES) $(check_PROGRAMS) $(check_LTLIBRARIES) +tests: $(BUILT_SOURCES) $(check_PROGRAMS) $(check_LTLIBRARIES) $(top_builddir)/util/initctl $(top_builddir)/test/libtest_util_common.a test_system_SOURCES = tests/test_system.c test_system_LDADD = \ @@ -423,3 +423,9 @@ maintainer-clean-local: rm -f *.gcov + +FORCE: + +$(top_builddir)/util/initctl $(top_builddir)/test/libtest_util_common.a: FORCE + (cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) ) + (cd $(top_builddir)/test && $(MAKE) $(AM_MAKEFLAGS) libtest_util_common.a) === modified file 'util/Makefile.am' --- util/Makefile.am 2013-06-25 09:19:05 +0000 +++ util/Makefile.am 2013-06-26 14:25:29 +0000 @@ -230,7 +230,13 @@ .PHONY: tests -tests: $(BUILT_SOURCES) $(check_PROGRAMS) +tests: $(BUILT_SOURCES) $(check_PROGRAMS) $(top_builddir)/init/init $(top_builddir)/test/libtest_util_common.a + +FORCE: + +$(top_builddir)/init/init $(top_builddir)/test/libtest_util_common.a: FORCE + (cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) ) + (cd $(top_builddir)/test && $(MAKE) $(AM_MAKEFLAGS) check) clean-local: rm -f *.gcno *.gcda
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
