Repository: mesos Updated Branches: refs/heads/master 6648e327b -> 276b0dade
Fixed a bug in the test environment for disabling certain cgroups tests. Review: https://reviews.apache.org/r/23781 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/276b0dad Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/276b0dad Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/276b0dad Branch: refs/heads/master Commit: 276b0dadeba21202eaeb117ff1a77e3bd8162ac6 Parents: 6648e32 Author: Jie Yu <yujie....@gmail.com> Authored: Mon Jul 21 19:23:41 2014 -0700 Committer: Jie Yu <yujie....@gmail.com> Committed: Mon Jul 21 19:23:41 2014 -0700 ---------------------------------------------------------------------- src/tests/environment.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/276b0dad/src/tests/environment.cpp ---------------------------------------------------------------------- diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp index 434b3f7..551698f 100644 --- a/src/tests/environment.cpp +++ b/src/tests/environment.cpp @@ -94,7 +94,9 @@ static bool enable(const ::testing::TestInfo& test) if (strings::contains(name, "CGROUPS_")) { #ifdef __linux__ - return cgroups::enabled(); + if (!cgroups::enabled()) { + return false; + } #else return false; #endif
