From a23297fae67e406c4b7f4a3361877346e15b9263 Mon Sep 17 00:00:00 2001 From: Ovidiu Mircescu Date: Wed, 25 Nov 2020 11:38:37 +0100 Subject: [PATCH] Remove the use of getlogin. --- src/engine/Test/CMakeLists.txt | 3 ++- src/engine/Test/engineTest.cxx | 18 +++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/engine/Test/CMakeLists.txt b/src/engine/Test/CMakeLists.txt index 6a13ad4d6..345bad589 100644 --- a/src/engine/Test/CMakeLists.txt +++ b/src/engine/Test/CMakeLists.txt @@ -33,6 +33,7 @@ SET(_link_LIBRARIES ${PTHREAD_LIBRARIES} YACSlibEngine YACSBases + SALOMEBasics ) # additional preprocessor / compiler flags @@ -84,4 +85,4 @@ INSTALL(TARGETS TestEngine DESTINATION ${LOCAL_TEST_DIR}) INSTALL(TARGETS IntegrationTestEngine DESTINATION ${LOCAL_TEST_DIR}) INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${LOCAL_TEST_DIR} - RENAME CTestTestfile.cmake) \ No newline at end of file + RENAME CTestTestfile.cmake) diff --git a/src/engine/Test/engineTest.cxx b/src/engine/Test/engineTest.cxx index 7699854e2..a305c64db 100644 --- a/src/engine/Test/engineTest.cxx +++ b/src/engine/Test/engineTest.cxx @@ -39,11 +39,7 @@ #include #include #include -#ifdef WIN32 -#include -#else -#include -#endif +#include "Basics_DirUtils.hxx" //#define _DEVDEBUG_ #include "YacsTrace.hxx" @@ -1005,16 +1001,8 @@ void EngineTest::RecursiveBlocs_multipleRecursion() DEBTRACE(" output port name for graphe = " << _nodeMap["graphe"]->getOutPortName(*it)); } YACS::ENGINE::VisitorSaveState vst(_compoMap["graphe"]); -#ifdef WIN32 - std::string logDir=getenv("SALOME_TMP_DIR"); - logDir += "\\"; -#else - std::string logDir = std::string("/tmp/")+ getlogin(); - std::string cmd = "mkdir -p " + logDir; - system( cmd.c_str() ); - logDir += "/"; -#endif - vst.openFileDump(logDir + std::string("RecursiveBlocs_multipleRecursion_dumpState.xml")); + std::string dumpFilePath = Kernel_Utils::GetTmpDir() + "RecursiveBlocs.xml"; + vst.openFileDump(dumpFilePath); _compoMap["graphe"]->accept(&vst); vst.closeFileDump(); } -- 2.39.2