------------------------------------------------------------ revno: 1567 fixes bug: https://launchpad.net/bugs/1250126 committer: Dmitrijs Ledkovs <[email protected]> branch nick: upstart timestamp: Mon 2013-11-11 16:15:52 +0000 message: Unbreak running with non-tap test driver. modified: init/Makefile.am lib/Makefile.am test/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-11-11 10:13:08 +0000 +++ init/Makefile.am 2013-11-11 16:15:52 +0000 @@ -168,6 +168,8 @@ if ENABLE_TAP_OUTPUT LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh +else +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver endif AM_TESTS_ENVIRONMENT= \ === modified file 'lib/Makefile.am' --- lib/Makefile.am 2013-11-11 10:13:08 +0000 +++ lib/Makefile.am 2013-11-11 16:15:52 +0000 @@ -96,6 +96,8 @@ if ENABLE_TAP_OUTPUT LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh +else +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver endif TESTS = test_libupstart === modified file 'test/Makefile.am' --- test/Makefile.am 2013-11-11 10:13:08 +0000 +++ test/Makefile.am 2013-11-11 16:15:52 +0000 @@ -24,6 +24,8 @@ if ENABLE_TAP_OUTPUT LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh +else +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver endif TESTS = test_util_check_env === modified file 'util/Makefile.am' --- util/Makefile.am 2013-11-11 10:13:08 +0000 +++ util/Makefile.am 2013-11-11 16:15:52 +0000 @@ -193,6 +193,8 @@ if ENABLE_TAP_OUTPUT LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh +else +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver endif TESTS = \
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
