diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-10-30 11:46:56 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-10-30 11:46:56 +0100 |
commit | 50c131d843bf9f7c38d00ec0a4c26881756aa9aa (patch) | |
tree | e28d149786b4aeb3b20a5508727e167ae1ef493a | |
parent | 1a7f9bc556a6a74c2a66065af0f0b9489b5aca1e (diff) | |
parent | f776ce71367a69b891db4164f744d62b2ca06205 (diff) | |
download | ATCD-50c131d843bf9f7c38d00ec0a4c26881756aa9aa.tar.gz |
Merge branch 'ssliop_corbaloc_parser_comma_fix' of git://github.com/milan-mpathix/ATCD into milan-mpathix-ssliop_corbaloc_parser_comma_fix
-rw-r--r-- | TAO/bin/tao_other_tests.lst | 1 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp | 16 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h | 4 | ||||
-rwxr-xr-x | TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl | 6 |
5 files changed, 25 insertions, 4 deletions
diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst index 9cc7c20e94e..8f84e6ed4fe 100644 --- a/TAO/bin/tao_other_tests.lst +++ b/TAO/bin/tao_other_tests.lst @@ -213,6 +213,7 @@ TAO/orbsvcs/tests/Property/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICR TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !LynxOS #HANGS TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane #HANGS'TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane_ir +TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/orbsvcs/tests/Security/Bug_1107_Regression/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/orbsvcs/tests/Security/Bug_2908_Regression/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index eb6303b9b37..6aebd8005d2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -286,7 +286,7 @@ TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint, size_t &len) } len = ACE_OS::strlen (endpoint); } - else if (slash_pos != 0 || comma_pos > slash_pos) + else if (comma_pos == 0 || comma_pos > slash_pos) { // The endpoint address does not extend past the first '/' or ',' len = slash_pos - endpoint; diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp index bf458d40749..d697299e37b 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp @@ -182,7 +182,14 @@ CosNaming_Client::parse_args (void) int CosNaming_Client::run (void) { - return test_->execute (naming_client_); + this->activate(); + int rv = test_->execute (naming_client_); + { + CORBA::ORB_var orb = this->orbmgr_.orb(); + orb->shutdown(); + } + this->wait(); + return rv; } CosNaming_Client::~CosNaming_Client (void) @@ -1061,6 +1068,13 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) return 0; } +int CosNaming_Client::svc() +{ + CORBA::ORB_var orb = orbmgr_.orb(); + orb->run (); + return 0; +} + // This function runs the test. int diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h index 9cb24c8ea14..62789a5d4bd 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h @@ -295,7 +295,7 @@ private: * the server is hidden in the class. Just the <run> interface * is needed. */ -class CosNaming_Client +class CosNaming_Client : public ACE_Task_Base { public: // = Initialization and termination methods. @@ -309,6 +309,8 @@ public: /// Execute client example code. int run (void); + int svc (void); + /// Initialize the client communication endpoint with server. int init (int argc, ACE_TCHAR **argv); diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl index fc09f50e2ef..a2b3352b09b 100755 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl @@ -120,6 +120,8 @@ $orb_debug_level = ($quiet || $debug_level == 0) ? "" : "-ORBDebugLevel $debug_ @opts = ( "-s -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService" . " -ORBSvcConf $cli_cliconffile $orb_debug_level", + "-s -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port,iiop:$TARGETHOSTNAME:$ns_orb_port/NameService" + . " -ORBSvcConf $cli_cliconffile $orb_debug_level", "-t -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService" . " -ORBSvcConf $cli_cliconffile $orb_debug_level", "-i -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService" @@ -142,11 +144,13 @@ $orb_debug_level = ($quiet || $debug_level == 0) ? "" : "-ORBDebugLevel $debug_ . " -ORBSvcConf $ns_nsconffile $orb_debug_level", "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" . " -ORBSvcConf $ns_nsconffile $orb_debug_level", - + "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" + . " -ORBSvcConf $ns_nsconffile $orb_debug_level", ); @comments = ( "(SSL) Simple Test:", + "(SSL) Simple Multi-Profile Corbaloc Test:", "(SSL) Tree Test:", "(SSL) Iterator Test:", "(SSL) Exceptions Test:", |