From 6587242537bb62b4e54d110a0262c269525966d1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 17 Apr 2019 12:22:55 +0200 Subject: Layout changes * ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp: * ACE/tests/Process_Manager_Test.cpp: * ACE/tests/Reactor_Exceptions_Test.cpp: * ACE/tests/Timer_Cancellation_Test.cpp: * ACE/tests/WFMO_Reactor_Test.cpp: --- ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp | 6 +----- ACE/tests/Process_Manager_Test.cpp | 4 ---- ACE/tests/Reactor_Exceptions_Test.cpp | 1 - ACE/tests/Timer_Cancellation_Test.cpp | 7 +------ ACE/tests/WFMO_Reactor_Test.cpp | 7 +------ 5 files changed, 3 insertions(+), 22 deletions(-) diff --git a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp index f069c1a9056..bae36ea9c0e 100644 --- a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -19,7 +19,6 @@ */ //============================================================================= - #include "test_config.h" #include "ace/Reactor.h" #include "ace/Select_Reactor.h" @@ -36,8 +35,6 @@ #include "ace/OS_NS_sys_socket.h" #include "ace/OS_NS_unistd.h" - - #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT static const char message[] = "abcdefghijklmnopqrstuvwxyz"; @@ -1313,8 +1310,7 @@ test::test (int ignore_nested_upcalls, if (!test_configs[i][1] && require_event_loop_thread) continue; - ACE_Reactor reactor (new REACTOR_IMPL, - 1); + ACE_Reactor reactor (new REACTOR_IMPL, true); testing (&reactor, test_configs[i][0], diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp index 1c13e36df59..d08152588d6 100644 --- a/ACE/tests/Process_Manager_Test.cpp +++ b/ACE/tests/Process_Manager_Test.cpp @@ -17,7 +17,6 @@ */ //============================================================================= - #include "test_config.h" #include "ace/SString.h" #include "ace/Atomic_Op.h" @@ -30,8 +29,6 @@ #include "ace/Thread.h" #include "ace/Reactor.h" - - static u_int debug_test = 0; #if defined (ACE_HAS_WIN32_PRIORITY_CLASS) static u_int process_id = 0; @@ -361,7 +358,6 @@ run_main (int argc, ACE_TCHAR *argv[]) test_status = result; // Try the explicit functions - ACE_Process_Manager mgr; mgr.register_handler (new Exit_Handler ("default")); diff --git a/ACE/tests/Reactor_Exceptions_Test.cpp b/ACE/tests/Reactor_Exceptions_Test.cpp index 2796ac8ee6a..fe06d7813a9 100644 --- a/ACE/tests/Reactor_Exceptions_Test.cpp +++ b/ACE/tests/Reactor_Exceptions_Test.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file Reactor_Exceptions_Test.cpp diff --git a/ACE/tests/Timer_Cancellation_Test.cpp b/ACE/tests/Timer_Cancellation_Test.cpp index 30f4b9cc41b..b48f2a8849c 100644 --- a/ACE/tests/Timer_Cancellation_Test.cpp +++ b/ACE/tests/Timer_Cancellation_Test.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file Timer_Cancellation_Test.cpp @@ -9,15 +8,12 @@ */ //============================================================================= - #include "test_config.h" #include "ace/OS_NS_unistd.h" #include "ace/Reactor.h" #include "ace/TP_Reactor.h" #include "ace/Task.h" - - #if defined (ACE_HAS_THREADS) class Deadlock : public ACE_Task_Base @@ -116,8 +112,7 @@ run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Timer_Cancellation_Test")); - ACE_Reactor reactor (new ACE_TP_Reactor, - 1); + ACE_Reactor reactor (new ACE_TP_Reactor, true); Deadlock deadlock; deadlock.reactor (&reactor); diff --git a/ACE/tests/WFMO_Reactor_Test.cpp b/ACE/tests/WFMO_Reactor_Test.cpp index 9e86f577607..ee85fa70acb 100644 --- a/ACE/tests/WFMO_Reactor_Test.cpp +++ b/ACE/tests/WFMO_Reactor_Test.cpp @@ -10,14 +10,11 @@ */ //============================================================================= - #include "test_config.h" #include "ace/Reactor.h" #include "ace/WFMO_Reactor.h" #include "ace/Pipe.h" - - #if defined (ACE_WIN32) static int number_of_handlers = 6; @@ -26,13 +23,11 @@ static int number_of_closes = 0; class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (ACE_Reactor &reactor); ~Event_Handler (void); ACE_Pipe pipe_; - }; Event_Handler::Event_Handler (ACE_Reactor &reactor) @@ -78,7 +73,7 @@ test (void) int result = 0; int i = 0; - ACE_Reactor reactor (new ACE_WFMO_Reactor, 1); + ACE_Reactor reactor (new ACE_WFMO_Reactor, true); ACE_Event_Handler_var *safe_event_handlers = new ACE_Event_Handler_var[number_of_handlers]; -- cgit v1.2.1