diff --git a/.evergreen/config_generator/components/funcs/install_valgrind.py b/.evergreen/config_generator/components/funcs/install_valgrind.py deleted file mode 100644 index 14baf123ad..0000000000 --- a/.evergreen/config_generator/components/funcs/install_valgrind.py +++ /dev/null @@ -1,46 +0,0 @@ -from config_generator.components.funcs.set_cache_dir import SetCacheDir - -from config_generator.etc.function import Function -from config_generator.etc.utils import bash_exec - -from shrub.v3.evg_command import EvgCommandType, expansions_update - - -class InstallValgrind(Function): - name = 'install-valgrind' - commands = SetCacheDir.commands + [ - bash_exec( - command_type=EvgCommandType.SETUP, - script='''\ - set -o errexit - set -o pipefail - - if [[ ! -n "${MONGO_CXX_DRIVER_CACHE_DIR}" ]]; then - echo "MONGO_CXX_DRIVER_CACHE_DIR is not defined!" 1>&2 - exit 1 - fi - - valgrind_install_dir="${MONGO_CXX_DRIVER_CACHE_DIR}/valgrind-3.24.0" - mkdir -p "$valgrind_install_dir" - - if ! command -v "$valgrind_install_dir/bin/valgrind" 2>/dev/null; then - env \\ - install_prefix="${MONGO_CXX_DRIVER_CACHE_DIR}/valgrind-3.24.0" \\ - mongo-cxx-driver/.evergreen/scripts/valgrind-installer.sh - fi - - PATH="$valgrind_install_dir/bin:$PATH" command -V valgrind - PATH="$valgrind_install_dir/bin:$PATH" valgrind --version - - printf "VALGRIND_INSTALL_DIR: %s\\n" "$valgrind_install_dir/bin" >|expansions.valgrind.yml - ''', - ), - expansions_update( - command_type=EvgCommandType.SETUP, - file='expansions.valgrind.yml', - ), - ] - - -def functions(): - return InstallValgrind.defn() diff --git a/.evergreen/config_generator/components/valgrind.py b/.evergreen/config_generator/components/valgrind.py index a2609c8fef..48140b8a0b 100644 --- a/.evergreen/config_generator/components/valgrind.py +++ b/.evergreen/config_generator/components/valgrind.py @@ -1,7 +1,6 @@ from config_generator.components.funcs.compile import Compile from config_generator.components.funcs.fetch_det import FetchDET from config_generator.components.funcs.install_c_driver import InstallCDriver -from config_generator.components.funcs.install_valgrind import InstallValgrind from config_generator.components.funcs.install_uv import InstallUV from config_generator.components.funcs.run_kms_servers import RunKMSServers from config_generator.components.funcs.setup import Setup @@ -68,7 +67,6 @@ def tasks(): commands += [ Setup.call(), - InstallValgrind.call(), StartMongod.call(mongodb_version=mongodb_version, topology=topology), InstallCDriver.call(vars=icd_vars), InstallUV.call(), diff --git a/.evergreen/generated_configs/functions.yml b/.evergreen/generated_configs/functions.yml index 41339470ca..eca87ea7d1 100644 --- a/.evergreen/generated_configs/functions.yml +++ b/.evergreen/generated_configs/functions.yml @@ -418,70 +418,6 @@ functions: type: setup params: file: expansions.uv.yml - install-valgrind: - - command: subprocess.exec - type: setup - params: - binary: bash - args: - - -c - - | - if [[ -n "$XDG_CACHE_DIR" ]]; then - cache_dir="$XDG_CACHE_DIR" # XDG Base Directory specification. - elif [[ -n "$LOCALAPPDATA" ]]; then - cache_dir="$LOCALAPPDATA" # Windows. - elif [[ -n "$USERPROFILE" ]]; then - cache_dir="$USERPROFILE/.cache" # Windows (fallback). - elif [[ -d "$HOME/Library/Caches" ]]; then - cache_dir="$HOME/Library/Caches" # MacOS. - elif [[ -n "$HOME" ]]; then - cache_dir="$HOME/.cache" # Linux-like. - elif [[ -d ~/.cache ]]; then - cache_dir="~/.cache" # Linux-like (fallback). - else - cache_dir="$(pwd)/.cache" # EVG task directory (fallback). - fi - - mkdir -p "$cache_dir/mongo-cxx-driver" || exit - cache_dir="$(cd "$cache_dir/mongo-cxx-driver" && pwd)" || exit - - printf "MONGO_CXX_DRIVER_CACHE_DIR: %s\n" "$cache_dir" >|expansions.set-cache-dir.yml - - command: expansions.update - type: setup - params: - file: expansions.set-cache-dir.yml - - command: subprocess.exec - type: setup - params: - binary: bash - args: - - -c - - | - set -o errexit - set -o pipefail - - if [[ ! -n "${MONGO_CXX_DRIVER_CACHE_DIR}" ]]; then - echo "MONGO_CXX_DRIVER_CACHE_DIR is not defined!" 1>&2 - exit 1 - fi - - valgrind_install_dir="${MONGO_CXX_DRIVER_CACHE_DIR}/valgrind-3.24.0" - mkdir -p "$valgrind_install_dir" - - if ! command -v "$valgrind_install_dir/bin/valgrind" 2>/dev/null; then - env \ - install_prefix="${MONGO_CXX_DRIVER_CACHE_DIR}/valgrind-3.24.0" \ - mongo-cxx-driver/.evergreen/scripts/valgrind-installer.sh - fi - - PATH="$valgrind_install_dir/bin:$PATH" command -V valgrind - PATH="$valgrind_install_dir/bin:$PATH" valgrind --version - - printf "VALGRIND_INSTALL_DIR: %s\n" "$valgrind_install_dir/bin" >|expansions.valgrind.yml - - command: expansions.update - type: setup - params: - file: expansions.valgrind.yml install_c_driver: - command: expansions.update type: setup diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 7e7ad400da..70a64d443d 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -15715,7 +15715,6 @@ tasks: updates: - { key: build_type, value: Debug } - func: setup - - func: install-valgrind - func: start_mongod vars: TOPOLOGY: replica_set @@ -15745,7 +15744,6 @@ tasks: updates: - { key: build_type, value: Debug } - func: setup - - func: install-valgrind - func: start_mongod vars: TOPOLOGY: sharded_cluster @@ -15775,7 +15773,6 @@ tasks: updates: - { key: build_type, value: Debug } - func: setup - - func: install-valgrind - func: start_mongod vars: mongodb_version: "4.0" @@ -15804,7 +15801,6 @@ tasks: updates: - { key: build_type, value: Debug } - func: setup - - func: install-valgrind - func: start_mongod vars: TOPOLOGY: replica_set @@ -15834,7 +15830,6 @@ tasks: updates: - { key: build_type, value: Debug } - func: setup - - func: install-valgrind - func: start_mongod vars: TOPOLOGY: sharded_cluster @@ -15864,7 +15859,6 @@ tasks: updates: - { key: build_type, value: Debug } - func: setup - - func: install-valgrind - func: start_mongod vars: mongodb_version: "8.0" @@ -15893,7 +15887,6 @@ tasks: updates: - { key: build_type, value: Debug } - func: setup - - func: install-valgrind - func: start_mongod vars: TOPOLOGY: replica_set @@ -15923,7 +15916,6 @@ tasks: updates: - { key: build_type, value: Debug } - func: setup - - func: install-valgrind - func: start_mongod vars: TOPOLOGY: sharded_cluster @@ -15953,7 +15945,6 @@ tasks: updates: - { key: build_type, value: Debug } - func: setup - - func: install-valgrind - func: start_mongod vars: mongodb_version: latest diff --git a/.evergreen/scripts/test.sh b/.evergreen/scripts/test.sh index ccd2c622cf..bc67fd8b6c 100755 --- a/.evergreen/scripts/test.sh +++ b/.evergreen/scripts/test.sh @@ -283,7 +283,7 @@ else export UBSAN_OPTIONS="print_stacktrace=1" export PATH="/opt/mongodbtoolchain/v4/bin:${PATH:-}" # llvm-symbolizer elif [[ "${TEST_WITH_VALGRIND:-}" == "ON" ]]; then - PATH="${VALGRIND_INSTALL_DIR:?}:${PATH:-}" + command -V valgrind valgrind --version run_test() { valgrind --leak-check=full --track-origins=yes --num-callers=50 --error-exitcode=1 --error-limit=no --read-var-info=yes --suppressions=../etc/memcheck.suppressions "$@" "${test_args[@]:?}" diff --git a/.evergreen/scripts/valgrind-installer.sh b/.evergreen/scripts/valgrind-installer.sh deleted file mode 100755 index 88f43aec2b..0000000000 --- a/.evergreen/scripts/valgrind-installer.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail - -: "${install_prefix:?}" - -cd "$(mktemp -d)" - -# https://valgrind.org/downloads/current.html -for _ in $(seq 5); do - curl -L -m 60 -o valgrind-3.24.0.tar.bz2 https://sourceware.org/pub/valgrind/valgrind-3.24.0.tar.bz2 && break -done -cat >checksum.txt <<<'6fc0470fedc0d85dae3e042297cabd13c6100749 *valgrind-3.24.0.tar.bz2' -sha1sum -c checksum.txt >/dev/null - -tar -xjf valgrind-3.24.0.tar.bz2 -cd valgrind-3.24.0 - -# https://valgrind.org/docs/manual/manual-core.html#manual-core.install -./configure --prefix "${install_prefix:?}" >/dev/null -make --no-print-directory -j "$(nproc)" >/dev/null -make --no-print-directory install >/dev/null