Merge pull request #2495 from DOCGroup/mergify/bp/ace6tao2/pr-2494

Shorten Dispatch to Disp, Dispatch triggers for a Win32 application t… (backport #2494)

Author: jwillemsen

ACE/tests/.gitignore

@@ -195,8 +195,8 @@
 /QtReactor_Test
 /QtReactor_Test_moc.cpp
 /RB_Tree_Test
-/Reactor_Dispatch_Order_Test
-/Reactor_Dispatch_Order_Test_Dev_Poll
+/Reactor_Disp_Order_Test
+/Reactor_Disp_Order_Test_Dev_Poll
 /Reactor_Exceptions_Test
 /Reactor_Fairness_Test
 /Reactor_Notification_Queue_Test

ACE/tests/Reactor_Dispatch_Order_Test.cpp ACE/tests/Reactor_Disp_Order_Test.cppACE/tests/Reactor_Dispatch_Order_Test.cpp renamed to ACE/tests/Reactor_Disp_Order_Test.cpp

@@ -1,7 +1,7 @@
 
 //=============================================================================
 /**
- *  @file    Reactor_Dispatch_Order_Test.cpp
+ *  @file    Reactor_Disp_Order_Test.cpp
  *
  *  This is a simple test that checks the order of dispatching of
  *  ACE Reactors.  Order should be: timeout, output, and then input.
@@ -257,7 +257,7 @@ test_reactor_dispatch_order (ACE_Reactor &reactor)
 int
 run_main (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST (ACE_TEXT ("Reactor_Dispatch_Order_Test"));
+  ACE_START_TEST (ACE_TEXT ("Reactor_Disp_Order_Test"));
 
   int result = 0;
   ACE_Select_Reactor select_reactor_impl;

…Reactor_Dispatch_Order_Test_Dev_Poll.cpp …sts/Reactor_Disp_Order_Test_Dev_Poll.cppACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp renamed to ACE/tests/Reactor_Disp_Order_Test_Dev_Poll.cpp ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp renamed to ACE/tests/Reactor_Disp_Order_Test_Dev_Poll.cpp

@@ -1,7 +1,7 @@
 
 //=============================================================================
 /**
- *  @file    Reactor_Dispatch_Order_Test_Dev_Poll.cpp
+ *  @file    Reactor_Disp_Order_Test_Dev_Poll.cpp
  *
  *  This is a simple test that checks the order of dispatching of
  *  ACE Reactors.  Order should be: timeout, output, and then input.
@@ -233,29 +233,24 @@ test_reactor_dispatch_order (ACE_Reactor &reactor)
 
   return ok_to_go;
 }
+#endif /* ACE_HAS_DEV_POLL || ACE_HAS_EVENT_POLL */
 
 int
 run_main (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST (ACE_TEXT ("Reactor_Dispatch_Order_Test_Dev_Poll"));
+  ACE_START_TEST (ACE_TEXT ("Reactor_Disp_Order_Test_Dev_Poll"));
   int result = 0;
 
+#if defined (ACE_HAS_DEV_POLL) || defined (ACE_HAS_EVENT_POLL)
   ACE_Dev_Poll_Reactor dev_poll_reactor_impl;
   ACE_Reactor dev_poll_reactor (&dev_poll_reactor_impl);
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing Dev Poll Reactor\n")));
   if (!test_reactor_dispatch_order (dev_poll_reactor))
     ++result;
-
-  ACE_END_TEST;
-  return result;
-}
 #else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("Reactor_Dispatch_Order_Test_Dev_Poll"));
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dev_Poll_Reactor is UNSUPPORTED on this platform\n")));
+#endif /* ACE_HAS_DEV_POLL || ACE_HAS_EVENT_POLL */
+
   ACE_END_TEST;
-  return 0;
+  return result;
 }
-#endif /* ACE_HAS_DEV_POLL || ACE_HAS_EVENT_POLL */

ACE/tests/run_test.lst

@@ -198,8 +198,8 @@ Process_Mutex_Test: !VxWorks !ACE_FOR_TAO !PHARLAP
 Process_Semaphore_Test: !VxWorks !ACE_FOR_TAO !PHARLAP
 RB_Tree_Test
 Bug_3332_Regression_Test
-Reactor_Dispatch_Order_Test
-Reactor_Dispatch_Order_Test_Dev_Poll:
+Reactor_Disp_Order_Test
+Reactor_Disp_Order_Test_Dev_Poll:
 Reactor_Exceptions_Test
 Reactor_Fairness_Test: !FIXED_BUGS_ONLY
 Reactor_Notify_Test: !ST !ACE_FOR_TAO

ACE/tests/tests.mpc

@@ -1462,17 +1462,17 @@ project(Reactor Notification Queue Test) : acetest {
   }
 }
 
-project(Reactor Dispatch Order Test) : acetest {
-  exename = Reactor_Dispatch_Order_Test
+project(Reactor Disp Order Test) : acetest {
+  exename = Reactor_Disp_Order_Test
   Source_Files {
-    Reactor_Dispatch_Order_Test.cpp
+    Reactor_Disp_Order_Test.cpp
   }
 }
 
-project(Reactor_Dispatch_Order_Test_Dev_Poll) : acetest {
-  exename = Reactor_Dispatch_Order_Test_Dev_Poll
+project(Reactor_Disp_Order_Test_Dev_Poll) : acetest {
+  exename = Reactor_Disp_Order_Test_Dev_Poll
   Source_Files {
-    Reactor_Dispatch_Order_Test_Dev_Poll.cpp
+    Reactor_Disp_Order_Test_Dev_Poll.cpp
   }
 }
 

TAO/orbsvcs/tests/Notify/Basic/.gitignore

@@ -7,4 +7,4 @@
 /MultiTypes
 /Sequence
 /Simple
-/Updates
+/Upd

TAO/orbsvcs/tests/Notify/Basic/Basic.mpc

@@ -64,7 +64,7 @@ project(*Notify Extended Filter): notifytest {
 }
 
 project(*Notify Updates): notifytest {
-  exename = Updates
+  exename = Upd
   Source_Files {
     Updates.cpp
   }

TAO/orbsvcs/tests/Notify/Basic/README

@@ -3,7 +3,7 @@
 Basic Tests
 ===========
 
-Updates:
+Upd:
 -------
 This test will check if the subscription and publication update messages
 from the event channel are properly received from the Notify Service.
@@ -107,4 +107,4 @@ command line options:
 -SupplierBatchSize [count]
 -ConsumerBatchSize [count]
 -ConsumerDelay [delay]
--InitialDelay [delay]
+-InitialDelay [delay]

TAO/orbsvcs/tests/Notify/Basic/run_test.pl

@@ -67,7 +67,7 @@
     name => "Filter",
     args => "",
    }, {
-    name => "Updates",
+    name => "Upd",
     args => "",
    }, {
     name => "Sequence",

TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl

@@ -67,7 +67,7 @@
     name => "Filter",
     args => "-ORBConnectIPV6Only 1",
    }, {
-    name => "Updates",
+    name => "Upd",
     args => "-ORBConnectIPV6Only 1",
    }, {
     name => "Sequence",