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 2017/02/28 22:35:41 UTC
[5/6] mesos git commit: CMake: Exclude tests from the default build.
CMake: Exclude tests from the default build.
Currently, if you run `make`, you will end up building the
`mesos-tests` binary because we do not exclude it from the default
build. This commit adds the `EXCLUDE_FROM_ALL` property to the
`mesos-tests` binary.
The `EXCLUDE_FROM_ALL` property is also added to the test helper
binary `test-helper` and all the test modules.
`make check` will still run the test.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/22644301
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/22644301
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/22644301
Branch: refs/heads/master
Commit: 22644301859cdff4156ca9aac991588e7dc76756
Parents: 68a4d89
Author: Joseph Wu <jo...@apache.org>
Authored: Tue Feb 28 14:22:31 2017 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Tue Feb 28 14:33:45 2017 -0800
----------------------------------------------------------------------
src/examples/CMakeLists.txt | 26 +++++++++++++-------------
src/tests/CMakeLists.txt | 4 ++--
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/22644301/src/examples/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index 6244a52..dfab1b4 100644
--- a/src/examples/CMakeLists.txt
+++ b/src/examples/CMakeLists.txt
@@ -53,19 +53,19 @@ set(TEST_HTTP_FRAMEWORK_SRC test_http_framework.cpp)
#########################
# NOTE: Modules are not supported on Windows.
if (NOT WIN32)
- add_library(${TEST_ALLOCATOR} SHARED ${TEST_ALLOCATOR_SRC})
- add_library(${TEST_ANONYMOUS} SHARED ${TEST_ANONYMOUS_SRC})
- add_library(${TEST_AUTHENTICATION} SHARED ${TEST_AUTHENTICATION_SRC})
- add_library(${TEST_AUTHORIZER} SHARED ${TEST_AUTHORIZER_SRC})
- add_library(${TEST_CONTAINER_LOGGER} SHARED ${TEST_CONTAINER_LOGGER_SRC})
- add_library(${TEST_EXAMPLEMODULE} SHARED ${TEST_EXAMPLEMODULE_SRC})
- add_library(${TEST_HOOK} SHARED ${TEST_HOOK_SRC})
- add_library(${TEST_HTTPAUTHENTICATOR} SHARED ${TEST_HTTPAUTHENTICATOR_SRC})
- add_library(${TEST_ISOLATOR} SHARED ${TEST_ISOLATOR_SRC})
- add_library(${TEST_MASTER_CONTENDER} SHARED ${TEST_MASTER_CONTENDER_SRC})
- add_library(${TEST_MASTER_DETECTOR} SHARED ${TEST_MASTER_DETECTOR_SRC})
- add_library(${TEST_QOS_CONTROLLER} SHARED ${TEST_QOS_CONTROLLER_SRC})
- add_library(${TEST_RESOURCE_ESTIMATOR} SHARED ${TEST_RESOURCE_ESTIMATOR_SRC})
+ add_library(${TEST_ALLOCATOR} SHARED EXCLUDE_FROM_ALL ${TEST_ALLOCATOR_SRC})
+ add_library(${TEST_ANONYMOUS} SHARED EXCLUDE_FROM_ALL ${TEST_ANONYMOUS_SRC})
+ add_library(${TEST_AUTHENTICATION} SHARED EXCLUDE_FROM_ALL ${TEST_AUTHENTICATION_SRC})
+ add_library(${TEST_AUTHORIZER} SHARED EXCLUDE_FROM_ALL ${TEST_AUTHORIZER_SRC})
+ add_library(${TEST_CONTAINER_LOGGER} SHARED EXCLUDE_FROM_ALL ${TEST_CONTAINER_LOGGER_SRC})
+ add_library(${TEST_EXAMPLEMODULE} SHARED EXCLUDE_FROM_ALL ${TEST_EXAMPLEMODULE_SRC})
+ add_library(${TEST_HOOK} SHARED EXCLUDE_FROM_ALL ${TEST_HOOK_SRC})
+ add_library(${TEST_HTTPAUTHENTICATOR} SHARED EXCLUDE_FROM_ALL ${TEST_HTTPAUTHENTICATOR_SRC})
+ add_library(${TEST_ISOLATOR} SHARED EXCLUDE_FROM_ALL ${TEST_ISOLATOR_SRC})
+ add_library(${TEST_MASTER_CONTENDER} SHARED EXCLUDE_FROM_ALL ${TEST_MASTER_CONTENDER_SRC})
+ add_library(${TEST_MASTER_DETECTOR} SHARED EXCLUDE_FROM_ALL ${TEST_MASTER_DETECTOR_SRC})
+ add_library(${TEST_QOS_CONTROLLER} SHARED EXCLUDE_FROM_ALL ${TEST_QOS_CONTROLLER_SRC})
+ add_library(${TEST_RESOURCE_ESTIMATOR} SHARED EXCLUDE_FROM_ALL ${TEST_RESOURCE_ESTIMATOR_SRC})
endif (NOT WIN32)
http://git-wip-us.apache.org/repos/asf/mesos/blob/22644301/src/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 3b08bb4..fd72b6f 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -237,8 +237,8 @@ link_directories(${MESOS_TESTS_LIB_DIRS})
# THE TEST AND HELPER EXECUTABLEs (generates, e.g., stout-tests, etc., on Linux).
#################################$###############################################
-add_executable(${MESOS_TESTS_TARGET} ${MESOS_TESTS_SRC})
-add_executable(${TEST_HELPER_TARGET} ${TEST_HELPER_SRC})
+add_executable(${MESOS_TESTS_TARGET} EXCLUDE_FROM_ALL ${MESOS_TESTS_SRC})
+add_executable(${TEST_HELPER_TARGET} EXCLUDE_FROM_ALL ${TEST_HELPER_SRC})
# ADD LINKER FLAGS (generates, e.g., -lglog on Linux).
######################################################