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 2016/08/01 20:29:08 UTC
[2/6] mesos git commit: CMake: Added `setns` and `active-user` test
helper binaries.
CMake: Added `setns` and `active-user` test helper binaries.
These binaries are required for `NsTest.ROOT_setns` and
`SlaveTest.ROOT_RunTaskWithCommandInfoWithoutUser`.
Review: https://reviews.apache.org/r/50064/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7dbc74ef
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7dbc74ef
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7dbc74ef
Branch: refs/heads/master
Commit: 7dbc74efaea3e4ec185bfbd0c503a61ac2a5f1e1
Parents: ca5eaad
Author: Srinivas Brahmaroutu <sr...@us.ibm.com>
Authored: Thu Jul 28 12:37:19 2016 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Aug 1 13:12:03 2016 -0700
----------------------------------------------------------------------
src/tests/CMakeLists.txt | 11 +++++++++++
src/tests/cmake/MesosTestsConfigure.cmake | 15 ++++++++++++++-
src/tests/containerizer/CMakeLists.txt | 20 ++++++++++++++++++++
3 files changed, 45 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7dbc74ef/src/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 3c53063..26defa0 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -16,5 +16,16 @@
include(MesosTestsConfigure)
+######################
+set(ACTIVE_USER_TEST_HELPER_SRC
+ ${ACTIVE_USER_TEST_HELPER_SRC}
+ active_user_test_helper.cpp
+ )
+
add_subdirectory(containerizer/)
+
# TODO(hausdorff): Add the other tests here.
+
+# THE TEST AND HELPER EXECUTABLEs (generates, e.g., stout_tests, etc., on Linux).
+#################################$###############################################
+add_executable(${ACTIVE_USER_TEST_HELPER_TARGET} ${ACTIVE_USER_TEST_HELPER_SRC})
http://git-wip-us.apache.org/repos/asf/mesos/blob/7dbc74ef/src/tests/cmake/MesosTestsConfigure.cmake
----------------------------------------------------------------------
diff --git a/src/tests/cmake/MesosTestsConfigure.cmake b/src/tests/cmake/MesosTestsConfigure.cmake
index caecce1..3610320 100644
--- a/src/tests/cmake/MesosTestsConfigure.cmake
+++ b/src/tests/cmake/MesosTestsConfigure.cmake
@@ -16,7 +16,20 @@
set(
CONTAINERIZER_MEMORY_TESTS_TARGET mesos-containerizer-memory_test
- CACHE STRING "Target we use to refer to tests for mesos containerizer tests")
+ CACHE STRING "Target we use to refer to tests for mesos containerizer tests"
+ )
+
+set(
+ ACTIVE_USER_TEST_HELPER_TARGET active-user-test-helper
+ CACHE STRING "Test helper target required to run tests with a user."
+ )
+
+if (LINUX)
+ set(
+ SETNS_TEST_HELPER_TARGET setns-test-helper
+ CACHE STRING "Test helper target that allows changing the test to its parent namespace."
+ )
+endif (LINUX)
# COMPILER CONFIGURATION.
#########################
http://git-wip-us.apache.org/repos/asf/mesos/blob/7dbc74ef/src/tests/containerizer/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/CMakeLists.txt b/src/tests/containerizer/CMakeLists.txt
index 41e792a..2c52e43 100644
--- a/src/tests/containerizer/CMakeLists.txt
+++ b/src/tests/containerizer/CMakeLists.txt
@@ -24,6 +24,14 @@ set(CONTAINERIZER_MEMORY_TESTS_SRC
memory_test_helper.cpp
)
+if (LINUX)
+ set(SETNS_TEST_HELPER_SRC
+ ${SETNS_TEST_HELPER_SRC}
+ setns_test_helper_main.cpp
+ setns_test_helper.cpp
+ )
+endif (LINUX)
+
# INCLUDE DIRECTIVES FOR CONTAINERIZER TEST BINARY (generates, e.g., -I/path/to/thing
# on Linux).
#############################################################################
@@ -38,14 +46,26 @@ link_directories(${CONTAINERIZER_TEST_LIB_DIRS})
###########################################################################
add_executable(${CONTAINERIZER_MEMORY_TESTS_TARGET} ${CONTAINERIZER_MEMORY_TESTS_SRC})
+if (LINUX)
+ add_executable(${SETNS_TEST_HELPER_TARGET} ${SETNS_TEST_HELPER_SRC})
+endif (LINUX)
+
# ADD LINKER FLAGS (generates, e.g., -lglog on Linux).
######################################################
target_link_libraries(${CONTAINERIZER_MEMORY_TESTS_TARGET} ${CONTAINERIZER_TEST_LIBS})
+if (LINUX)
+ target_link_libraries(${SETNS_TEST_HELPER_TARGET} ${CONTAINERIZER_TEST_LIBS})
+endif (LINUX)
+
# ADD BINARY DEPENDENCIES (tells CMake what to compile/build first).
####################################################################
add_dependencies(${CONTAINERIZER_MEMORY_TESTS_TARGET} ${CONTAINERIZER_TEST_DEPENDENCIES})
+if (LINUX)
+ add_dependencies(${SETNS_TEST_HELPER_TARGET} ${CONTAINERIZER_TEST_DEPENDENCIES})
+endif (LINUX)
+
# ADD TEST TARGET (runs when you do, e.g., `make check`).
#########################################################
add_test(NAME MesosContainerizerMemoryTests COMMAND ${CMAKE_BINARY_DIR}/src/${CONTAINERIZER_MEMORY_TESTS_TARGET})