diff options
| author | Andrew Morrow <acm@mongodb.com> | 2014-04-14 12:31:20 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2014-04-16 09:12:25 -0400 |
| commit | a475a70e90015e7db726343344c96446133ec9bf (patch) | |
| tree | 2e0178bf20881498827b3280fcc41a38261bf631 | |
| parent | 430cd62d0dfd6d29a9b4768422981c7cd9f1e334 (diff) | |
| download | mongo-a475a70e90015e7db726343344c96446133ec9bf.tar.gz | |
SERVER-13527 Eliminate unused module tests facility
| -rw-r--r-- | SConscript.smoke | 1 | ||||
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | site_scons/site_tools/unittest.py | 10 |
3 files changed, 2 insertions, 13 deletions
diff --git a/SConscript.smoke b/SConscript.smoke index ab233477cf2..582e88ff827 100644 --- a/SConscript.smoke +++ b/SConscript.smoke @@ -71,7 +71,6 @@ addSmoketest( "smokePerf", [ add_exe("perftest") ] ) addSmoketest( "mongosTest", [ add_exe( 'mongos' ) ]) addSmokeSuite( "smokeCppUnittests", "$UNITTEST_LIST" ) -addSmokeSuite( "smokeModuleTests", "$MODULETEST_LIST" ) # These tests require the mongo shell if shellEnv is not None: diff --git a/SConstruct b/SConstruct index fbb654de8d7..a591117bc42 100644 --- a/SConstruct +++ b/SConstruct @@ -407,8 +407,6 @@ env = Environment( BUILD_DIR=variantDir, MODULE_BANNERS=[], ARCHIVE_ADDITION_DIR_MAP={}, ARCHIVE_ADDITIONS=[], - MODULETEST_ALIAS='moduletests', - MODULETEST_LIST='#build/moduletests.txt', MSVS_ARCH=msarch , PYTHON=utils.find_python(), SERVER_ARCHIVE='${SERVER_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}', @@ -1693,4 +1691,4 @@ def clean_old_dist_builds(env, target, source): env.Alias("dist_clean", [], [clean_old_dist_builds]) env.AlwaysBuild("dist_clean") -env.Alias('all', ['core', 'tools', 'test', 'unittests', 'moduletests']) +env.Alias('all', ['core', 'tools', 'test', 'unittests']) diff --git a/site_scons/site_tools/unittest.py b/site_scons/site_tools/unittest.py index 886764e1b99..1615ba3f860 100644 --- a/site_scons/site_tools/unittest.py +++ b/site_scons/site_tools/unittest.py @@ -8,10 +8,6 @@ def register_unit_test(env, test): env._UnitTestList('$UNITTEST_LIST', test) env.Alias('$UNITTEST_ALIAS', test) -def register_module_test(env, test): - env._UnitTestList('$MODULETEST_LIST', test) - env.Alias('$MODULETEST_ALIAS', test) - def unit_test_list_builder_action(env, target, source): print "Generating " + str(target[0]) ofile = open(str(target[0]), 'wb') @@ -25,7 +21,7 @@ def unit_test_list_builder_action(env, target, source): def build_cpp_unit_test(env, target, source, **kwargs): libdeps = kwargs.get('LIBDEPS', []) libdeps.append( '$BUILD_DIR/mongo/unittest/unittest_main' ) - + includeCrutch = True if "NO_CRUTCH" in kwargs: includeCrutch = not kwargs["NO_CRUTCH"] @@ -47,8 +43,4 @@ def generate(env): env.Append(BUILDERS=dict(_UnitTestList=unit_test_list_builder)) env.AddMethod(register_unit_test, 'RegisterUnitTest') env.AddMethod(build_cpp_unit_test, 'CppUnitTest') - env.AddMethod(register_module_test, 'RegisterModuleTest') env.Alias('$UNITTEST_ALIAS', '$UNITTEST_LIST') - env.Alias('$MODULETEST_ALIAS', '$MODULETEST_LIST') - env.RegisterUnitTest([]) - env.RegisterModuleTest([]) |