diff options
| -rw-r--r-- | SConscript.smoke | 2 | ||||
| -rwxr-xr-x | buildscripts/smoke.py | 4 | ||||
| -rw-r--r-- | jstests/slow1/large_role_chain.js (renamed from jstests/noPassthroughWithMongod/large_role_chain.js) | 0 | ||||
| -rw-r--r-- | jstests/slow1/memory.js (renamed from jstests/noPassthroughWithMongod/memory.js) | 0 | ||||
| -rw-r--r-- | jstests/slow1/replsets_priority1.js (renamed from jstests/noPassthroughWithMongod/replsets_priority1.js) | 0 | ||||
| -rw-r--r-- | jstests/slow1/sharding_multiple_collections.js (renamed from jstests/noPassthroughWithMongod/sharding_multiple_collections.js) | 0 | ||||
| -rwxr-xr-x | jstests/slow2/32bit.js (renamed from jstests/noPassthroughWithMongod/32bit.js) | 0 | ||||
| -rw-r--r-- | jstests/slow2/cursor_timeout.js (renamed from jstests/noPassthrough/cursor_timeout.js) | 0 | ||||
| -rw-r--r-- | jstests/slow2/dur_big_atomic_update.js (renamed from jstests/noPassthroughWithMongod/dur_big_atomic_update.js) | 0 | ||||
| -rw-r--r-- | jstests/slow2/mr_during_migrate.js (renamed from jstests/noPassthrough/mr_during_migrate.js) | 0 | ||||
| -rw-r--r-- | jstests/slow2/replsets_killop.js (renamed from jstests/noPassthroughWithMongod/replsets_killop.js) | 0 | ||||
| -rw-r--r-- | jstests/slow2/sharding_jscore_passthrough.js (renamed from jstests/noPassthroughWithMongod/sharding_jscore_passthrough.js) | 0 |
12 files changed, 6 insertions, 0 deletions
diff --git a/SConscript.smoke b/SConscript.smoke index 0123942baa9..ab233477cf2 100644 --- a/SConscript.smoke +++ b/SConscript.smoke @@ -88,6 +88,8 @@ if shellEnv is not None: addSmoketest( "smokeJsPerf", [ add_exe("mongo"), add_exe("mongod") ] ) addSmoketest( "smokeNoPassthroughWithMongod", [add_exe("mongo"), add_exe("mongod"), add_exe("mongos") ]) addSmoketest( "smokeNoPassthrough", [add_exe("mongo"), add_exe("mongod"), add_exe("mongos") ]) + addSmoketest( "smokeSlow1", [add_exe("mongo"), add_exe("mongod"), add_exe("mongos") ]) + addSmoketest( "smokeSlow2", [add_exe("mongo"), add_exe("mongod"), add_exe("mongos") ]) addSmoketest( "smokeQuota", [ add_exe("mongo"), add_exe("mongod") ] ) addSmoketest( "smokeTool", [ add_exe( "mongo" ), add_exe("mongod"), add_exe("mongos"), "tools" ] ) addSmoketest( "smokeAggregation", [ add_exe( "mongo" ), add_exe( "mongod" ), add_exe( "mongos" ) ] ) diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py index 9d34b6c62de..8acc0b33826 100755 --- a/buildscripts/smoke.py +++ b/buildscripts/smoke.py @@ -837,6 +837,8 @@ suiteGlobalConfig = {"js": ("core/*.js", True), "sslSpecial": ("sslSpecial/*.js", True), "jsCore": ("core/*.js", True), "gle": ("gle/*.js", True), + "slow1": ("slow1/*.js", True), + "slow2": ("slow2/*.js", True), } def get_module_suites(): @@ -909,6 +911,8 @@ def expand_suites(suites,expandUseDB=True): 'repl', 'auth', 'sharding', + 'slow1', + 'slow2', 'tool'], expandUseDB=expandUseDB) if suite == 'test': diff --git a/jstests/noPassthroughWithMongod/large_role_chain.js b/jstests/slow1/large_role_chain.js index 581db988be5..581db988be5 100644 --- a/jstests/noPassthroughWithMongod/large_role_chain.js +++ b/jstests/slow1/large_role_chain.js diff --git a/jstests/noPassthroughWithMongod/memory.js b/jstests/slow1/memory.js index 48265e77b31..48265e77b31 100644 --- a/jstests/noPassthroughWithMongod/memory.js +++ b/jstests/slow1/memory.js diff --git a/jstests/noPassthroughWithMongod/replsets_priority1.js b/jstests/slow1/replsets_priority1.js index 622331b311a..622331b311a 100644 --- a/jstests/noPassthroughWithMongod/replsets_priority1.js +++ b/jstests/slow1/replsets_priority1.js diff --git a/jstests/noPassthroughWithMongod/sharding_multiple_collections.js b/jstests/slow1/sharding_multiple_collections.js index 61d9911afca..61d9911afca 100644 --- a/jstests/noPassthroughWithMongod/sharding_multiple_collections.js +++ b/jstests/slow1/sharding_multiple_collections.js diff --git a/jstests/noPassthroughWithMongod/32bit.js b/jstests/slow2/32bit.js index d80cc7821c3..d80cc7821c3 100755 --- a/jstests/noPassthroughWithMongod/32bit.js +++ b/jstests/slow2/32bit.js diff --git a/jstests/noPassthrough/cursor_timeout.js b/jstests/slow2/cursor_timeout.js index 3e80e6c6fa7..3e80e6c6fa7 100644 --- a/jstests/noPassthrough/cursor_timeout.js +++ b/jstests/slow2/cursor_timeout.js diff --git a/jstests/noPassthroughWithMongod/dur_big_atomic_update.js b/jstests/slow2/dur_big_atomic_update.js index 18a7c4a68f2..18a7c4a68f2 100644 --- a/jstests/noPassthroughWithMongod/dur_big_atomic_update.js +++ b/jstests/slow2/dur_big_atomic_update.js diff --git a/jstests/noPassthrough/mr_during_migrate.js b/jstests/slow2/mr_during_migrate.js index 53ffd10fbec..53ffd10fbec 100644 --- a/jstests/noPassthrough/mr_during_migrate.js +++ b/jstests/slow2/mr_during_migrate.js diff --git a/jstests/noPassthroughWithMongod/replsets_killop.js b/jstests/slow2/replsets_killop.js index 3d3ee51f709..3d3ee51f709 100644 --- a/jstests/noPassthroughWithMongod/replsets_killop.js +++ b/jstests/slow2/replsets_killop.js diff --git a/jstests/noPassthroughWithMongod/sharding_jscore_passthrough.js b/jstests/slow2/sharding_jscore_passthrough.js index bbdddfc103e..bbdddfc103e 100644 --- a/jstests/noPassthroughWithMongod/sharding_jscore_passthrough.js +++ b/jstests/slow2/sharding_jscore_passthrough.js |