diff options
| author | Adam Midvidy <amidvidy@gmail.com> | 2015-08-04 11:32:19 -0400 |
|---|---|---|
| committer | Adam Midvidy <amidvidy@gmail.com> | 2015-08-11 13:50:17 -0400 |
| commit | a56ea15c45ad9d705db01f2bd607a42a6f3875e9 (patch) | |
| tree | 695bf9c30e324379bf833cf1cd24e6689c364380 /SConstruct | |
| parent | 3f8b8b495fbe5303bb39dcd2ba5708275f482d2e (diff) | |
| download | mongo-a56ea15c45ad9d705db01f2bd607a42a6f3875e9.tar.gz | |
SERVER-19447 implement SCons support for CPP integration tests
- add evergreen tasks as well
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index c23a19762fb..26fcc887a3b 100644 --- a/SConstruct +++ b/SConstruct @@ -564,7 +564,13 @@ def decide_platform_tools(): def variable_tools_converter(val): tool_list = shlex.split(val) return tool_list + [ - "jsheader", "mergelib", "mongo_unittest", "textfile", "distsrc", "gziptool" + "distsrc", + "gziptool", + "jsheader", + "mergelib", + "mongo_integrationtest", + "mongo_unittest", + "textfile", ] def variable_distsrc_converter(val): @@ -811,6 +817,8 @@ envDict = dict(BUILD_ROOT=buildDir, # TODO: Move unittests.txt to $BUILD_DIR, but that requires # changes to MCI. UNITTEST_LIST='$BUILD_ROOT/unittests.txt', + INTEGRATION_TEST_ALIAS='integration_tests', + INTEGRATION_TEST_LIST='$BUILD_ROOT/integration_tests.txt', CONFIGUREDIR=sconsDataDir.Dir('sconf_temp'), CONFIGURELOG=sconsDataDir.File('config.log'), INSTALL_DIR=installDir, @@ -2457,4 +2465,4 @@ env.Alias("distsrc", "distsrc-tgz") env.SConscript('src/SConscript', variant_dir='$BUILD_DIR', duplicate=False) -env.Alias('all', ['core', 'tools', 'dbtest', 'unittests']) +env.Alias('all', ['core', 'tools', 'dbtest', 'unittests', 'integration_tests']) |