kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fix problem on MacOSX, by disabling part of the test.

Browse Source
This commit is contained in:
Mathieu Malaterre 2006-03-13 14:39:50 -05:00
parent 009b3cbb12
commit 4f9efe7502
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/kwsys/DynamicLoader.cxx
View File

@ -160,20 +160,21 @@ LibHandle DynamicLoader::OpenLibrary(const char* libname )
{ {
return 0; return 0;
} }
return NSLinkModule(image, libname, NSModule handle = NSLinkModule(image, libname,
NSLINKMODULE_OPTION_PRIVATE|NSLINKMODULE_OPTION_BINDNOW); NSLINKMODULE_OPTION_BINDNOW|NSLINKMODULE_OPTION_RETURN_ON_ERROR);
NSDestroyObjectFileImage(image);
return handle;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
int DynamicLoader::CloseLibrary( LibHandle lib) int DynamicLoader::CloseLibrary( LibHandle lib)
{ {
// Initially this function was written using NSUNLINKMODULE_OPTION_NONE, but when
// the code is compiled with coverage on, one cannot close the library properly
// so instead of not unloading the library. We use a special option:
// NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED // NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED
// With this option the memory for the module is not deallocated // With this option the memory for the module is not deallocated
// allowing pointers into the module to still be valid. // allowing pointers into the module to still be valid.
bool success = NSUnLinkModule(lib, NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED); // You should use this option instead if your code experience some problems
// reported against Panther 10.3.9 (fixed in Tiger 10.4.2 and up)
bool success = NSUnLinkModule(lib, NSUNLINKMODULE_OPTION_NONE);
return success; return success;
} }

2
Source/kwsys/testDynamicLoader.cxx
View File

@ -68,6 +68,7 @@ int TestDynamicLoader(const char* libname, const char* symbol, int r1, int r2, i
<< kwsys::DynamicLoader::LastError() << kwsys_ios::endl; << kwsys::DynamicLoader::LastError() << kwsys_ios::endl;
return 1; return 1;
} }
#ifndef __APPLE__
int s = kwsys::DynamicLoader::CloseLibrary(l); int s = kwsys::DynamicLoader::CloseLibrary(l);
if( (r3 && !s) || (!r3 && s) ) if( (r3 && !s) || (!r3 && s) )
{ {
@ -75,6 +76,7 @@ int TestDynamicLoader(const char* libname, const char* symbol, int r1, int r2, i
<< kwsys::DynamicLoader::LastError() << kwsys_ios::endl; << kwsys::DynamicLoader::LastError() << kwsys_ios::endl;
return 1; return 1;
} }
#endif
return 0; return 0;
} }