Repository: mesos Updated Branches: refs/heads/master 7c11f31ed -> 8b93e9aaa
Fixed test namespace setter compilation exclusion on OSX. Review: https://reviews.apache.org/r/27395 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8b93e9aa Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8b93e9aa Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8b93e9aa Branch: refs/heads/master Commit: 8b93e9aaa3edd7fb1059d3e4bca9324d2e293b72 Parents: 7c11f31 Author: Till Toenshoff <[email protected]> Authored: Fri Oct 31 20:42:07 2014 +0100 Committer: Till Toenshoff <[email protected]> Committed: Fri Oct 31 20:42:07 2014 +0100 ---------------------------------------------------------------------- src/Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8b93e9aa/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index 374f284..2d72a70 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1154,10 +1154,12 @@ load_generator_framework_SOURCES = examples/load_generator_framework.cpp load_generator_framework_CPPFLAGS = $(MESOS_CPPFLAGS) load_generator_framework_LDADD = libmesos.la -check_PROGRAMS += setns-test-helper -setns_test_helper_SOURCES = tests/setns_test_helper.cpp -setns_test_helper_CPPFLAGS = $(MESOS_CPPFLAGS) -setns_test_helper_LDADD = libmesos.la +if OS_LINUX + check_PROGRAMS += setns-test-helper + setns_test_helper_SOURCES = tests/setns_test_helper.cpp + setns_test_helper_CPPFLAGS = $(MESOS_CPPFLAGS) + setns_test_helper_LDADD = libmesos.la +endif check_PROGRAMS += mesos-tests
