You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2017/09/06 17:48:22 UTC
mesos git commit: Fixed a compile issue on OSX.
Repository: mesos
Updated Branches:
refs/heads/master 07c9c27aa -> d29f57e23
Fixed a compile issue on OSX.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d29f57e2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d29f57e2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d29f57e2
Branch: refs/heads/master
Commit: d29f57e230d665721d4844ff66efa55c57de0f41
Parents: 07c9c27
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Sep 6 10:48:11 2017 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Sep 6 10:48:18 2017 -0700
----------------------------------------------------------------------
src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d29f57e2/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp b/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp
index 2bc9b08..b36c8df 100644
--- a/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp
+++ b/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp
@@ -28,7 +28,9 @@
#include "slave/containerizer/mesos/containerizer.hpp"
+#ifdef __linux__
#include "tests/containerizer/docker_archive.hpp"
+#endif
using std::map;
using std::string;
@@ -50,6 +52,7 @@ namespace tests {
class VolumeSandboxPathIsolatorTest : public MesosTest {};
+#ifdef __linux__
// This test verifies that a SANDBOX_PATH volume with SELF type is
// properly created in the container's sandbox and is properly mounted
// in the container's mount namespace.
@@ -104,6 +107,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, ROOT_SelfType)
EXPECT_SOME_EQ("abc\n", os::read(path::join(directory, "tmp", "file")));
}
+#endif // __linux__
// This test verifies that sandbox path volume allows two containers
@@ -209,6 +213,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, SharedParentTypeVolume)
}
+#ifdef __linux__
// This is a regression test for MESOS-5187. It is a ROOT test to
// simulate the scenario that the framework user is non-root while
// the agent process is root, to make sure that non-root user can
@@ -268,6 +273,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, ROOT_SelfTypeOwnership)
EXPECT_SOME_EQ("abc\n", os::read(path::join(directory, "tmp", "file")));
}
+#endif // __linux__
// This is a regression test for MESOS-7830. It is a ROOT test to