Merge pull request #1883 from jwillemsen/jwi-localhost

Make use of ACE_LOCALHOST and removed Tru64/Irix remaining code

9 files changed, 1 insertions, 46 deletions

diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index ef1bfed3e72..85a3f0aaf85 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -267,7 +267,7 @@ TAO/tests/File_IO/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/MT_Server/run_test.pl: !ST
 TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Connect_Strategy_Test/run_test.pl:
-# DISABLED TAO/tests/Client_Leaks/run_test.pl: !VxWorks !ST !Tru64
+# DISABLED TAO/tests/Client_Leaks/run_test.pl: !VxWorks !ST
 TAO/tests/Server_Leaks/run_test.pl: !ANDROID
 TAO/tests/SHMIOP/run_test_collocated.pl: !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/SHMIOP/run_test.pl: !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
index 88506cad928..b8154a68990 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
@@ -30,14 +30,4 @@ project(CosNaming_Serv) : cosnaming_serv_persistence, orbsvcslib, orbsvcs_output
   Pkgconfig_Files {
     TAO_CosNaming_Serv.pc.in
   }
-
-  verbatim(gnuace, local) {
-    ## The optimizer in cxx (as of V6.5-014) is broken.  Evidence can
-    ## be found in the iterator portion of Simple_Naming test
-    ifeq ($(CXX), cxx)
-      ifeq ($(findstring Tru64, $(ACE_DU_SUBVERSION)), Tru64)
-        OCFLAGS += -O0
-      endif
-    endif
-  }
 }
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 178109b8798..ddde0038875 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -293,11 +293,6 @@ MT_Test::svc (void)
     {
       ex._tao_print_exception (
         "Unexpected exception in MT test bind");
-      // This debug statement works around a IRIX/MIPSPro 7.3 bug (it
-      // fails with optimize=1 debug=0; but works with any other
-      // settings for those flags).
-      ACE_DEBUG ((LM_DEBUG, "MT_Test(%t) - bind[3] %d\n",
-                  test_name_.length ()));
       return -1;
     }
 
diff --git a/TAO/tests/Exposed_Policies/run_test.pl b/TAO/tests/Exposed_Policies/run_test.pl
index 4e0f4824e04..de5271382f7 100755
--- a/TAO/tests/Exposed_Policies/run_test.pl
+++ b/TAO/tests/Exposed_Policies/run_test.pl
@@ -24,7 +24,6 @@ my $ior_base = "default.ior";
 my $ior_overridden = "overridden.ior";
 my $cfg_poa = "POA.cfg";
 my $cfg_object = "Object.cfg";
-my $cfg_suffix_tru64 = ".tru64";
 
 my $server_ior_base = $server->LocalFile ($ior_base);
 my $server_ior_overridden = $server->LocalFile ($ior_overridden);
@@ -49,13 +48,6 @@ if ($server->PutFile ($cfg_object) == -1) {
     return 1;
 }
 
-if ($^O eq "dec_osf") {
-    $server_cfg_poa = "$server_cfg_poa$cfg_suffix_tru64";
-    $server_cfg_object = "$server_cfg_object$cfg_suffix_tru64";
-    $client_cfg_poa = "$client_cfg_poa$cfg_suffix_tru64";
-    $client_cfg_object = "$client_cfg_object$cfg_suffix_tru64";
-}
-
 $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level ".
                                         "-POAConfigFile $server_cfg_poa ".
                                         "-ObjectConfigFile $server_cfg_object ".
diff --git a/TAO/tests/RTCORBA/Banded_Connections/bands.irix b/TAO/tests/RTCORBA/Banded_Connections/bands.irix
deleted file mode 100644
index fe403f56fda..00000000000
--- a/TAO/tests/RTCORBA/Banded_Connections/bands.irix
+++ /dev/null
@@ -1 +0,0 @@
-19 23 24 28 29 33
diff --git a/TAO/tests/RTCORBA/Banded_Connections/bands.tru64 b/TAO/tests/RTCORBA/Banded_Connections/bands.tru64
deleted file mode 100644
index fe403f56fda..00000000000
--- a/TAO/tests/RTCORBA/Banded_Connections/bands.tru64
+++ /dev/null
@@ -1 +0,0 @@
-19 23 24 28 29 33
diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
index e598f8a12f7..b7e699a64f4 100755
--- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
+++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
@@ -53,18 +53,10 @@ if ($^O eq "MSWin32") {
     $server_args =
         "-b bands.nt";
 }
-elsif ($^O eq "dec_osf") {
-    $server_args =
-        "-b bands.tru64";
-}
 elsif ($^O eq "hpux") {
     $server_args =
         "-b bands.hpux";
 }
-elsif ($^O eq "irix") {
-    $server_args =
-        "-b bands.irix";
-}
 else {
     $server_args =
         "-b bands.unix";
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
index ae53602db94..aafa46c19bf 100755
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
@@ -37,18 +37,10 @@ if ($^O eq "MSWin32") {
     $priority1 = 2;
     $priority2 = 1;
 }
-elsif ($^O eq "dec_osf") {
-    $priority1 = 20;
-    $priority2 = 25;
-}
 elsif ($^O eq "hpux") {
     $priority1 = 17;
     $priority2 = 22;
 }
-elsif ($^O eq "irix") {
-    $priority1 = 27;
-    $priority2 = 33;
-}
 else {
     $priority1 = 45;
     $priority2 = 50;
diff --git a/TAO/tests/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
index 3e29c9671ff..494b89cbd07 100755
--- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
@@ -55,10 +55,6 @@ if ($^O eq "MSWin32") {
     $server_args =
         "-a 1 -b 2";
 }
-elsif ($^O eq "dec_osf") {
-    $server_args =
-        "-a 20 -b 30";
-}
 elsif ($^O eq "hpux") {
     $continuous = 1;
     $server_args =