summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron <aaron@10gen.com>2009-05-19 14:02:14 -0400
committerAaron <aaron@10gen.com>2009-05-19 14:02:14 -0400
commite3a697fbbf22db32f100bdca4020700cd38a2068 (patch)
treeb89fa76ad91ad5ab94732805f1f1ba56b3aba869
parent6173983255e301043694ffe53387669635a17287 (diff)
downloadmongo-e3a697fbbf22db32f100bdca4020700cd38a2068.tar.gz
make 'dummySmokeSideEffect' a side effect of startMongod so that when someone runs scons startMongod <smokeTest> the two targets won't be built in parallel
-rw-r--r--SConstruct5
1 files changed, 3 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index e2903a67fdd..28d87ffd2b5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -845,8 +845,8 @@ def startMongodForTests( env, target, source ):
from subprocess import Popen
mongodForTests = Popen( [ mongod[0].abspath, "--port", mongodForTestsPort, "--dbpath", dirName ] )
# Wait for mongod to start
- from time import sleep
- sleep( 2 )
+ import time
+ time.sleep( 2 )
if mongodForTests.poll() is not None:
print( "Failed to start mongod" )
mongodForTests = None
@@ -870,6 +870,7 @@ def stopMongodForTests():
testEnv.Alias( "startMongod", ["mongod"], [startMongodForTests] );
testEnv.AlwaysBuild( "startMongod" );
+testEnv.SideEffect( "dummySmokeSideEffect", "startMongod" )
def addMongodReqTargets( env, target, source ):
mongodReqTargets = [ "smokeClient", "smokeJs", "smokeQuota" ]