Repository: mesos Updated Branches: refs/heads/master fa44b0a9f -> 3fc81ce92
Correct include of linux/ns.hpp in isolator tests. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3fc81ce9 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3fc81ce9 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3fc81ce9 Branch: refs/heads/master Commit: 3fc81ce92983bf8b0b5069ad805c706f568aa3aa Parents: fa44b0a Author: Ian Downes <[email protected]> Authored: Tue Oct 28 14:03:26 2014 -0700 Committer: Ian Downes <[email protected]> Committed: Tue Oct 28 14:21:03 2014 -0700 ---------------------------------------------------------------------- src/tests/isolator_tests.cpp | 6 ++++-- src/tests/ns_tests.cpp | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/3fc81ce9/src/tests/isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/isolator_tests.cpp b/src/tests/isolator_tests.cpp index 04a2ca7..4d03f46 100644 --- a/src/tests/isolator_tests.cpp +++ b/src/tests/isolator_tests.cpp @@ -35,7 +35,9 @@ #include <stout/os.hpp> #include <stout/path.hpp> -#include <stout/os/namespaces.hpp> +#ifdef __linux__ +#include "linux/ns.hpp" +#endif // __linux__ #include "master/master.hpp" #include "master/detector.hpp" @@ -976,7 +978,7 @@ TEST_F(NamespacesPidIsolatorTest, ROOT_PidNamespace) EXPECT_EQ(0, wait.get().status()); // Check that the command was run in a different pid namespace. - Try<ino_t> testPidNamespace = os::getns(::getpid(), "pid"); + Try<ino_t> testPidNamespace = ns::getns(::getpid(), "pid"); ASSERT_SOME(testPidNamespace); Try<string> containerPidNamespace = os::read(path::join(directory, "ns")); http://git-wip-us.apache.org/repos/asf/mesos/blob/3fc81ce9/src/tests/ns_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/ns_tests.cpp b/src/tests/ns_tests.cpp index eb385d0..872009f 100644 --- a/src/tests/ns_tests.cpp +++ b/src/tests/ns_tests.cpp @@ -39,7 +39,6 @@ #include "linux/ns.hpp" #include "tests/flags.hpp" -#include "tests/ns_tests.hpp" using namespace mesos::internal;
