You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by id...@apache.org on 2016/12/03 00:37:02 UTC
[5/7] mesos git commit: Move isJailed for FreeBSD into utils.
Move isJailed for FreeBSD into utils.
Review: https://reviews.apache.org/r/53926/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/615c3fda
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/615c3fda
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/615c3fda
Branch: refs/heads/master
Commit: 615c3fda028d0be92badfe846c0f971ad178ff4f
Parents: 587b892
Author: David Forsythe <df...@gmail.com>
Authored: Fri Dec 2 16:34:33 2016 -0800
Committer: Ian Downes <id...@twitter.com>
Committed: Fri Dec 2 16:34:33 2016 -0800
----------------------------------------------------------------------
3rdparty/stout/include/stout/tests/utils.hpp | 19 +++++++++++++++++++
3rdparty/stout/tests/os_tests.cpp | 15 ---------------
2 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/615c3fda/3rdparty/stout/include/stout/tests/utils.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/tests/utils.hpp b/3rdparty/stout/include/stout/tests/utils.hpp
index 4e5359c..bfbaa01 100644
--- a/3rdparty/stout/include/stout/tests/utils.hpp
+++ b/3rdparty/stout/include/stout/tests/utils.hpp
@@ -25,6 +25,10 @@
#include <stout/os/mkdtemp.hpp>
#include <stout/os/rmdir.hpp>
+#if __FreeBSD__
+#include <stout/os/sysctl.hpp>
+#endif
+
class TemporaryDirectoryTest : public ::testing::Test
{
protected:
@@ -63,4 +67,19 @@ private:
std::string cwd;
};
+
+#ifdef __FreeBSD__
+inline bool isJailed() {
+ int mib[4];
+ size_t len = 4;
+ ::sysctlnametomib("security.jail.jailed", mib, &len);
+ Try<int> jailed = os::sysctl(mib[0], mib[1], mib[2]).integer();
+ if (jailed.isSome()) {
+ return jailed.get() == 1;
+ }
+
+ return false;
+}
+#endif
+
#endif // __STOUT_TESTS_UTILS_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/615c3fda/3rdparty/stout/tests/os_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/os_tests.cpp b/3rdparty/stout/tests/os_tests.cpp
index ad23ec0..d8ef9ea 100644
--- a/3rdparty/stout/tests/os_tests.cpp
+++ b/3rdparty/stout/tests/os_tests.cpp
@@ -67,21 +67,6 @@ using std::string;
using std::vector;
-#ifdef __FreeBSD__
-static bool isJailed() {
- int mib[4];
- size_t len = 4;
- ::sysctlnametomib("security.jail.jailed", mib, &len);
- Try<int> jailed = os::sysctl(mib[0], mib[1], mib[2]).integer();
- if (jailed.isSome()) {
- return jailed.get() == 1;
- }
-
- return false;
-}
-#endif
-
-
class OsTest : public TemporaryDirectoryTest {};