From 61959d3322c824f20cb2de46990b291293efe1f3 Mon Sep 17 00:00:00 2001
From: "Dmitry E. Oboukhov" <unera@debian.org>
Date: Tue, 19 Nov 2013 17:58:02 +0400
Subject: [PATCH] Add filter to pass tests under OpenVZ. #91
---
src/salloc.cc | 5 +++--
test/box/args.test | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/salloc.cc b/src/salloc.cc
index 4e91161f56..5eb51fca02 100644
--- a/src/salloc.cc
+++ b/src/salloc.cc
@@ -157,10 +157,11 @@ arena_init(struct arena *arena, size_t size)
int flags = MAP_SHARED | MAP_ANONYMOUS;
if (access("/proc/user_beancounters", F_OK) == 0) {
- say_warn("Don't use shared arena under OpenVZ");
+ say_warn("Disable shared arena since running under OpenVZ "
+ "(https://bugzilla.openvz.org/show_bug.cgi?id=2805)");
flags = MAP_PRIVATE | MAP_ANONYMOUS;
private_arena = true;
- }
+ }
arena->mmap_base = mmap(NULL, arena->mmap_size,
PROT_READ | PROT_WRITE, flags, -1, 0);
diff --git a/test/box/args.test b/test/box/args.test
index 46ae1175e4..8e7d546b51 100644
--- a/test/box/args.test
+++ b/test/box/args.test
@@ -31,6 +31,7 @@ os.unlink(cfg)
sys.stdout.pop_filter()
sys.stdout.push_filter("(\d)\.\d\.\d(-\d+-\w+)?", "\\1.minor.patch-<rev>-<commit>")
sys.stdout.push_filter("Target: .*", "Target: platform <build>")
+sys.stdout.push_filter(".*Disable shared arena since.*\n", "")
sys.stdout.push_filter("Build options: .*", "Build options: flags")
sys.stdout.push_filter("C_FLAGS:.*", "C_FLAGS: flags")
sys.stdout.push_filter("CXX_FLAGS:.*", "CXX_FLAGS: flags")
--
GitLab