From 45a74a94e557e4baeebbbebf2bb4c25f07ce5c4d Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Mon, 13 Jul 2026 09:42:33 -0500 Subject: [PATCH 1/2] Do not invoke `ctest` when `BUILD_TESTING=OFF` --- .evergreen/build_all.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.evergreen/build_all.sh b/.evergreen/build_all.sh index e1c180b89..11badd495 100755 --- a/.evergreen/build_all.sh +++ b/.evergreen/build_all.sh @@ -115,7 +115,7 @@ if [[ "$release_os_arch" == *glibc* ]]; then echo "glibc version check passed: $actual_glibc" fi -run_chdir "$BINARY_DIR" ctest +is_true "$BUILD_TESTING" && run_chdir "$BINARY_DIR" ctest # MONGOCRYPT-372, ensure macOS universal builds contain both x86_64 and arm64 architectures. if test "${CMAKE_OSX_ARCHITECTURES-}" != ''; then @@ -145,7 +145,7 @@ _cmake_with_env "${cmake_args[@]}" \ -DCMAKE_INSTALL_PREFIX="$MONGOCRYPT_INSTALL_PREFIX/nocrypto" \ -B "$BINARY_DIR" -S "$LIBMONGOCRYPT_DIR" _cmake_with_env --build "$BINARY_DIR" --target install -run_chdir "$BINARY_DIR" ctest +is_true "$BUILD_TESTING" && run_chdir "$BINARY_DIR" ctest # Build and install libmongocrypt without statically linking libbson _cmake_with_env "${cmake_args[@]}" \ @@ -153,4 +153,4 @@ _cmake_with_env "${cmake_args[@]}" \ -DCMAKE_INSTALL_PREFIX="$MONGOCRYPT_INSTALL_PREFIX/sharedbson" \ -B "$BINARY_DIR" -S "$LIBMONGOCRYPT_DIR" _cmake_with_env --build "$BINARY_DIR" --target install -run_chdir "$BINARY_DIR" ctest +is_true "$BUILD_TESTING" && run_chdir "$BINARY_DIR" ctest From ebdbb5a07fcdf6625dea97f35b6cdda8a6b718f3 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Mon, 13 Jul 2026 09:58:29 -0500 Subject: [PATCH 2/2] Fix arguments to `is_true` helper --- .evergreen/build_all.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.evergreen/build_all.sh b/.evergreen/build_all.sh index 11badd495..b3f57654e 100755 --- a/.evergreen/build_all.sh +++ b/.evergreen/build_all.sh @@ -115,7 +115,7 @@ if [[ "$release_os_arch" == *glibc* ]]; then echo "glibc version check passed: $actual_glibc" fi -is_true "$BUILD_TESTING" && run_chdir "$BINARY_DIR" ctest +is_true BUILD_TESTING && run_chdir "$BINARY_DIR" ctest # MONGOCRYPT-372, ensure macOS universal builds contain both x86_64 and arm64 architectures. if test "${CMAKE_OSX_ARCHITECTURES-}" != ''; then @@ -145,7 +145,7 @@ _cmake_with_env "${cmake_args[@]}" \ -DCMAKE_INSTALL_PREFIX="$MONGOCRYPT_INSTALL_PREFIX/nocrypto" \ -B "$BINARY_DIR" -S "$LIBMONGOCRYPT_DIR" _cmake_with_env --build "$BINARY_DIR" --target install -is_true "$BUILD_TESTING" && run_chdir "$BINARY_DIR" ctest +is_true BUILD_TESTING && run_chdir "$BINARY_DIR" ctest # Build and install libmongocrypt without statically linking libbson _cmake_with_env "${cmake_args[@]}" \ @@ -153,4 +153,4 @@ _cmake_with_env "${cmake_args[@]}" \ -DCMAKE_INSTALL_PREFIX="$MONGOCRYPT_INSTALL_PREFIX/sharedbson" \ -B "$BINARY_DIR" -S "$LIBMONGOCRYPT_DIR" _cmake_with_env --build "$BINARY_DIR" --target install -is_true "$BUILD_TESTING" && run_chdir "$BINARY_DIR" ctest +is_true BUILD_TESTING && run_chdir "$BINARY_DIR" ctest