mirror of
https://github.com/mongodb/mongo.git
synced 2024-12-01 09:32:32 +01:00
solaris fixes
This commit is contained in:
parent
1942ea0df5
commit
9fc0c8c3f1
@ -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" ) ] )
|
||||
|
@ -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 );
|
||||
|
Loading…
Reference in New Issue
Block a user