X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSALOMELocalTrace%2FTest%2FSALOMELocalTraceTest.cxx;fp=src%2FSALOMELocalTrace%2FTest%2FSALOMELocalTraceTest.cxx;h=2934ce0363bfcbb37ab4ae14b5635c6cb79439c1;hb=cac0e2b731df1ca558e60fe52f062d45f5edd28d;hp=63b7413eabcded13a4d76bd642f022304f5c9551;hpb=82e8d918999898627faa514c2e361ef5e333e348;p=modules%2Fkernel.git diff --git a/src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx b/src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx index 63b7413ea..2934ce036 100644 --- a/src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx +++ b/src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx @@ -26,13 +26,15 @@ #include #include #include +#include #include "LocalTraceBufferPool.hxx" #include "utilities.h" #include "Basics_Utils.hxx" +#include "Basics_DirUtils.hxx" #ifdef WIN32 #define setenv Kernel_Utils::setenv -#endif +#endif // ============================================================================ /*! @@ -40,7 +42,7 @@ */ // ============================================================================ -void +void SALOMELocalTraceTest::setUp() { } @@ -51,12 +53,17 @@ SALOMELocalTraceTest::setUp() */ // ============================================================================ -void +void SALOMELocalTraceTest::tearDown() { } -#define TRACEFILE "/tmp/traceUnitTest.log" +std::string +SALOMELocalTraceTest::_getTraceFileName() +{ + std::string dir = Kernel_Utils::GetTmpDir(); + return dir + "traceUnitTest-SALOMELocalTraceTest.log"; +} // ============================================================================ /*! @@ -64,18 +71,18 @@ SALOMELocalTraceTest::tearDown() */ // ============================================================================ -void +void SALOMELocalTraceTest::testSingletonBufferPool() { // --- trace on file - const char *theFileName = TRACEFILE; + std::string theFileName = _getTraceFileName(); std::string s = "file:"; s += theFileName; CPPUNIT_ASSERT(! setenv("SALOME_trace",s.c_str(),1)); // 1: overwrite std::ofstream traceFile; - traceFile.open(theFileName, std::ios::out | std::ios::app); + traceFile.open(theFileName.c_str(), std::ios::out | std::ios::app); CPPUNIT_ASSERT(traceFile); // file created empty, then closed traceFile.close(); @@ -98,7 +105,7 @@ void *PrintHello(void *threadid); */ // ============================================================================ -void +void SALOMELocalTraceTest::testLoadBufferPoolLocal() { std::string s = "local"; @@ -134,10 +141,10 @@ SALOMELocalTraceTest::testLoadBufferPoolLocal() */ // ============================================================================ -void +void SALOMELocalTraceTest::testLoadBufferPoolFile() { - const char *theFileName = TRACEFILE; + std::string theFileName = _getTraceFileName(); std::string s = "file:"; s += theFileName; @@ -145,7 +152,7 @@ SALOMELocalTraceTest::testLoadBufferPoolFile() CPPUNIT_ASSERT(! setenv("SALOME_trace",s.c_str(),1)); // 1: overwrite std::ofstream traceFile; - traceFile.open(theFileName, std::ios::out | std::ios::trunc); + traceFile.open(theFileName.c_str(), std::ios::out | std::ios::trunc); CPPUNIT_ASSERT(traceFile); // file created empty, then closed traceFile.close(); @@ -186,7 +193,7 @@ void *PrintHello(void *threadid) #if defined(_DEBUG_) || defined(_DEBUG) long id_thread = (long)threadid; for (int i=0; i