From f6ff69009db5af20b2cefdc57006d2924cb87bc1 Mon Sep 17 00:00:00 2001 From: srn Date: Wed, 13 Dec 2006 11:52:56 +0000 Subject: [PATCH] Improved the process of launching the Salome --- src/SALOMEDS/Test/TestSALOMEDS.cxx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/SALOMEDS/Test/TestSALOMEDS.cxx b/src/SALOMEDS/Test/TestSALOMEDS.cxx index 9ea70bac3..dc7c874db 100644 --- a/src/SALOMEDS/Test/TestSALOMEDS.cxx +++ b/src/SALOMEDS/Test/TestSALOMEDS.cxx @@ -48,6 +48,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( SALOMEDSTest_Embedded ); #include "utilities.h" #include "Utils_SINGLETON.hxx" #include "Utils_ORB_INIT.hxx" +#include "OpUtil.hxx" #include "SALOME_NamingService.hxx" #include "NamingService_WaitForServerReadiness.hxx" #include "SALOMEDS_StudyManager_i.hxx" @@ -85,8 +86,15 @@ int main(int argc, char* argv[]) sleep(10); + string host = GetHostname(); + SALOME_NamingService NS(orb); - NamingService_WaitForServerReadiness(&NS, "/myStudyManager"); + if(host.empty()) + NamingService_WaitForServerReadiness(&NS, "/myStudyManager"); + else { + string serverName = "/Containers/"+host+"/SuperVisionContainer"; + NamingService_WaitForServerReadiness(&NS, serverName); + } CORBA::Object_var obj = NS.Resolve( "/myStudyManager" ); if(CORBA::is_nil(obj)) { -- 2.39.2