diff options
| author | Mathias Stearn <mathias@10gen.com> | 2010-02-23 14:52:45 -0500 |
|---|---|---|
| committer | Mathias Stearn <mathias@10gen.com> | 2010-02-23 14:52:45 -0500 |
| commit | 90f5b501f2f43dd88d550ee7039be4d989aa1b4c (patch) | |
| tree | 874b4fcf704632da1f4127434412dce1d0ce339d | |
| parent | 67f8e660585d3beac8abb73cf7b596a1efe5ce33 (diff) | |
| download | mongo-90f5b501f2f43dd88d550ee7039be4d989aa1b4c.tar.gz | |
Do globing in SConstruct (1.2 branch)
| -rw-r--r-- | SConstruct | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct index a79048d9b55..0484dc11687 100644 --- a/SConstruct +++ b/SConstruct @@ -1080,7 +1080,8 @@ def jsSpec( suffix ): return apply( os.path.join, args ) def jsDirTestSpec( dir ): - return mongo[0].abspath + " --nodb " + jsSpec( [ dir, "*.js" ] ) + tests = Glob( jsSpec( [ dir, "*.js" ] ) ) + return [ mongo[0].abspath + " --nodb " + test.abspath for test in tests ] def runShellTest( env, target, source ): global mongodForTestsPort @@ -1102,14 +1103,14 @@ def runShellTest( env, target, source ): # These tests require the mongo shell if not onlyServer and not noshell: addSmoketest( "smokeJs", [add_exe("mongo")], runShellTest ) - addSmoketest( "smokeClone", [ "mongo", "mongod" ], [ jsDirTestSpec( "clone" ) ] ) - addSmoketest( "smokeRepl", [ "mongo", "mongod", "mongobridge" ], [ jsDirTestSpec( "repl" ) ] ) - addSmoketest( "smokeDisk", [ add_exe( "mongo" ), add_exe( "mongod" ) ], [ jsDirTestSpec( "disk" ) ] ) - addSmoketest( "smokeAuth", [ add_exe( "mongo" ), add_exe( "mongod" ) ], [ jsDirTestSpec( "auth" ) ] ) - addSmoketest( "smokeSharding", [ "mongo", "mongod", "mongos" ], [ jsDirTestSpec( "sharding" ) ] ) + addSmoketest( "smokeClone", [ "mongo", "mongod" ], jsDirTestSpec( "clone" ) ) + addSmoketest( "smokeRepl", [ "mongo", "mongod", "mongobridge" ], jsDirTestSpec( "repl" ) ) + addSmoketest( "smokeDisk", [ add_exe( "mongo" ), add_exe( "mongod" ) ], jsDirTestSpec( "disk" ) ) + addSmoketest( "smokeAuth", [ add_exe( "mongo" ), add_exe( "mongod" ) ], jsDirTestSpec( "auth" ) ) + addSmoketest( "smokeSharding", [ "mongo", "mongod", "mongos" ], jsDirTestSpec( "sharding" ) ) addSmoketest( "smokeJsPerf", [ "mongo" ], runShellTest ) addSmoketest( "smokeQuota", [ "mongo" ], runShellTest ) - addSmoketest( "smokeTool", [ add_exe( "mongo" ) ], [ jsDirTestSpec( "tool" ) ] ) + addSmoketest( "smokeTool", [ add_exe( "mongo" ) ], jsDirTestSpec( "tool" ) ) mongodForTests = None mongodForTestsPort = "27017" |