diff options
| author | Etienne Petrel <etienne.petrel@mongodb.com> | 2022-06-21 23:16:05 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-06-21 23:44:39 +0000 |
| commit | 2abe0858f7c3365aa53bd67943b02cfcf579a15f (patch) | |
| tree | f7ff578448afebc302f3bf826811e1de879b79cc | |
| parent | 21974ef8e306e5d1b3ca510c40bc84f6a1438fd9 (diff) | |
| download | mongo-2abe0858f7c3365aa53bd67943b02cfcf579a15f.tar.gz | |
Import wiredtiger: 3fc284f1616134fae02adcc73288e95a06122899 from branch mongodb-master
ref: 943eaf798d..3fc284f161
for: 6.1.0-rc0
WT-9033 Improve error logging from cyclomatic test failures
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rwxr-xr-x | 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 # |