Merge pull request #1467 from psgreco/master-fix-msan-mac

Fix MSAN and MACOS native tests
This commit is contained in:
Tom Trevethan 2025-06-23 18:38:18 +01:00 committed by GitHub
commit 956797f24a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 3575 additions and 3 deletions

View file

@ -58,7 +58,8 @@ macos_native_task_template: &MACOS_NATIVE_TASK_TEMPLATE
check_clang_script:
- clang --version
brew_install_script:
- brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
- brew install boost@1.85 libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
- brew link --force --overwrite boost@1.85
<< : *MAIN_TEMPLATE
compute_credits_template: &CREDITS_TEMPLATE

View file

@ -11,7 +11,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
fi
if [ "$CI_OS_NAME" == "macos" ]; then
sudo -H pip3 install --upgrade pip
sudo -H pip3 install --upgrade --break-system-packages pip
# shellcheck disable=SC2086
IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
fi

1702
contrib/bdb4_config/config.guess vendored Executable file

File diff suppressed because it is too large Load diff

1864
contrib/bdb4_config/config.sub vendored Executable file

File diff suppressed because it is too large Load diff

View file

@ -20,6 +20,7 @@ expand_path() {
cd "${1}" && pwd -P
}
CONTRIB_BASEDIR="$(dirname "$(readlink -f "${0}")")"
BDB_PREFIX="$(expand_path "${1}")/db4"; shift;
BDB_VERSION='db-4.8.30.NC'
BDB_HASH='12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef'
@ -238,6 +239,10 @@ CONFIG_SUB_HASH='3969f7d5f6967ccc6f792401b8ef3916a1d1b1d0f0de5a4e354c95addb8b800
rm -f "dist/config.guess"
rm -f "dist/config.sub"
# git.savannah.gnu.org is extremely slow, provide a local copy of the files
cp -fp "${CONTRIB_BASEDIR}/bdb4_config/config.guess" dist/config.guess
cp -fp "${CONTRIB_BASEDIR}/bdb4_config/config.sub" dist/config.sub
http_get "${CONFIG_GUESS_URL}" dist/config.guess "${CONFIG_GUESS_HASH}"
http_get "${CONFIG_SUB_URL}" dist/config.sub "${CONFIG_SUB_HASH}"

View file

@ -15,7 +15,7 @@ if ! command -v codespell > /dev/null; then
fi
IGNORE_WORDS_FILE=test/lint/lint-spelling.ignore-words.txt
mapfile -t FILES < <(git ls-files -- ":(exclude)build-aux/m4/" ":(exclude)contrib/seeds/*.txt" ":(exclude)depends/" ":(exclude)doc/release-notes/" ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/qt/locale/" ":(exclude)src/qt/*.qrc" ":(exclude)src/secp256k1/" ":(exclude)src/minisketch/" ":(exclude)src/univalue/" ":(exclude)contrib/builder-keys/keys.txt" ":(exclude)contrib/guix/patches") ":(exclude)src/simplicity/"
mapfile -t FILES < <(git ls-files -- ":(exclude)build-aux/m4/" ":(exclude)contrib/seeds/*.txt" ":(exclude)depends/" ":(exclude)doc/release-notes/" ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/qt/locale/" ":(exclude)src/qt/*.qrc" ":(exclude)src/secp256k1/" ":(exclude)src/minisketch/" ":(exclude)src/univalue/" ":(exclude)contrib/builder-keys/keys.txt" ":(exclude)contrib/guix/patches" ":(exclude)contrib/bdb4_config") ":(exclude)src/simplicity/"
if ! codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=${IGNORE_WORDS_FILE} "${FILES[@]}"; then
echo "^ Warning: codespell identified likely spelling errors. Any false positives? Add them to the list of ignored words in ${IGNORE_WORDS_FILE}"
fi