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/01/28 02:16:06 UTC
[11/11] mesos git commit: Fixed test build on OSX.
Fixed test build on OSX.
A refactoring in https://reviews.apache.org/r/53790/
moved the implementation of `LinuxRootFs` into a `.cpp` file,
built only on Linux. A single health_check_test and the
`volume_image_isolator_tests` used to pull in this symbol
via the `DockerArchive` object.
This commit moves the `rootfs.cpp` file into a Linux-guarded
section in the autotools build; moves `volume_image_isolator_tests`
into a Linux-guarded section in both builds; and #ifdef's the
`HealthCheckTest.ROOT_HealthyTaskWithContainerImage` test.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2d0195ee
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2d0195ee
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2d0195ee
Branch: refs/heads/master
Commit: 2d0195eed54feac41485fb1503dc4004e5500c81
Parents: 5b8b907
Author: Joseph Wu <jo...@apache.org>
Authored: Fri Jan 27 17:51:35 2017 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Fri Jan 27 18:15:42 2017 -0800
----------------------------------------------------------------------
src/Makefile.am | 6 +++---
src/tests/CMakeLists.txt | 2 +-
src/tests/health_check_tests.cpp | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2d0195ee/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 1382299..6c9be54 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2298,8 +2298,6 @@ mesos_tests_SOURCES = \
tests/containerizer/provisioner_backend_tests.cpp \
tests/containerizer/provisioner_docker_tests.cpp \
tests/containerizer/provisioner_paths_tests.cpp \
- tests/containerizer/rootfs.cpp \
- tests/containerizer/volume_image_isolator_tests.cpp \
tests/containerizer/volume_sandbox_path_isolator_tests.cpp
if ENABLE_XFS_DISK_ISOLATOR
@@ -2348,9 +2346,11 @@ mesos_tests_SOURCES += \
tests/containerizer/ns_tests.cpp \
tests/containerizer/nvidia_gpu_isolator_tests.cpp \
tests/containerizer/perf_tests.cpp \
+ tests/containerizer/rootfs.cpp \
tests/containerizer/runtime_isolator_tests.cpp \
tests/containerizer/sched_tests.cpp \
- tests/containerizer/setns_test_helper.cpp
+ tests/containerizer/setns_test_helper.cpp \
+ tests/containerizer/volume_image_isolator_tests.cpp
endif
if WITH_NETWORK_ISOLATOR
http://git-wip-us.apache.org/repos/asf/mesos/blob/2d0195ee/src/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 6e6ecb1..44b74ee 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -195,7 +195,6 @@ if (NOT WIN32)
containerizer/provisioner_backend_tests.cpp
containerizer/provisioner_docker_tests.cpp
containerizer/provisioner_paths_tests.cpp
- containerizer/volume_image_isolator_tests.cpp
containerizer/volume_sandbox_path_isolator_tests.cpp
)
endif (NOT WIN32)
@@ -220,6 +219,7 @@ if (LINUX)
containerizer/rootfs.cpp
containerizer/runtime_isolator_tests.cpp
containerizer/sched_tests.cpp
+ containerizer/volume_image_isolator_tests.cpp
)
endif (LINUX)
http://git-wip-us.apache.org/repos/asf/mesos/blob/2d0195ee/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index debbd3c..710cb66 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -354,6 +354,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(HealthCheckTest, HealthyTask)
}
+#ifdef __linux__
// This test creates a healthy task with a container image using mesos
// containerizer and verifies that the healthy status is reported to the
// scheduler and is reflected in the state endpoints of both the master
@@ -470,6 +471,7 @@ TEST_F(HealthCheckTest, ROOT_HealthyTaskWithContainerImage)
driver.stop();
driver.join();
}
+#endif // __linux__
// This test creates a healthy task using the Docker executor and