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:22 UTC

[1/2] mesos git commit: Added "tests" target for make.

Repository: mesos
Updated Branches:
  refs/heads/master 3c35a6b20 -> 65917d9c6


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/29551


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

Branch: refs/heads/master
Commit: 65917d9c61539b97f287bdf7c2330aa47bd4815f
Parents: 7ec7cef
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Fri Oct 16 08:55:56 2015 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Sat Oct 17 16:29:36 2015 -0400

----------------------------------------------------------------------
 3rdparty/Makefile.am       | 3 +++
 Makefile.am                | 3 +++
 docs/submitting-a-patch.md | 3 ++-
 src/Makefile.am            | 4 +++-
 4 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/65917d9c/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index 7c244a0..3782583 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -117,3 +117,6 @@ all-local: $(ALL_LOCAL)
 clean-local:
 	rm -r -f $(CLEAN_EXTRACTED)
 	rm -f *-stamp
+
+tests: all
+	@cd libprocess && $(MAKE) $(AM_MAKEFLAGS) tests

http://git-wip-us.apache.org/repos/asf/mesos/blob/65917d9c/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index cb289b4..d9604f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,6 +78,9 @@ bench: all
 
 PHONY_TARGETS += bench
 
+tests: all
+	@cd 3rdparty && $(MAKE) $(AM_MAKEFLAGS) tests
+	@cd src && $(MAKE) $(AM_MAKEFLAGS) tests
 
 # Using LT_OUTPUT in configure.ac creates config.lt that doesn't get
 # cleaned up by distclean-libtool. See this bug patch (which doesn't

http://git-wip-us.apache.org/repos/asf/mesos/blob/65917d9c/docs/submitting-a-patch.md
----------------------------------------------------------------------
diff --git a/docs/submitting-a-patch.md b/docs/submitting-a-patch.md
index cbd99fe..a7aee3f 100644
--- a/docs/submitting-a-patch.md
+++ b/docs/submitting-a-patch.md
@@ -43,7 +43,8 @@ layout: documentation
         4. Now all of the files generated by the build process will be contained in the build directory you created, instead of being spread throughout the src directory, which is a bit messier. This is both cleaner, and makes it easy to clean up if you want to get rid of the files generated by `configure` and `make`. I.e. You can reset your build process without risking changes you made in the src directory, by simply deleting the build directory, and creating a new one.
 
 3. Make sure that all of the unit tests pass, including the new test cases you have added: `make check`.
-    1. To execute a single unit test (helpful when trying to debug a test case failure), use something like: `make check GTEST_FILTER="HTTPTest.Delete"`.
+    1. To build all tests without executing them, use something like: `make tests`.
+    2. To execute a single unit test (helpful when trying to debug a test case failure), use something like: `make check GTEST_FILTER="HTTPTest.Delete"`.
 
 4. Make sure to pull in any changes that have been committed to master branch. Using Git, do this via something like:
     1. `git checkout master`

http://git-wip-us.apache.org/repos/asf/mesos/blob/65917d9c/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 8523832..0dc9112 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1885,9 +1885,11 @@ dist_check_SCRIPTS +=							\
 # 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: mesos-tests
+check-local: tests
 	./mesos-tests
 
 clean-local: clean-java clean-python
 
+tests: all $(check_PROGRAMS) mesos-tests
+
 .PHONY: $(PHONY_TARGETS)


[2/2] mesos git commit: Libprocess: Added "tests" target for make.

Posted by jo...@apache.org.
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