diff options
| author | Mike Dirolf <mike@10gen.com> | 2010-07-28 14:02:26 -0400 |
|---|---|---|
| committer | Mike Dirolf <mike@10gen.com> | 2010-07-28 14:02:26 -0400 |
| commit | afd32fcceff38811b918e47dd1aaba3aaf0184c2 (patch) | |
| tree | 56139f125662e0302df19b1f7b3b7eca407e4ef7 | |
| parent | 6656bcd61dfdc1daaafb070fa58e81777c15f5ae (diff) | |
| download | mongo-afd32fcceff38811b918e47dd1aaba3aaf0184c2.tar.gz | |
to test, just build .a and tests files, not .so
| -rw-r--r-- | SConstruct | 9 | ||||
| -rw-r--r-- | distsrc/client/SConstruct | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct index 6d098dd3303..bb63af13cfe 100644 --- a/SConstruct +++ b/SConstruct @@ -1656,15 +1656,16 @@ def build_and_test_client(env, target, source): from subprocess import call if GetOption("extrapath") is not None: - call(["scons", "--extrapath=" + GetOption("extrapath")], cwd=installDir) + scons_command = ["scons", "--extrapath=" + GetOption("extrapath")] else: - call("scons", cwd=installDir) + scons_command = ["scons"] + + call(scons_command + ["libmongoclient.a", "clientTests"], cwd=installDir) + return bool(call(["python", "buildscripts/smoke.py", "--test-path", installDir, "smokeClient"])) env.Alias("clientBuild", [mongod, installDir], [build_and_test_client]) env.AlwaysBuild("clientBuild") -env.Alias("clientDist", ["clientBuild", "dist"], []) -env.AlwaysBuild("clientDist") def clean_old_dist_builds(env, target, source): prefix = "mongodb-%s-%s" % (platform, processor) diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct index 63782064dfd..8a8bae9d012 100644 --- a/distsrc/client/SConstruct +++ b/distsrc/client/SConstruct @@ -54,12 +54,12 @@ allClientFiles += Glob( "mongo/scripting/*.cpp" ) allClientFiles += Glob( "mongo/util/*.cpp" ) allClientFiles += Glob( "mongo/util/*.c" ) -env.Library( "mongoclient" , allClientFiles ) env.SharedLibrary( "mongoclient" , allClientFiles ) +env.Library( "mongoclient" , allClientFiles ) clientTests = [] clientEnv = env.Clone(); -clientEnv.Prepend( LIBS=["mongoclient"]) +clientEnv.Prepend( LIBS=["libmongoclient.a"]) clientEnv.Prepend( LIBPATH=["."] ) # examples @@ -69,3 +69,4 @@ clientTests += [ clientEnv.Program( "whereExample" , [ "client/examples/whereExa clientTests += [ clientEnv.Program( "authTest" , [ "client/examples/authTest.cpp" ] ) ] clientTests += [ clientEnv.Program( "httpClientTest" , [ "client/examples/httpClientTest.cpp" ] ) ] clientTests += [ clientEnv.Program( "clientTest" , [ "client/examples/clientTest.cpp" ] ) ] +clientEnv.Alias("clientTests", clientTests, []) |