You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2015/10/17 22:31:23 UTC
[2/2] mesos git commit: Libprocess: Added "tests" target for make.
Libprocess: Added "tests" target for make.
'make check' allows one to build and run the test suite. However,
'make tests' allows one to build the test suite without running it.
Review: https://reviews.apache.org/r/29550
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7ec7cef0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7ec7cef0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7ec7cef0
Branch: refs/heads/master
Commit: 7ec7cef0206f29a10baf975f7e366db2d2377bf3
Parents: 3c35a6b
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Fri Oct 16 08:55:47 2015 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Sat Oct 17 16:29:36 2015 -0400
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/Makefile.am | 4 +++-
3rdparty/libprocess/Makefile.am | 8 +++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7ec7cef0/3rdparty/libprocess/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/Makefile.am b/3rdparty/libprocess/3rdparty/Makefile.am
index e64e3d9..53e83d4 100644
--- a/3rdparty/libprocess/3rdparty/Makefile.am
+++ b/3rdparty/libprocess/3rdparty/Makefile.am
@@ -240,9 +240,11 @@ stout_tests_LDADD = \
# runner that ships with newer versions of autotools.
# See the following discussion for the workaround:
# http://lists.gnu.org/archive/html/automake/2013-01/msg00051.html
-check-local: stout-tests
+check-local: tests
./stout-tests
+tests: all stout-tests
+
# Dependencies for all-local.
ALL_LOCAL += $(STOUT)/Makefile
http://git-wip-us.apache.org/repos/asf/mesos/blob/7ec7cef0/3rdparty/libprocess/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/Makefile.am b/3rdparty/libprocess/Makefile.am
index eb73939..404a743 100644
--- a/3rdparty/libprocess/Makefile.am
+++ b/3rdparty/libprocess/Makefile.am
@@ -204,9 +204,15 @@ benchmarks_LDADD = \
# runner that ships with newer versions of autotools.
# See the following discussion for the workaround:
# http://lists.gnu.org/archive/html/automake/2013-01/msg00051.html
-check-local: libprocess-tests benchmarks
+check-local: tests
./libprocess-tests
+# Both libprocess-tests and benchmarks have a dependency on libgmock.la.
+3rdparty/libgmock.la:
+ @cd 3rdparty && $(MAKE) $(AM_MAKEFLAGS) tests
+
+tests: all libprocess-tests benchmarks
+
# TODO(benh): Fix shared builds (tests need libglog, libev, etc).
# Using LT_OUTPUT in configure.ac creates config.lt that doesn't get