SERVER-13297 support both windows and posix path separators

Also removed legacy [!_] from js and jsCore globs.

1 files changed, 7 insertions, 5 deletions

diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index 01882fab49d..29c76bbb8cc 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -442,11 +442,13 @@ def skipTest(path):
 
     return False
 
+forceCommandsForSuite = ["aggregation", "replsets", "parallel", "core", "auth"]
+# look for jstests and one of the above suites separated by either posix or windows slashes
+forceCommandsRE = re.compile(r"jstests[/\\](%s)" % ('|'.join(forceCommandsForSuite)))
 def setShellWriteModeForTest(path, argv):
-    forceCommandsForSuite = ["aggregation", "replsets", "parallel", "core", "auth"]
-    swm = shell_write_mode;
+    swm = shell_write_mode
     if swm == "legacy": # change when the default changes to "commands"
-        if use_write_commands or any("jstests/" + s in path for s in forceCommandsForSuite):
+        if use_write_commands or forceCommandsRE.search(path):
             swm = "commands"
     argv += ["--writeMode", swm]
 
@@ -814,7 +816,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": ("core/[!_]*.js", True),
+suiteGlobalConfig = {"js": ("core/*.js", True),
                      "quota": ("quota/*.js", True),
                      "jsPerf": ("perf/*.js", True),
                      "disk": ("disk/*.js", True),
@@ -833,7 +835,7 @@ suiteGlobalConfig = {"js": ("core/[!_]*.js", True),
                      "failPoint": ("fail_point/*.js", False),
                      "ssl": ("ssl/*.js", True),
                      "sslSpecial": ("sslSpecial/*.js", True),
-                     "jsCore": ("core/[!_]*.js", True),
+                     "jsCore": ("core/*.js", True),
                      "gle": ("gle/*.js", True),
                      }