Thu Sep 23 12:50:25 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com>

        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.h:
        * orbsvcs/orbsvcs/Trader/Trader_Utils.h:
        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp:
          Removed non-ASCII characters in comments.

        * orbsvcs/examples/ImR/Combined_Service/start_all.conf:
        * orbsvcs/examples/ImR/Combined_Service/run_test.pl:
          Extended timeouts. Previous ones were too short on valgrind builds.

        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
        * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp:
        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
          Added code that ignores any exception from the servant's cleanup.
          This fixes a problem where servant wasn't removed from a poa in case
          servant's destructor threw an exception.

        * tests/ORB_shutdown/Foo_Bar.cpp:
          Don't allow exceptions to propagate out of the servant's destructor.

        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
          Extended the test so that it can run without SHMIOP part.

        * tests/Bug_1361_Regression/Server_Thread_Pool.cpp:
        * tests/Bug_1476_Regression/Sender_i.h:
        * tests/Codec/client.cpp:
        * tests/DII_AMI_Forward/server_interceptor.cpp:
        * tests/NestedUpcall/Triangle_Test/initiator.cpp:
        * tests/NestedUpcall/Triangle_Test/Object_A_i.cpp:
        * tests/NestedUpcall/Triangle_Test/Object_B_i.cpp:
        * tests/NestedUpcall/Triangle_Test/Object_A_i.h:
        * tests/NestedUpcall/Triangle_Test/Object_B_i.h:
        * tests/NestedUpcall/Triangle_Test/Triangle_Test.idl:
        * tests/NestedUpcall/Triangle_Test/run_test.pl:
        * tests/AMH_Exceptions/server.cpp:
        * tests/MProfile_Connection_Timeout/client.cpp:
        * tests/Oneways_Invoking_Twoways/Sender_i.h:
        * tests/Bug_1476_Test/client.cpp:
          Fixed memory leaks local to these tests.

1 files changed, 11 insertions, 4 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
index 4b43bc84400..e7c0f004f10 100755
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
@@ -36,6 +36,7 @@ $client->DeleteFile($iorbase);
 $client_flags = "";
 $server_flags = "";
 $quiet_flag = " -q ";
+$shmiop = 1;
 
 ###############################################################################
 # Parse the arguments
@@ -48,6 +49,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
         print "-n num              -- client uses <num> iterations\n";
         print "-debug              -- sets the debug flag for both client and "
                                       . "server\n";
+        print "-noshmiop           -- don't run SHMIOP test\n";
         exit;
     }
     elsif ($ARGV[$i] eq "-debug") {
@@ -61,6 +63,9 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     elsif ($ARGV[$i] eq "-verbose") {
         $quiet_flag = "";
     }
+    elsif ($ARGV[$i] eq "-noshmiop") {
+        $shmiop = 0;
+    }
     else {
         print STDERR "ERROR: Unknown Option: ".$ARGV[$i]."\n";
     }
@@ -142,12 +147,14 @@ if ($OSNAME ne "MSWin32" && $OSNAME ne "VMS") {
     run_test_helper ();
 }
 
-print STDERR "============================================================\n";
-print STDERR "Running IDL_Cubit with the SHMIOP protocol.\n\n";
+if ($shmiop) {
+    print STDERR "============================================================\n";
+    print STDERR "Running IDL_Cubit with the SHMIOP protocol.\n\n";
 
-$SV->Arguments ("$server_stdarg -ORBEndpoint shmiop:// -ORBSvcconf $server_shmiop_conf ");
+    $SV->Arguments ("$server_stdarg -ORBEndpoint shmiop:// -ORBSvcconf $server_shmiop_conf ");
 
-run_test_helper ();
+    run_test_helper ();
+}
 
 # Clean up SHMIOP files
 PerlACE::check_n_cleanup_files ("server_shmiop_*");