SERVER-13297: enable core suite for commands and add scons smokeJsCore test

(cherry picked from commit 01a5355e051de90c93a5f1784c05ed314c797c7a)

1 files changed, 3 insertions, 3 deletions

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),