Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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' ], ['4.2', '8.0', 'latest'], ['single', 'replica', 'sharded']),
]

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
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
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
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
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