summaryrefslogtreecommitdiff
path: root/site_scons
diff options
context:
space:
mode:
authorDaniel Moody <daniel.moody@mongodb.com>2020-11-06 07:58:47 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-11-12 05:21:52 +0000
commit84a7bc6af3f79a5e441cb037ed37395fabfc5f99 (patch)
tree331da3cad11d7367e9063f085c7554b8a0b1416e /site_scons
parent96ffd109258a2495cde69d984a34116933928f45 (diff)
downloadmongo-84a7bc6af3f79a5e441cb037ed37395fabfc5f99.tar.gz
SERVER-25822 added callback to support preventing given components from linking together
Diffstat (limited to 'site_scons')
-rw-r--r--site_scons/site_tools/mongo_benchmark.py2
-rw-r--r--site_scons/site_tools/mongo_integrationtest.py2
-rw-r--r--site_scons/site_tools/mongo_libfuzzer.py2
-rw-r--r--site_scons/site_tools/mongo_unittest.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/site_scons/site_tools/mongo_benchmark.py b/site_scons/site_tools/mongo_benchmark.py
index 1f862c16465..5fe35b038d3 100644
--- a/site_scons/site_tools/mongo_benchmark.py
+++ b/site_scons/site_tools/mongo_benchmark.py
@@ -58,7 +58,7 @@ def build_benchmark(env, target, source, **kwargs):
benchmark_test_components
)
- kwargs["AIB_COMPONENTS_EXTRA"] = benchmark_test_components
+ kwargs["AIB_COMPONENTS_EXTRA"] = list(benchmark_test_components)
result = bmEnv.Program(target, source, **kwargs)
bmEnv.RegisterTest("$BENCHMARK_LIST", result[0])
diff --git a/site_scons/site_tools/mongo_integrationtest.py b/site_scons/site_tools/mongo_integrationtest.py
index 5e74a077c61..9bd5146ac50 100644
--- a/site_scons/site_tools/mongo_integrationtest.py
+++ b/site_scons/site_tools/mongo_integrationtest.py
@@ -52,7 +52,7 @@ def build_cpp_integration_test(env, target, source, **kwargs):
integration_test_components
)
else:
- kwargs["AIB_COMPONENTS_EXTRA"] = integration_test_components
+ kwargs["AIB_COMPONENTS_EXTRA"] = list(integration_test_components)
result = env.Program(target, source, **kwargs)
env.RegisterTest("$INTEGRATION_TEST_LIST", result[0])
diff --git a/site_scons/site_tools/mongo_libfuzzer.py b/site_scons/site_tools/mongo_libfuzzer.py
index 8b4a176ff5d..3f15032ca56 100644
--- a/site_scons/site_tools/mongo_libfuzzer.py
+++ b/site_scons/site_tools/mongo_libfuzzer.py
@@ -58,7 +58,7 @@ def build_cpp_libfuzzer_test(env, target, source, **kwargs):
libfuzzer_test_components
)
- kwargs["AIB_COMPONENTS_EXTRA"] = libfuzzer_test_components
+ kwargs["AIB_COMPONENTS_EXTRA"] = list(libfuzzer_test_components)
result = myenv.Program(target, source, **kwargs)
myenv.RegisterTest("$LIBFUZZER_TEST_LIST", result[0])
diff --git a/site_scons/site_tools/mongo_unittest.py b/site_scons/site_tools/mongo_unittest.py
index 5a165926bb7..33373282606 100644
--- a/site_scons/site_tools/mongo_unittest.py
+++ b/site_scons/site_tools/mongo_unittest.py
@@ -57,7 +57,7 @@ def build_cpp_unit_test(env, target, source, **kwargs):
unit_test_components
)
else:
- kwargs["AIB_COMPONENTS_EXTRA"] = unit_test_components
+ kwargs["AIB_COMPONENTS_EXTRA"] = list(unit_test_components)
result = env.Program(target, source, **kwargs)
env.RegisterTest("$UNITTEST_LIST", result[0])