diff options
author | Mathias Stearn <mathias@10gen.com> | 2014-03-26 15:43:53 -0400 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2014-03-26 15:58:49 -0400 |
commit | 7595193acb6a4d67e84a960ae4b45dd4743bd1aa (patch) | |
tree | 1fb85a0f7d570574cb913b1676521d9ccfaeb34e | |
parent | 6d3cacf2bd81f2d818cbf5809bda9adb0a64f536 (diff) | |
download | mongo-7595193acb6a4d67e84a960ae4b45dd4743bd1aa.tar.gz |
SERVER-13297 support both windows and posix path separators
Also removed legacy [!_] from js and jsCore globs.
(cherry picked from commit ed7c1769b534245f0bd10512c4b4a5995065a371)
-rwxr-xr-x | buildscripts/smoke.py | 12 |
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), } |