diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-02-23 14:42:57 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-02-23 14:42:57 +0000 |
| commit | 74417d1cb05b17ba4962f482958596f8d2cdf940 (patch) | |
| tree | cd092b8fe5218c78312c790e7ff0881ceb66433f /CIAO/tests | |
| parent | 4945ed3f33802fc723fab4ceff458d95e6f68ed6 (diff) | |
| download | ATCD-74417d1cb05b17ba4962f482958596f8d2cdf940.tar.gz | |
Mon Feb 23 14:42:15 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Bug_2130_Regression/descriptors/run_test.pl:
* tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc:
* tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp:
Made this test compile again
Diffstat (limited to 'CIAO/tests')
3 files changed, 7 insertions, 9 deletions
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc index 6dc4ea4c468..a147aa13cf9 100644 --- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc +++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc @@ -1,7 +1,6 @@ //$Id$ project(TSEC_CheckPoint_stub): ccm_stub, event { - requires += dummy_label avoids += ace_for_tao after += ENW_stub libpaths += ../interfaces @@ -25,7 +24,6 @@ project(TSEC_CheckPoint_stub): ccm_stub, event { } project(TSEC_CheckPoint_svnt) : ciao_servant, event { - requires += dummy_label avoids += ace_for_tao after += TSEC_CheckPoint_stub after += ENW_skel ENW_stub @@ -56,8 +54,7 @@ project(TSEC_CheckPoint_svnt) : ciao_servant, event { } -project(TSEC_CheckPoint_exec) : ciao_executor, event, ccm_svnt { - requires += dummy_label +project(TSEC_CheckPoint_exec) : ciao_executor, event, ccm_svnt, ciao_session_container { avoids += ace_for_tao after += TSEC_CheckPoint_svnt after += ENW_skel ENW_stub @@ -87,7 +84,6 @@ project(TSEC_CheckPoint_exec) : ciao_executor, event, ccm_svnt { project(TSEC_CheckPoint_controller) : ccm_stub, valuetype, event { - requires += dummy_label avoids += ace_for_tao exename = controller after += TSEC_CheckPoint_stub diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp index c8de0ed4534..5563a4a85b8 100644 --- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp +++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp @@ -223,9 +223,9 @@ Impl::TSEC_CheckPoint_exec_i::installServant ) { assert( this->_p_sessionContainer ); - + PortableServer::ObjectId_var oid; return this->_p_sessionContainer->install_servant( Servant, - CIAO::Container::Component ); + CIAO::Container_Types::COMPONENT_t, oid.out ()); } @@ -241,7 +241,7 @@ Impl::TSEC_CheckPoint_exec_i::uninstallServant { assert( this->_p_sessionContainer ); - this->_p_sessionContainer->uninstall( ObjRef, CIAO::Container::Component ); + this->_p_sessionContainer->uninstall( ObjRef, CIAO::Container_Types::COMPONENT_t); } @@ -442,7 +442,7 @@ Impl::TSEC_CheckPoint_exec_i::set_session_context throw CORBA::INTERNAL(); } - this->_p_sessionContainer = p_checkPoint_Context->_ciao_the_Container(); + this->_p_sessionContainer = dynamic_cast < ::CIAO::Session_Container*>(p_checkPoint_Context->_ciao_the_Container()); if( !_p_sessionContainer ) { diff --git a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl index 70f32a78a9a..dccd19ae0d2 100644 --- a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl +++ b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl @@ -21,6 +21,8 @@ $dat_file = "TestNodeManagerMap.dat"; $cdp_file = "DeploymentPlan.cdp"; $controller_exec = "../SEC_CheckPoint/controller"; +PerlACE::add_lib_path ('../SEC_CheckPoint'); + $E = 0; $EM = 0; |