diff options
| -rw-r--r-- | SConscript.smoke | 1 | ||||
| -rwxr-xr-x | buildscripts/smoke.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/SConscript.smoke b/SConscript.smoke index 723fcc25a48..d8615daf4ef 100644 --- a/SConscript.smoke +++ b/SConscript.smoke @@ -76,6 +76,7 @@ addSmokeSuite( "smokeModuleTests", "$MODULETEST_LIST" ) # These tests require the mongo shell if shellEnv is not None: addSmoketest( "smokeJs", [add_exe("mongo"), add_exe("mongod")] ) + addSmoketest( "smokeJsCore", [add_exe("mongo"), add_exe("mongod")] ) addSmoketest( "smokeClone", [ add_exe("mongo"), add_exe("mongod") ] ) addSmoketest( "smokeRepl", [ add_exe("mongo"), add_exe("mongod"), add_exe("mongobridge") ] ) addSmoketest( "smokeReplSets", [ add_exe("mongo"), add_exe("mongod"), add_exe("mongobridge") ] ) diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py index df6819063d6..ba9e9f55d00 100755 --- a/buildscripts/smoke.py +++ b/buildscripts/smoke.py @@ -443,10 +443,10 @@ def skipTest(path): return False def setShellWriteModeForTest(path, argv): - forceCommandsForSuite = ["aggregation", "replsets", "parallel"] + forceCommandsForSuite = ["aggregation", "replsets", "parallel", "core"] swm = shell_write_mode; if swm == "legacy": # change when the default changes to "commands" - if use_write_commands or [s for s in forceCommandsForSuite if s in path]: + if use_write_commands or any("jstests/" + s in path for s in forceCommandsForSuite): swm = "commands" argv += ["--writeMode", swm] @@ -814,7 +814,7 @@ def report(): # Keys are the suite names (passed on the command line to smoke.py) # Values are pairs: (filenames, <start mongod before running tests>) -suiteGlobalConfig = {"js": ("[!_]*.js", True), +suiteGlobalConfig = {"js": ("core/[!_]*.js", True), "quota": ("quota/*.js", True), "jsPerf": ("perf/*.js", True), "disk": ("disk/*.js", True), |