mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-29 16:47:28 +01:00
Code Issues Releases Activity

Merge branch 'master' of git@github.com:mongodb/mongo

Browse Source
This commit is contained in:
Aaron 2009-03-26 15:13:56 -04:00
commit a6bfe75b88
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -258,7 +258,7 @@ elif "sunos5" == os.sys.platform:
useJavaHome = True
javaHome = "/usr/lib/jvm/java-6-sun/"
javaOS = "solaris"
env.Append( CPPDEFINES=[ "__linux__" ] )
env.Append( CPPDEFINES=[ "__linux__" , "__sunos__" ] )
elif "win32" == os.sys.platform:
windows = True
@ -714,7 +714,7 @@ def jsDirTestSpec( dir ):
return mongo[0].abspath + " --nodb " + jsSpec( [ dir, "*.js" ] )
# These tests require the mongo shell
if not onlyServer:
if not onlyServer and not noshell:
addSmoketest( "smokeJs", [ "mongo" ], [ mongo[0].abspath + " " + jsSpec( [ "_runner.js" ] ) ] )
addSmoketest( "smokeClone", [ "mongo", "mongod" ], [ jsDirTestSpec( "clone" ) ] )
addSmoketest( "smokeRepl", [ "mongo", "mongod" ], [ jsDirTestSpec( "repl" ) ] )

2
db/db.cpp
View File

@ -327,7 +327,7 @@ namespace mongo {
Timer startupSrandTimer;
void acquirePathLock() {
#if !defined(_WIN32)
#if !defined(_WIN32) and !defined(__sunos__)
string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
int f = open( name.c_str(), O_RDONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO );
massert( "Unable to create / open lock file for dbpath: " + name, f > 0 );