Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ACE/tests/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,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
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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 */
4 changes: 2 additions & 2 deletions ACE/tests/run_test.lst
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,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
Expand Down
12 changes: 6 additions & 6 deletions ACE/tests/tests.mpc
Original file line number Diff line number Diff line change
Expand Up @@ -1488,17 +1488,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
}
}
Comment thread
jwillemsen marked this conversation as resolved.

Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/tests/Notify/Basic/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
/MultiTypes
/Sequence
/Simple
/Updates
/Upd
ExtendedFilter
2 changes: 1 addition & 1 deletion TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ project(*Notify Extended Filter): notifytest {
}

project(*Notify Updates): notifytest {
exename = Updates
exename = Upd
Source_Files {
Updates.cpp
}
Expand Down
4 changes: 2 additions & 2 deletions TAO/orbsvcs/tests/Notify/Basic/README
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -107,4 +107,4 @@ command line options:
-SupplierBatchSize [count]
-ConsumerBatchSize [count]
-ConsumerDelay [delay]
-InitialDelay [delay]
-InitialDelay [delay]
2 changes: 1 addition & 1 deletion TAO/orbsvcs/tests/Notify/Basic/run_test.pl
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
name => "Filter",
args => "",
}, {
name => "Updates",
name => "Upd",
args => "",
}, {
name => "Sequence",
Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
name => "Filter",
args => "-ORBConnectIPV6Only 1",
}, {
name => "Updates",
name => "Upd",
args => "-ORBConnectIPV6Only 1",
}, {
name => "Sequence",
Expand Down
Loading