From 2abe0858f7c3365aa53bd67943b02cfcf579a15f Mon Sep 17 00:00:00 2001
From: Etienne Petrel <etienne.petrel@mongodb.com>
Date: Tue, 21 Jun 2022 23:16:05 +0000
Subject: Import wiredtiger: 3fc284f1616134fae02adcc73288e95a06122899 from
 branch mongodb-master

ref: 943eaf798d..3fc284f161
for: 6.1.0-rc0

WT-9033       Improve error logging from cyclomatic test failures
---
 src/third_party/wiredtiger/import.data        |  2 +-
 src/third_party/wiredtiger/test/evergreen.yml | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 96b70744daf..869276528e5 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-master",
-    "commit": "943eaf798d4ac2bf6f393326e9827e8fce0db572"
+    "commit": "3fc284f1616134fae02adcc73288e95a06122899"
 }
diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml
index ed086b341e0..bc2011a7604 100755
--- a/src/third_party/wiredtiger/test/evergreen.yml
+++ b/src/third_party/wiredtiger/test/evergreen.yml
@@ -2998,6 +2998,7 @@ tasks:
           working_dir: "wiredtiger"
           shell: bash
           script: |
+            t=__wt.$$
             set -o verbose
 
             # Install Metrix++, ensuring it is outside the 'src' directory
@@ -3013,8 +3014,14 @@ tasks:
             python "../metrixplusplus/metrix++.py" limit --max-limit=std.code.complexity:cyclomatic:20
 
             # Fail if there are functions with cyclomatic complexity larger than 91
-            set -o errexit
-            python "../metrixplusplus/metrix++.py" limit --max-limit=std.code.complexity:cyclomatic:91
+            python "../metrixplusplus/metrix++.py" limit --max-limit=std.code.complexity:cyclomatic:91 > $t
+            if grep -q 'exceeds' $t; then 
+                echo "[ERROR]:complexity:cyclomatic: Complexity limit exceeded."
+                cat $t
+                echo "[ERROR]:complexity:cyclomatic: Finished " && rm $t && exit 1
+            else
+                cat $t && rm $t 
+            fi
 
     #############################
     # Performance Tests for lsm #
-- 
cgit v1.2.1