CCAR: update from dev branch

diff --git a/configure.ac b/configure.ac
index 6254567d5dfa71f8d8e1557da4b409db5e6a76b7..cc389e95269b59bde7b30a32f152ccc415987fc9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -250,7 +250,6 @@ echo
 
 CHECK_LIBXML
 
-
 fi 
 # --- end test corba
 # ----------------------------------------------------------------------------
@@ -426,7 +425,7 @@ summary $basic_mandatory_products
 check_fatal_error $basic_mandatory_products
 echo
 
-corba_mandatory_products="omniORB_ok boost_ok"
+corba_mandatory_products="omniORB_ok boost_ok libxml_ok"
 if test x$corba_gen = xtrue; then
   echo --- CORBA mandatory products - default configuration:
   summary $corba_mandatory_products

diff --git a/src/LifeCycleCORBA/TestContainerManager.cxx b/src/LifeCycleCORBA/TestContainerManager.cxx
index 9313aace71ba5733a58f58166d8ced5cad352143..b908e90f8dccf6f60062ade37f02c94122fb5e5a 100644 (file)
--- a/src/LifeCycleCORBA/TestContainerManager.cxx
+++ b/src/LifeCycleCORBA/TestContainerManager.cxx
@@ -49,6 +49,7 @@ int main (int argc, char * argv[])
   Engines::Component_ptr compo;
   bool error = false;
   bool bestImplemented;
+  int status;
 
   // Initializing omniORB
   ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
@@ -147,17 +148,19 @@ int main (int argc, char * argv[])
       }
     }
   }
-  if( ((cmax-cmin) <= 1) && (fmax == 10/nbpmax) && !error ){
-    string msg;
+  string msg;
+  if( ((cmax-cmin) <= 2) && (fmax == 10/nbpmax) && !error ){
     if(bestImplemented)
       msg = "TEST OK";
     else
       msg = "TEST OK but FindBest not implemented!";
-    MESSAGE(msg);
-    return 0;
+    status=0;
   }
   else{
-    MESSAGE("TEST KO");
-    return 1;
+    msg ="TEST KO";
+    status=1;
   }
+  cout << msg << endl;
+
+  return status;
 }