diff options
| author | Milan Cvetkovic <milan.cvetkovic@mpathix.com> | 2016-04-06 18:17:07 -0400 |
|---|---|---|
| committer | Milan Cvetkovic <milan.cvetkovic@mpathix.com> | 2016-04-07 10:04:23 -0400 |
| commit | 4e3888084fc9ebecc71856794c071836adfbc22b (patch) | |
| tree | febc8f4d12b1e5ccc6f0b0e7a09933224415442c | |
| parent | 178c640975b23879a1c1dbdb17b054a7f60ab39b (diff) | |
| download | ATCD-4e3888084fc9ebecc71856794c071836adfbc22b.tar.gz | |
Fix timeout errors in orbsvcs/tests/Security/ssliop_corbaloc, enable the test
Apparently, SSLIOP cannot use collocated servants in this test.
We have to run the server orb, for all remote invocations to our server
to work, even though they are both in the same process (client).
| -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 |
3 files changed, 12 insertions, 1 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); |