summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2021-02-16 16:11:08 +1100
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-02-16 05:36:05 +0000
commitb2b19a82e94957d0142658a90a80cf8bcc2beb58 (patch)
tree2e2c464bdbfe9cb3ff54ee9b8fbea187f3fafb65
parent69ace62fbb75081407de10e81c838228868579a2 (diff)
downloadmongo-b2b19a82e94957d0142658a90a80cf8bcc2beb58.tar.gz
Import wiredtiger: 5641affc867b1e150b2528471b4a876ea999b2e7 from branch mongodb-5.0
ref: 87e004aa88..5641affc86 for: 4.9.0 WT-7162 Removing c++ test frameworks for memory sanitizer testing
-rw-r--r--src/third_party/wiredtiger/import.data2
-rwxr-xr-xsrc/third_party/wiredtiger/test/evergreen.yml6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 624767ea14a..ab8faa77e69 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
"vendor": "wiredtiger",
"github": "wiredtiger/wiredtiger.git",
"branch": "mongodb-5.0",
- "commit": "87e004aa88066011b568709e49d209a63f0a9f97"
+ "commit": "5641affc867b1e150b2528471b4a876ea999b2e7"
}
diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml
index 4a27d88eb3c..cefc4b83e55 100755
--- a/src/third_party/wiredtiger/test/evergreen.yml
+++ b/src/third_party/wiredtiger/test/evergreen.yml
@@ -487,7 +487,8 @@ tasks:
- func: "get project"
- func: "compile wiredtiger"
vars:
- configure_env_vars: CC=/opt/mongodbtoolchain/v3/bin/clang CXX=/opt/mongodbtoolchain/v3/bin/clang++ PATH=/opt/mongodbtoolchain/v3/bin:$PATH CFLAGS="-fsanitize=memory -ggdb" CXXFLAGS="-fsanitize=memory -ggdb"
+ # We don't compile C++ for memory sanitized testing as it creates false positives
+ configure_env_vars: CC=/opt/mongodbtoolchain/v3/bin/clang CXX=skip PATH=/opt/mongodbtoolchain/v3/bin:$PATH CFLAGS="-fsanitize=memory -ggdb"
posix_configure_flags: --enable-silent-rules --enable-strict --enable-diagnostic --disable-static
- func: "upload artifact"
- func: "cleanup"
@@ -608,7 +609,8 @@ tasks:
dependent_task: compile-msan
- func: "compile wiredtiger"
vars:
- configure_env_vars: CC=/opt/mongodbtoolchain/v3/bin/clang CXX=/opt/mongodbtoolchain/v3/bin/clang++ PATH=/opt/mongodbtoolchain/v3/bin:$PATH CFLAGS="-fsanitize=memory -ggdb" CXXFLAGS="-fsanitize=memory -ggdb"
+ # We don't compile C++ for memory sanitized testing as it creates false positives
+ configure_env_vars: CC=/opt/mongodbtoolchain/v3/bin/clang CXX=skip PATH=/opt/mongodbtoolchain/v3/bin:$PATH CFLAGS="-fsanitize=memory -ggdb"
posix_configure_flags: --enable-silent-rules --enable-strict --enable-diagnostic --disable-static
- func: "make check all"
vars: