[1/2] mesos git commit: Made stout's tests a phony target.

[ka...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master fa976c22a -> c1cdb8141


Made stout's tests a phony target.

Since the stout root folder contains a folder `tests/` so the automake
build target `tests` conflicts with that one. This leads to the
`tests` target not being built unless a user executes:

    % make check

Make `tests` a phony target to avoid the name conflict.

Review: https://reviews.apache.org/r/52676/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f638df28
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f638df28
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f638df28

Branch: refs/heads/master
Commit: f638df2854e407c47910f61ac8cbaab5bb3ae62e
Parents: fa976c2
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Thu Oct 13 14:21:42 2016 -0400
Committer: Kapil Arya <ka...@mesosphere.io>
Committed: Thu Oct 13 14:21:42 2016 -0400

----------------------------------------------------------------------
 3rdparty/stout/Makefile.am | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/f638df28/3rdparty/stout/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/stout/Makefile.am b/3rdparty/stout/Makefile.am
index e70d301..4e10ae2 100644
--- a/3rdparty/stout/Makefile.am
+++ b/3rdparty/stout/Makefile.am
@@ -27,6 +27,8 @@ endif
 # the header files during installation.
 SUBDIRS = $(MAYBE_3RDPARTY) . include
 
+PHONY_TARGETS =
+
 include ../versions.am
 
 BOOST = $(BUNDLED_DIR)/boost-$(BOOST_VERSION)
@@ -193,6 +195,8 @@ check-local: tests
 tests: $(BUNDLED_DEPS)
 	$(MAKE) $(AM_MAKEFLAGS) stout-tests
 
+PHONY_TARGETS += tests
+
 all-local: Makefile
 
 EXTRA_DIST = $(stout_tests_SOURCES)
@@ -213,3 +217,5 @@ dist-hook:
 if !STANDALONE_STOUT
 	cp -r $(srcdir)/3rdparty $(distdir)/
 endif
+
+.PHONY: $(PHONY_TARGETS)

[2/2] mesos git commit: Added all test dependencies to libprocess' tests target.

[ka...@apache.org]

Added all test dependencies to libprocess' tests target.

We rely on some additional tools beyond the currently listed being
present. Since they are already listed in `check_PROGRAMS` to make
`make check` work, just reuse that variable here instead of expanding
the full list by hand.

Review: https://reviews.apache.org/r/52677/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c1cdb814
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c1cdb814
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c1cdb814

Branch: refs/heads/master
Commit: c1cdb8141a714a0a761421d3b67036f5da9f9e78
Parents: f638df2
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Thu Oct 13 15:34:10 2016 -0400
Committer: Kapil Arya <ka...@mesosphere.io>
Committed: Thu Oct 13 15:34:10 2016 -0400

----------------------------------------------------------------------
 3rdparty/libprocess/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/c1cdb814/3rdparty/libprocess/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/Makefile.am b/3rdparty/libprocess/Makefile.am
index f91155b..7131989 100644
--- a/3rdparty/libprocess/Makefile.am
+++ b/3rdparty/libprocess/Makefile.am
@@ -307,7 +307,7 @@ check-local: tests
 	$(TEST_DRIVER) ./libprocess-tests
 
 tests: all $(BUNDLED_DEPS)
-	$(MAKE) $(AM_MAKEFLAGS) libprocess-tests benchmarks
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 
 # TODO(benh): Fix shared builds (tests need libglog, libev, etc).