diff options
| author | Milan Cvetkovic <milan.cvetkovic@mpathix.com> | 2016-04-07 10:08:35 -0400 |
|---|---|---|
| committer | Milan Cvetkovic <milan.cvetkovic@mpathix.com> | 2016-04-07 10:08:35 -0400 |
| commit | 2884c7b4884d6410c44f15fbeffd97b1ee20fcfb (patch) | |
| tree | 038f37a893948da4bcd7e301bfe92742490d4b54 | |
| parent | 9143adca7bbe21d476c2e4387c056158d7b83a00 (diff) | |
| parent | 6114e2b1df60ec798efd27da8bf07ce742cf3b5d (diff) | |
| download | ATCD-2884c7b4884d6410c44f15fbeffd97b1ee20fcfb.tar.gz | |
Merge branch 'ssliop_corbaloc_test' into ssliop_corbaloc_parser_comma_fix
| -rw-r--r-- | TAO/bin/tao_other_tests.lst | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp | 8 | ||||
| -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 |
4 files changed, 17 insertions, 2 deletions
diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst index f46fb7b24a6..936de3c5764 100644 --- a/TAO/bin/tao_other_tests.lst +++ b/TAO/bin/tao_other_tests.lst @@ -214,6 +214,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/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp index bf458d40749..35d50635b73 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp @@ -1061,6 +1061,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 @@ -1071,5 +1078,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (cosnaming_client.init (argc, argv) == -1) return 1; + cosnaming_client.activate(); return cosnaming_client.run (); } 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:", |