16 files changed, 1 insertions, 100 deletions
diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp
index e8d1a07c1d4..5785226c018 100644
--- a/TAO/tests/Bug_1020_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Regression/server.cpp
@@ -6,15 +6,6 @@
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
-#if defined (ACE_OPENVMS)
-// need this to circumvent link error on OpenVMS
-// has to do with interference in template instantiations
-// for the server build by previous compilation of TestX
-// components in client build which are reused by server
-// without recompilation
-ACE_Time_Value dum = ACE_Time_Value::zero;
-#endif
-
 int
 parse_args (int argc, ACE_TCHAR *argv[]);
 
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index 23e34e8cdb7..1da174a9384 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -1,14 +1,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-#if defined (ACE_OPENVMS)
-// need this to circumvent link error on OpenVMS
-// has to do with interference in template instantiations
-// because multiple executables are build in one directory
-// reuising eachothers object files.
-ACE_Time_Value dum = ACE_Time_Value::zero;
-#endif
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_1495_Regression/tid_to_int.h b/TAO/tests/Bug_1495_Regression/tid_to_int.h
index 89cb1b38fb6..33fff902b16 100644
--- a/TAO/tests/Bug_1495_Regression/tid_to_int.h
+++ b/TAO/tests/Bug_1495_Regression/tid_to_int.h
@@ -28,11 +28,7 @@ namespace
     {
       // ACE_thread_t is a pointer.  Cast to an intermediate integer
       // type large enough to hold a pointer.
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-      int const tmp = reinterpret_cast<int> (tid);
-#else
       intptr_t const tmp = reinterpret_cast<intptr_t> (tid);
-#endif
 
       // We assume sizeof(thread_id_type) >= sizeof(ace_thread_id_type).
       return (thread_id_type) tmp;
diff --git a/TAO/tests/Bug_2084_Regression/tid_to_int.h b/TAO/tests/Bug_2084_Regression/tid_to_int.h
index 4031bfbf991..aec042a2aa3 100644
--- a/TAO/tests/Bug_2084_Regression/tid_to_int.h
+++ b/TAO/tests/Bug_2084_Regression/tid_to_int.h
@@ -28,11 +28,7 @@ namespace
     {
       // ACE_thread_t is a pointer.  Cast to an intermediate integer
       // type large enough to hold a pointer.
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-      int const tmp = reinterpret_cast<int> (tid);
-#else
       intptr_t const tmp = reinterpret_cast<intptr_t> (tid);
-#endif
 
       // We assume sizeof(thread_id_type) >= sizeof(ace_thread_id_type).
       return (thread_id_type) tmp;
diff --git a/TAO/tests/Bug_3558_Regression/client.cpp b/TAO/tests/Bug_3558_Regression/client.cpp
index 8cca2b9be34..c2bb4e016cd 100644
--- a/TAO/tests/Bug_3558_Regression/client.cpp
+++ b/TAO/tests/Bug_3558_Regression/client.cpp
@@ -55,11 +55,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 static void *
 test_server (void *arg)
 {
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  int server_nr = reinterpret_cast<int> (arg);
-#else
   intptr_t server_nr = reinterpret_cast<intptr_t> (arg);
-#endif
 
   ACE_TCHAR ior[256];
 
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp
index b71122bc23b..ad25d7cb7bd 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.cpp
+++ b/TAO/tests/CollocationLockup/CollocationLockup.cpp
@@ -18,13 +18,7 @@
 
 namespace
 {
-#if defined (ACE_OPENVMS)
-  // less threads on OpenVMS otherwise this test
-  // (although working correctly) takes far too long.
-  const size_t N_THREADS = 10;
-#else
   const size_t N_THREADS = 20;
-#endif
   const size_t N_ITERATIONS = 100;
 }
 
diff --git a/TAO/tests/CollocationLockup/run_test.pl b/TAO/tests/CollocationLockup/run_test.pl
index 819642dfe99..0f7aacb946f 100755
--- a/TAO/tests/CollocationLockup/run_test.pl
+++ b/TAO/tests/CollocationLockup/run_test.pl
@@ -14,11 +14,6 @@ $debug_level = '0';
 # 20 seconds and when the bug was fixed it returned before 20 seconds.
 $timeout = 0;
 
-if ($^O eq "VMS") {
-    # On OpenVMS this test does not lock up but takes much longer
-    $timeout = 280;
-}
-
 foreach $i (@ARGV) {
     if ($i eq '-debug') {
         $debug_level = '10';
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
index cb57d3ddcaf..8b9fa38005e 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
@@ -15,14 +15,7 @@ Crashed_Callback::crash_now_please ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Crashed_Callback - crashing application\n"));
-// OpenVMS seems to hang and not abort and dump core when abort() is called
-// here. This needs further
-#if defined (ACE_OPENVMS)
-  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 bdb07cfb63d..aae860a4fb4 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -13,13 +13,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean)
     {
       ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n"));
 
-// OpenVMS seems to hang and not abort and dump core when abort() is called
-// here. This needs further investigation.
-#if defined (ACE_OPENVMS)
-      ACE_OS::_exit();
-#else
       ACE_OS::abort();
-#endif
       return;
     }
   this->orb_->shutdown (false);
@@ -51,11 +45,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean)
   if (is_clean == 0)
     {
       ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n"));
-#if defined (ACE_OPENVMS)
-      ACE_OS::_exit();
-#else
       ACE_OS::abort();
-#endif
       return;
     }
 
diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp
index d23f910e669..a82748d4990 100644
--- a/TAO/tests/Muxing/Server_Task.cpp
+++ b/TAO/tests/Muxing/Server_Task.cpp
@@ -14,13 +14,9 @@ Server_Task::svc ()
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   try
     {
-#if defined (ACE_OPENVMS)
-      // OpenVMS typically takes a lot longer...
-      ACE_Time_Value tv (360, 0);
-#else
       // run the test for at most 120 seconds...
       ACE_Time_Value tv (120, 0);
-#endif
+
       this->orb_->run (tv);
     }
   catch (const CORBA::Exception&)
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index e57a0724552..be952d708d6 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -65,11 +65,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       else
         {
           Client_Task client_task (receiver.in (),
-#if defined (ACE_OPENVMS)
-                                  750, /* test takes much longer on OpenVMS */
-#else
                                   1000,
-#endif
                                   32768,
                                   ACE_Thread_Manager::instance ());
 
diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
index 2704f3b026d..3f907082468 100644
--- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
@@ -63,12 +63,6 @@ Crasher::handle_timeout (ACE_Time_Value const & ,
 {
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Performing intentional crash
   // %a\n"));
-  // This tests hangs on OpenVMS when abort() is used.
-  // Also see Crashed_Callback test.
-#if defined (ACE_OPENVMS)
-  ACE_OS::_exit ();
-#else
   ACE_OS::abort();
-#endif
   return 0;
 }
diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
index e548316cdc5..3c250bfc2f3 100644
--- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
@@ -6,14 +6,6 @@
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
-#if defined (ACE_OPENVMS)
-// need this to circumvent link error on OpenVMS
-// has to do with interference in template instantiations
-// because multiple executables are build in one directory
-// reuising eachothers object files.
-ACE_Time_Value dum = ACE_Time_Value::zero;
-#endif
-
 int
 parse_args (int argc, ACE_TCHAR *argv[]);
 
diff --git a/TAO/tests/POA/Loader/Servant_Activator.cpp b/TAO/tests/POA/Loader/Servant_Activator.cpp
index 4fea526b473..09279156ab7 100644
--- a/TAO/tests/POA/Loader/Servant_Activator.cpp
+++ b/TAO/tests/POA/Loader/Servant_Activator.cpp
@@ -37,11 +37,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
   // Cannot go from void* to function pointer directly. Cast the void*
   // to long first.
   void *symbol = this->dll_.symbol (factory_function);
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  int function = reinterpret_cast<int> (symbol);
-#else
   intptr_t function = reinterpret_cast<intptr_t> (symbol);
-#endif
 
   servant_supplier_ =
     reinterpret_cast<SERVANT_FACTORY> (function);
@@ -49,11 +45,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
   // Obtain the symbol for the function which will destroy the
   // servant.
   symbol = this->dll_.symbol (garbage_collection_function);
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  function = reinterpret_cast<int> (symbol);
-#else
   function = reinterpret_cast<intptr_t> (symbol);
-#endif
   servant_garbage_collector_ =
     reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function);
 }
diff --git a/TAO/tests/POA/Loader/Servant_Locator.cpp b/TAO/tests/POA/Loader/Servant_Locator.cpp
index be759f8d63f..8c7c5fb12e2 100644
--- a/TAO/tests/POA/Loader/Servant_Locator.cpp
+++ b/TAO/tests/POA/Loader/Servant_Locator.cpp
@@ -39,11 +39,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb,
   // to long first.
   //
   void *symbol = this->dll_.symbol (factory_function);
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  int function = reinterpret_cast<int> (symbol);
-#else
   intptr_t function = reinterpret_cast<intptr_t> (symbol);
-#endif
 
   servant_supplier_ =
     reinterpret_cast<SERVANT_FACTORY> (function);
@@ -51,11 +47,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb,
   // Obtain the symbol for the function which will destroy the
   // servant.
   symbol = this->dll_.symbol (garbage_collection_function);
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  function = reinterpret_cast<int> (symbol);
-#else
   function = reinterpret_cast<intptr_t> (symbol);
-#endif
 
   servant_garbage_collector_ =
     reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function);
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
index 74191316e78..7ffeef724c6 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -73,11 +73,7 @@ ServantManager_i::obtain_servant (const ACE_TCHAR *str,
   // Cannot go from void* to function pointer directly. Cast the void*
   // to long first.
   void *symbol = dll->symbol (create_symbol_.c_str ());
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  int function = reinterpret_cast<int> (symbol);
-#else
   intptr_t function = reinterpret_cast<intptr_t> (symbol);
-#endif
 
   SERVANT_FACTORY servant_creator =
     reinterpret_cast<SERVANT_FACTORY> (function);