diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 55 | ||||
| -rwxr-xr-x | TAO/examples/POA/Adapter_Activator/run_test.pl | 6 | ||||
| -rw-r--r-- | TAO/tests/Crashed_Callback/Crashed_Callback.cpp | 10 | ||||
| -rw-r--r-- | TAO/tests/Faults/test_i.cpp | 17 |
4 files changed, 63 insertions, 25 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index a2e19d30cb9..25f24c4b33f 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,24 +1,41 @@ +Fri Jun 15 20:55:13 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * tests/Crashed_Callback/Crashed_Callback.cpp (crash_now_please): + * tests/Faults/test_i.cpp(shutdown): + + Abort the client using _exit() and not abort() on Tru64. For + some reason the client doesn't abort when abort() is called. + + * examples/POA/Adapter_Activator/run_test.pl: + + Bumped up the timeout a bit to resolve pre-mature exit. The + real cause of failure of this test has been fixed by chages to + Active_Map_Manager. + + This fixes problems with the two tests and the previous example. + All these fixes are related to Blocker Bug Id 912. + Fri Jun 15 20:49:10 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> - * tao/Any.cpp - * tao/Asynch_Reply_Dispatcher.cpp - * tao/CDR.cpp - * tao/CDR.h - * tao/CDR.i - * tao/GIOP_Message_Base.cpp - * tao/GIOP_Message_Lite.cpp - * tao/IIOP_Profile.cpp - * tao/Invocation.cpp - * tao/ORB.cpp - * tao/Pluggable_Messaging_Utils.cpp - * tao/Synch_Reply_Dispatcher.cpp - * tao/TAO_Server_Request.cpp - * tao/DynamicInterface/DII_Reply_Dispatcher.cpp - * tao/Strategies/SHMIOP_Profile.cpp - * tao/Strategies/UIOP_Profile.cpp - * examples/PluggableUDP/DIOP/DIOP_Profile.cpp - - Made changes relating to WChar implementation of GIOP 1.2. + * tao/Any.cpp + * tao/Asynch_Reply_Dispatcher.cpp + * tao/CDR.cpp + * tao/CDR.h + * tao/CDR.i + * tao/GIOP_Message_Base.cpp + * tao/GIOP_Message_Lite.cpp + * tao/IIOP_Profile.cpp + * tao/Invocation.cpp + * tao/ORB.cpp + * tao/Pluggable_Messaging_Utils.cpp + * tao/Synch_Reply_Dispatcher.cpp + * tao/TAO_Server_Request.cpp + * tao/DynamicInterface/DII_Reply_Dispatcher.cpp + * tao/Strategies/SHMIOP_Profile.cpp + * tao/Strategies/UIOP_Profile.cpp + * examples/PluggableUDP/DIOP/DIOP_Profile.cpp + + Made changes relating to WChar implementation of GIOP 1.2. Fri Jun 15 15:13:20 2001 Krishnakumar B <kitty@cs.wustl.edu> diff --git a/TAO/examples/POA/Adapter_Activator/run_test.pl b/TAO/examples/POA/Adapter_Activator/run_test.pl index 362aeb84c0f..92886e37579 100755 --- a/TAO/examples/POA/Adapter_Activator/run_test.pl +++ b/TAO/examples/POA/Adapter_Activator/run_test.pl @@ -56,19 +56,19 @@ $CL = new PerlACE::Process ("../Generic_Servant/client"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile_1, 5) == -1) { +if (PerlACE::waitforfile_timed ($iorfile_1, 15) == -1) { print STDERR "ERROR: cannot find file <$iorfile_1>\n"; $SV->Kill (); exit 1; } -if (PerlACE::waitforfile_timed ($iorfile_2, 5) == -1) { +if (PerlACE::waitforfile_timed ($iorfile_2, 15) == -1) { print STDERR "ERROR: cannot find file <$iorfile_2>\n"; $SV->Kill (); exit 1; } -if (PerlACE::waitforfile_timed ($iorfile_3, 5) == -1) { +if (PerlACE::waitforfile_timed ($iorfile_3, 15) == -1) { print STDERR "ERROR: cannot find file <$iorfile_3>\n"; $SV->Kill (); exit 1; diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp index 0e26ff16ba1..637c20c582f 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp @@ -21,7 +21,15 @@ Crashed_Callback::crash_now_please (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Crashed_Callback - crashing application %a\n")); + "(%P|%t) Crashed_Callback - crashing application \n")); +// Tru64 seems to hang and not abort and dump core when abort() is called +// here. This needs further investigation. This fix is a temporary one. +#if defined (DIGITAL_UNIX) || defined (DEC_CXX) + ACE_OS::_exit(); +#else + ACE_OS::abort(); +#endif + } void diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp index 211db55ba67..67c8cc13dc2 100644 --- a/TAO/tests/Faults/test_i.cpp +++ b/TAO/tests/Faults/test_i.cpp @@ -15,7 +15,15 @@ Callback_i::shutdown (CORBA::Boolean is_clean, { if (is_clean == 0) { - ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n%a")); + ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n")); + +// Tru64 seems to hang and not abort and dump core when abort() is called +// here. This needs further investigation. This fix is a temporary one. +#if defined (DIGITAL_UNIX) || defined (DEC_CXX) + ACE_OS::_exit(); +#else + ACE_OS::abort(); +#endif return; } ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); @@ -50,7 +58,12 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean, { if (is_clean == 0) { - ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown %a\n")); + ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown \n")); +#if defined (DIGITAL_UNIX) || defined (DEC_CXX) + ACE_OS::_exit(); +#else + ACE_OS::abort(); +#endif return; } |