Skip to content

CXX-3180 add mingw-w64 GCC task coverage #1536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eramongodb merged 11 commits into from
Dec 11, 2025
Merged

CXX-3180 add mingw-w64 GCC task coverage #1536

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
483e509
Pin libmongocrypt to 6528eb5c on Windows for mingw-w64 GCC
eramongodb Dec 8, 2025
3a3ea73
Extend example and test CMake max policy to 4.99
eramongodb Dec 8, 2025
98ff957
Remove unused vs_ver EVG distro property
eramongodb Dec 8, 2025
81c7fe6
Add support for compiling with mingw-w64 GCC (winlibs)
eramongodb Dec 8, 2025
8ff490d
Use `-Wa,-mbig-obj` as mingw-w64 GCC equivalent to MSVC `/bigobj`
eramongodb Dec 8, 2025
97d3a70
Reuse CMake environment variables to configure example projects
eramongodb Dec 8, 2025
5f5f53b
Tweak test info message format
eramongodb Dec 8, 2025
d02c1df
CXX-3180 add mingw-w64 GCC task coverage
eramongodb Dec 8, 2025
3b7e0db
Merge remote-tracking branch 'upstream/master' into HEAD
eramongodb Dec 11, 2025
fb23d9c
Report mongoc install directory rather than source directory
eramongodb Dec 11, 2025
b0aec38
Exclude CSFLE test coverage with mingw-w64 GCC
eramongodb Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .evergreen/config_generator/components/funcs/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ class Test(Function):
name = 'test'
commands = bash_exec(
command_type=EvgCommandType.TEST,
env={
'CC': '${cc_compiler}',
'CXX': '${cxx_compiler}',
},
include_expansions_in_env=[
'ASAN_SYMBOLIZER_PATH',
'build_type',
Expand All @@ -24,15 +28,13 @@ class Test(Function):
'cse_gcp_privatekey',
'disable_slow_tests',
'distro_id',
'example_projects_cc',
'example_projects_cxx',
'example_projects_cxx_standard',
'example_projects_cxxflags',
'example_projects_ldflags',
'generator',
'MONGOCXX_TEST_TOPOLOGY',
'MONGODB_API_VERSION',
'platform',
'REQUIRED_CXX_STANDARD',
'TEST_WITH_ASAN',
'TEST_WITH_CSFLE',
'TEST_WITH_UBSAN',
Expand All @@ -41,10 +43,6 @@ class Test(Function):
'USE_STATIC_LIBS',
'VALGRIND_INSTALL_DIR',
],
env={
'CC': '${cc_compiler}',
'CXX': '${cxx_compiler}',
},
working_dir='mongo-cxx-driver',
script='.evergreen/scripts/test.sh',
)
Expand Down
11 changes: 3 additions & 8 deletions .evergreen/config_generator/components/integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
WINDOWS_MATRIX = [
# Windows x86_64 (min-max-latest).
# Windows x86_64: 4.2+.
('windows-vsCurrent', 'vs2022x64', ['Debug'], ['shared'], [11, 17], [None], ['plain', 'csfle'], ['4.2', '8.0', 'latest'], ['single', 'replica', 'sharded']),
('windows-vsCurrent', 'vs2022x64', ['Debug'], ['shared'], [11, 17], [None], ['plain', 'csfle'], ['4.2', '8.0', 'latest'], ['single', 'replica', 'sharded']),
('windows-2022-latest', 'gcc', ['Debug'], ['shared'], [11, 17], [None], ['plain', 'csfle'], ['4.2', '8.0', 'latest'], ['single', 'replica', 'sharded']),
Copy link
Collaborator

@kevinAlbs kevinAlbs Dec 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Finally, there is a consistent and ongoing EVG task failure for CSFLE tests with server 4.2 with mingw-w64 GCC

The "connection refused" makes me think this is a failure to connect over TCP. Idea: this may be from mongocryptd failing to spawn (maybe related to the form of MONGOCRYPTD_PATH?). But I am not sure why that would be specific to version 4.2.

Regardless: I think csfle on MinGW test coverage can be added in the future (I expect it may be more valuable testing in the C driver, since the platform specific CSFLE code is likely limited to the C driver + libmongocrypt).

]

MONGOCRYPTD_MATRIX = [
Expand Down Expand Up @@ -126,9 +127,6 @@ def tasks():
updates += [KeyValueParam(key='build_type', value=build_type)]
updates += [KeyValueParam(key=key, value=value) for key, value in compiler_to_vars(compiler).items()]

if distro.os_type == 'windows':
test_vars |= {'example_projects_cxx_standard': 17}

if build_type == 'Debug' and distro.os in ['ubuntu2204', 'ubuntu2404']:
updates += [KeyValueParam(key='ENABLE_CODE_COVERAGE', value='ON')]

Expand All @@ -138,10 +136,7 @@ def tasks():

if cxx_standard is not None:
compile_vars |= {'REQUIRED_CXX_STANDARD': cxx_standard}
test_vars |= {
'example_projects_cxx_standard': cxx_standard,
'REQUIRED_CXX_STANDARD': cxx_standard,
}
test_vars |= {'REQUIRED_CXX_STANDARD': cxx_standard}

commands = [expansions_update(updates=updates)] if updates else []
commands += [
Expand Down
2 changes: 0 additions & 2 deletions .evergreen/config_generator/components/sanitizers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ def tasks():
'ASAN_SYMBOLIZER_PATH': '/opt/mongodbtoolchain/v4/bin/llvm-symbolizer',
'TEST_WITH_CSFLE': 'ON',
'MONGOCXX_TEST_TOPOLOGY': topology,
'example_projects_cc': cc_compiler,
'example_projects_cxx': cxx_compiler,
}

if link_type == 'static':
Expand Down
3 changes: 0 additions & 3 deletions .evergreen/config_generator/components/versioned_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ def tasks():
compile_vars = {'ENABLE_TESTS': 'ON'}
test_vars |= {'MONGOCXX_TEST_TOPOLOGY': 'single'}

if distro.os_type == 'windows':
test_vars |= {'example_projects_cxx_standard': 17}

res.append(
EvgTask(
name=name,
Expand Down
16 changes: 2 additions & 14 deletions .evergreen/config_generator/etc/distros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class Distro(BaseModel):
* os: Name of the operating system.
* os_type: One of Linux, MacOS, or Windows.
* os_ver: Version of the operating system.
* vs_ver: Version of Visual Studio available.
* size: Size of tasks the distro is designed to handle.
* arch: Target architecture.
"""
Expand All @@ -21,18 +20,6 @@ class Distro(BaseModel):
os: str | None = None
os_type: Literal['linux', 'macos', 'windows'] | None = None
os_ver: str | None = None
vs_ver: (
Literal[
'2015',
'2017',
'2019',
'2022',
'vsCurrent',
'vsCurrent2',
'vsMulti',
]
| None
) = None
size: Literal['small', 'large'] | None = None
arch: Literal['arm64', 'power8', 'zseries'] | None = None

Expand Down Expand Up @@ -100,7 +87,8 @@ def ls_distro(name, **kwargs):
]

WINDOWS_DISTROS = [
*ls_distro(name='windows-vsCurrent', os='windows', os_type='windows', vs_ver='vsCurrent'),
*ls_distro(name='windows-vsCurrent', os='windows', os_type='windows'),
*ls_distro(name='windows-2022-latest', os='windows', os_type='windows'),
]

# See: https://evergreen.mongodb.com/distros
Expand Down
4 changes: 1 addition & 3 deletions .evergreen/generated_configs/functions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,15 +553,13 @@ functions:
- cse_gcp_privatekey
- disable_slow_tests
- distro_id
- example_projects_cc
- example_projects_cxx
- example_projects_cxx_standard
- example_projects_cxxflags
- example_projects_ldflags
- generator
- MONGOCXX_TEST_TOPOLOGY
- MONGODB_API_VERSION
- platform
- REQUIRED_CXX_STANDARD
- TEST_WITH_ASAN
- TEST_WITH_CSFLE
- TEST_WITH_UBSAN
Expand Down
Loading