aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@yahooinc.com>2023-08-21 23:50:17 +0200
committerGitHub <noreply@github.com>2023-08-21 23:50:17 +0200
commit14f78d0376bbfc84b1ca13bb57558cbc9eadba48 (patch)
treeea22f974efac24afe69fc5d1a96ee8f369729e86
parent071cd4b9fbf12460d55fab089e7a9bc416b01d7b (diff)
parent362cd47c808d1dfde6778e90f0ca51ceacd117a7 (diff)
Merge pull request #28101 from vespa-engine/toregge/disable-two-alloc-unit-tests-when-using-any-sanitizer
Disable two alloc unit tests when using any sanitizer.
-rw-r--r--vespalib/src/tests/alloc/alloc_test.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/vespalib/src/tests/alloc/alloc_test.cpp b/vespalib/src/tests/alloc/alloc_test.cpp
index 04e009fcf8a..f39543daa2d 100644
--- a/vespalib/src/tests/alloc/alloc_test.cpp
+++ b/vespalib/src/tests/alloc/alloc_test.cpp
@@ -1,11 +1,11 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+#include <vespa/config.h>
#include <vespa/vespalib/testkit/testapp.h>
#include <vespa/vespalib/util/alloc.h>
#include <vespa/vespalib/util/memory_allocator.h>
#include <vespa/vespalib/util/exceptions.h>
#include <vespa/vespalib/util/round_up_to_page_size.h>
-#include <vespa/vespalib/util/sanitizers.h>
#include <vespa/vespalib/util/size_literals.h>
#include <cstddef>
#include <sys/mman.h>
@@ -216,12 +216,12 @@ TEST("auto alloced mmap alloc can not be extended if no room") {
}
/*
- * The two following tests are disabled when address sanitizer is
+ * The two following tests are disabled when any sanitizer is
* enabled since extra instrumentation code might trigger extra mmap
* or munmap calls, breaking some of the assumptions in the disabled
* tests.
*/
-#ifndef VESPA_USE_ADDRESS_SANITIZER
+#ifndef VESPA_USE_SANITIZER
TEST("mmap alloc can be extended if room") {
Alloc dummy = Alloc::allocMMap(100);
Alloc reserved = Alloc::allocMMap(100);