Merge branch 'V7_dev'

[modules/yacs.git] / src / SALOMEDS / Test / TestSALOMEDS.cxx

diff --git a/src/SALOMEDS/Test/TestSALOMEDS.cxx b/src/SALOMEDS/Test/TestSALOMEDS.cxx
index c742383f98e7983802c5a7eda922ce13491ebd32..759cd63fe56625cf0f6da5663d89ca81e97160cf 100644 (file)
--- a/src/SALOMEDS/Test/TestSALOMEDS.cxx
+++ b/src/SALOMEDS/Test/TestSALOMEDS.cxx
@@ -54,6 +54,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( SALOMEDSTest_Embedded );
 #include "SALOMEDS_StudyManager_i.hxx"
 
 #ifdef WIN32
+#include <winsock2.h>
 #define setenv Kernel_Utils::setenv
 #endif
 
@@ -66,35 +67,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION( SALOMEDSTest_Embedded );
 
 int main(int argc, char* argv[])
 {
-  // --- Run Salome without GUI
-
-  setenv("SALOME_trace", "file:./traceUnitTest.log", 1); // 1: overwrite
-
-  system("salome -t &");
-
-  // --- Wait till SALOMEDS server is launched
-
-  char hostname[511];
-  int size;
-  gethostname(hostname, size);
-  char* chr_port = getenv("SALOMEDS_UNITTESTS_PORT");
-  std::string port;
-  if(chr_port) port = chr_port;
-  if(port.empty()) port = "2810";
-  std::string cfg_file = std::string(getenv("HOME"))+"/.omniORB_"+std::string(hostname)+"_"+port+".cfg";
-  setenv("OMNIORB_CONFIG", cfg_file.c_str(), 1);
-
   ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
-  ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
   CORBA::ORB_var orb = init(argc , argv ) ;
-
-  #ifndef WIN32
-    sleep(15);
-  #else
-    Sleep(15000);
-  #endif
-
-
   std::string host; // = Kernel_Utils::GetHostname();
   char* wait_Superv = getenv("SALOMEDS_UNITTESTS_WAIT_SUPERVISOR");
   if(wait_Superv) host = Kernel_Utils::GetHostname();
@@ -173,10 +147,6 @@ int main(int argc, char* argv[])
   bool wasSucessful = result.wasSuccessful();
   testFile.close();
 
-  // --- Kill all created Salome process
-
-  system("killSalome.py");
-
   // ---  Return error code 1 if the one of test failed.
 
   return wasSucessful ? 0 : 1;