Skip to content

Commit b6bf0a1

Browse files
authored
CXX-3179 Set ENABLE_TESTS=OFF by default (#1266)
1 parent 6f77257 commit b6bf0a1

File tree

15 files changed

+205
-34
lines changed

15 files changed

+205
-34
lines changed

.evergreen/config_generator/components/atlas_search_indexes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def tasks():
5555
run_on=distro.name,
5656
commands=[
5757
InstallCDriver.call(),
58-
Compile.call(build_type='Debug'),
58+
Compile.call(build_type='Debug', vars={'ENABLE_TESTS': 'ON'}),
5959
TestSearchIndexHelpers.call(),
6060
],
6161
)

.evergreen/config_generator/components/compile_only.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ def generate_tasks():
6969
build_type=build_type,
7070
compiler=compiler,
7171
polyfill=polyfill,
72-
vars={'ENABLE_TESTS': 'OFF'}
7372
)
7473
],
7574
)

.evergreen/config_generator/components/integration.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,16 @@ def tasks():
105105
distro = find_large_distro(distro_name)
106106

107107
updates = []
108-
icd_vars = {'BSON_EXTRA_ALIGNMENT': 1} if with_extra_align else {}
109-
compile_vars = {'BSON_EXTRA_ALIGNMENT': 1} if with_extra_align else {'RUN_DISTCHECK': 1}
108+
icd_vars = {}
109+
compile_vars = {'ENABLE_TESTS': 'ON'}
110110
test_vars = {'MONGOCXX_TEST_TOPOLOGY': topology}
111111

112+
if with_extra_align:
113+
icd_vars |= {'BSON_EXTRA_ALIGNMENT': 1}
114+
compile_vars |= {'BSON_EXTRA_ALIGNMENT': 1}
115+
else:
116+
compile_vars |= {'RUN_DISTCHECK': 1}
117+
112118
updates += [KeyValueParam(key='build_type', value=build_type)]
113119
updates += [KeyValueParam(key=key, value=value) for key, value in compiler_to_vars(compiler).items()]
114120

.evergreen/config_generator/components/mongohouse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def tasks():
7272
commands=[
7373
Setup.call(),
7474
FetchCDriverSource.call(),
75-
Compile.call(build_type='Release'),
75+
Compile.call(build_type='Release', vars={'ENABLE_TESTS': 'ON'}),
7676
BuildMongohouse.call(),
7777
RunMongohouse.call(),
7878
TestMongohouse.call(),

.evergreen/config_generator/components/sanitizers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def tasks():
6262
updates += [KeyValueParam(key=key, value=value) for key, value in compiler_to_vars(compiler).items()]
6363

6464
icd_vars = {'SKIP_INSTALL_LIBMONGOCRYPT': 1}
65-
compile_vars = {}
65+
compile_vars = {'ENABLE_TESTS': 'ON'}
6666
test_vars = {
6767
'MONGOCXX_TEST_TOPOLOGY': topology,
6868
'example_projects_cc': 'clang',

.evergreen/config_generator/components/uninstall_check.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ def tasks():
6868
Compile.call(
6969
build_type=build_type,
7070
compiler=compiler,
71-
vars={'ENABLE_TESTS': 'OFF'},
7271
),
7372
UninstallCheck.call(),
7473
],

.evergreen/config_generator/components/valgrind.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def tasks():
5555

5656
updates = [KeyValueParam(key='build_type', value='Debug')]
5757
icd_vars = {'SKIP_INSTALL_LIBMONGOCRYPT': 1}
58-
compile_vars = {}
58+
compile_vars = {'ENABLE_TESTS': 'ON'}
5959
test_vars = {
6060
'MONGOCXX_TEST_TOPOLOGY': topology,
6161
'TEST_WITH_VALGRIND': 'ON',

.evergreen/config_generator/components/versioned_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def tasks():
6363
tags.append(polyfill)
6464

6565
mongod_vars |= {'AUTH': 'noauth'} # Versioned API + auth is tested by the C Driver.
66-
compile_vars = {}
66+
compile_vars = {'ENABLE_TESTS': 'ON'}
6767
test_vars |= {'MONGOCXX_TEST_TOPOLOGY': 'single'}
6868

6969
match distro.os_type:

0 commit comments

Comments
 (0)