summaryrefslogtreecommitdiff
path: root/SConscript.smoke
diff options
context:
space:
mode:
authorDan Crosta <dcrosta@10gen.com>2012-02-24 08:00:56 -0500
committerDan Crosta <dcrosta@10gen.com>2012-02-24 08:00:56 -0500
commitbbace48501659fb35dd9c3764dbefc4601c4a90d (patch)
treea5e337952e3539de425a504e974c09b2b53c8af9 /SConscript.smoke
parentd603bf761880e88872f56ff5f3001cf832b4f1f3 (diff)
downloadmongo-bbace48501659fb35dd9c3764dbefc4601c4a90d.tar.gz
BUILDBOT-95: need AlwaysBuild and SideEffect for recent failures
Diffstat (limited to 'SConscript.smoke')
-rw-r--r--SConscript.smoke8
1 files changed, 4 insertions, 4 deletions
diff --git a/SConscript.smoke b/SConscript.smoke
index a4e0de32db9..f6aee470f26 100644
--- a/SConscript.smoke
+++ b/SConscript.smoke
@@ -34,7 +34,7 @@ def addTest(name, deps, actions):
# Prevent smoke tests from running in parallel
smokeEnv.SideEffect( "dummySmokeSideEffect", name )
-def addSmoketest( name, deps ):
+def addSmoketest( name, deps, extraSmokeArgs=[] ):
# Convert from smoke to test, smokeJs to js, and foo to foo
target = name
if name.startswith("smoke"):
@@ -43,7 +43,7 @@ def addSmoketest( name, deps ):
else:
target = name[5].lower() + name[6:]
- smokeArgs = smokeFlags + [target]
+ smokeArgs = smokeFlags + [target] + extraSmokeArgs
addTest(name, deps, utils.run_smoke_command(*smokeArgs))
addSmoketest( "smoke", [ add_exe( "test" ), add_exe( "mongod" ), add_exe( "mongo" ) ] )
@@ -78,8 +78,8 @@ if shellEnv is not None:
addSmoketest( "smokeTool", [ add_exe( "mongo" ), add_exe("mongod"), add_exe("mongos"), "tools" ] )
addSmoketest( "smokeAggregation", [ add_exe( "mongo" ), add_exe( "mongod" ) ] )
- smokeEnv.Alias( "smokeFailingTests", [ add_exe( "mongo" ), add_exe( "mongod" ) ], utils.run_smoke_command('--only-old-fails', '--continue-on-failure') )
- smokeEnv.Alias( "smokeResetFails", [ add_exe( "mongo" ), add_exe( "mongod" ) ], utils.run_smoke_command('--reset-old-fails') )
+ addSmoketest( "smokeFailingTests", [ add_exe( "mongo" ), add_exe( "mongod" ) ], ['--only-old-fails', '--continue-on-failure'] )
+ addSmoketest( "smokeResetFails", [ add_exe( "mongo" ), add_exe( "mongod" ) ], ['--reset-old-fails'] )
# Note: although the test running logic has been moved to
# buildscripts/smoke.py, the interface to running the tests has been