diff options
author | Mathew Robinson <chasinglogic@gmail.com> | 2019-07-10 14:07:30 -0400 |
---|---|---|
committer | Mathew Robinson <chasinglogic@gmail.com> | 2019-08-12 15:52:46 -0400 |
commit | 7a3751d58c5d46fb480f8a62420da55a165a2e59 (patch) | |
tree | 42721c12ea5be5680654d97318a22242de43c461 /SConstruct | |
parent | d41e5d199d056b19cc566b634bff1cdacbb86920 (diff) | |
download | mongo-7a3751d58c5d46fb480f8a62420da55a165a2e59.tar.gz |
SERVER-42048 Install and package jstests using SCons hygienic builds
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 37c33b31f74..be1c405285b 100644 --- a/SConstruct +++ b/SConstruct @@ -656,7 +656,7 @@ def variable_distsrc_converter(val): variables_files = variable_shlex_converter(get_option('variables-files')) for file in variables_files: - print(("Using variable customization file %s" % file)) + print("Using variable customization file {}".format(file)) env_vars = Variables( files=variables_files, @@ -4152,6 +4152,19 @@ env.SConscript( variant_dir='$BUILD_DIR', ) +# TODO: find a way to consolidate SConscript calls to one call in +# SConstruct so they all use variant_dir +env.SConscript( + dirs=[ + 'jstests', + ], + duplicate=False, + exports=[ + 'env', + ], +) + + allTargets = ['core', 'tools', 'unittests', 'integration_tests', 'benchmarks'] if not has_option('noshell') and usemozjs: |