diff options
| author | Steve Huston <shuston@riverace.com> | 2003-01-04 23:56:04 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2003-01-04 23:56:04 +0000 |
| commit | cf98239d186b778f7160330c411c251212aa26a0 (patch) | |
| tree | 80ec3102ca683d254405ca1034dd960530c2a69d | |
| parent | 58f04f283f602fb062dd31e4f956a64b14d74329 (diff) | |
| download | ATCD-cf98239d186b778f7160330c411c251212aa26a0.tar.gz | |
ChangeLogTag:Sat Jan 4 18:46:19 2003 Steve Huston <shuston@riverace.com>
129 files changed, 1548 insertions, 140 deletions
diff --git a/ChangeLog b/ChangeLog index 8346487407f..5d329750d50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,152 @@ +Sat Jan 4 18:46:19 2003 Steve Huston <shuston@riverace.com> + + * ace/config-aix5.1.h: Add a #define ACE_AIX_VERS 501 if ACE_AIX_VERS + isn't already defined. Helps to build with Visual Age C++ incremental + mode. Support for incremental mode is going away after ACE 5.3, but + this crutch can be used for now. + + * ace/Makefile.ace: Remove SOCK_Dgram_Mcast_T from TEMPLATE_FILES. See + Tue Jun 25 23:22:09 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + + * ace/ace.icc: Corrected the list of source files to build ACE with. + In addition to updating the source list, if building with Visual + Age C++ 5, add the TEMPLATE_FILES to the sources that get compiled. + Visual Age C++ 5 incremental needs to see them all. + + * examples/C++NPv1/Makefile: Add .NOTPARALLEL since some of the + sub-makes share object files and they can get confused. + + * tests/makeicc.pl: Add additional template-getting stuff for + Visual Age C++ 5. + + * tests/ARGV_Test.icc: + * tests/Aio_Platform_Test.icc: + * tests/Arg_Shifter_Test.icc: + * tests/Atomic_Op_Test.icc: + * tests/Auto_IncDec_Test.icc: + * tests/Barrier_Test.icc: + * tests/Basic_Types_Test.icc: + * tests/Bound_Ptr_Test.icc: + * tests/Buffer_Stream_Test.icc: + * tests/CDR_Array_Test.icc: + * tests/CDR_File_Test.icc: + * tests/CDR_Test.icc: + * tests/Cache_Map_Manager_Test.icc: + * tests/Cached_Accept_Conn_Test.icc: + * tests/Cached_Allocator_Test.icc: + * tests/Cached_Conn_Test.icc: + * tests/Capabilities_Test.icc: + * tests/Codecs_Test.icc: + * tests/Collection_Test.icc: + * tests/Config_Test.icc: + * tests/Conn_Test.icc: + * tests/DLL_Test.icc: + * tests/DLL_Test_Impl.icc: + * tests/DLList_Test.icc: + * tests/Date_Time_Test.icc: + * tests/Dev_Poll_Reactor_Test.icc: + * tests/Dirent_Test.icc: + * tests/Dynamic_Priority_Test.icc: + * tests/Enum_Interfaces_Test.icc: + * tests/Env_Value_Test.icc: + * tests/FIFO_Test.icc: + * tests/FlReactor_Test.icc: + * tests/Framework_Component_DLL.icc: + * tests/Framework_Component_Test.icc: + * tests/Future_Set_Test.icc: + * tests/Future_Test.icc: + * tests/Get_Opt_Test.icc: + * tests/Handle_Set_Test.icc: + * tests/Hash_Map_Bucket_Iterator_Test.icc: + * tests/Hash_Map_Manager_Test.icc: + * tests/High_Res_Timer_Test.icc: + * tests/INET_Addr_Test.icc: + * tests/IOStream_Test.icc: + * tests/Lazy_Map_Manager_Test.icc: + * tests/Log_Msg_Test.icc: + * tests/Logging_Strategy_Test.icc: + * tests/MEM_Stream_Test.icc: + * tests/MM_Shared_Memory_Test.icc: + * tests/MT_Reactor_Timer_Test.icc: + * tests/MT_Reactor_Upcall_Test.icc: + * tests/MT_SOCK_Test.icc: + * tests/Malloc_Test.icc: + * tests/Map_Manager_Test.icc: + * tests/Map_Test.icc: + * tests/Max_Default_Port_Test.icc: + * tests/Mem_Map_Test.icc: + * tests/Message_Block_Test.icc: + * tests/Message_Queue_Notifications_Test.icc: + * tests/Message_Queue_Test.icc: + * tests/Message_Queue_Test_Ex.icc: + * tests/Multicast_Test.icc: + * tests/Naming_Test.icc: + * tests/New_Fail_Test.icc: + * tests/Notify_Performance_Test.icc: + * tests/OS_Test.icc: + * tests/Object_Manager_Test.icc: + * tests/Obstack_Test.icc: + * tests/OrdMultiSet_Test.icc: + * tests/Pipe_Test.icc: + * tests/Priority_Buffer_Test.icc: + * tests/Priority_Reactor_Test.icc: + * tests/Priority_Task_Test.icc: + * tests/Proactor_Scatter_Gather_Test.icc: + * tests/Proactor_Test.icc: + * tests/Proactor_Timer_Test.icc: + * tests/Process_Manager_Test.icc: + * tests/Process_Mutex_Test.icc: + * tests/Process_Strategy_Test.icc: + * tests/RB_Tree_Test.icc: + * tests/Reactor_Dispatch_Order_Test.icc: + * tests/Reactor_Exceptions_Test.icc: + * tests/Reactor_Notify_Test.icc: + * tests/Reactor_Performance_Test.icc: + * tests/Reactor_Timer_Test.icc: + * tests/Reactors_Test.icc: + * tests/Reader_Writer_Test.icc: + * tests/Recursive_Condition_Test.icc: + * tests/Recursive_Mutex_Test.icc: + * tests/Refcounted_Auto_Ptr_Test.icc: + * tests/Reverse_Lock_Test.icc: + * tests/SOCK_Connector_Test.icc: + * tests/SOCK_Send_Recv_Test.icc: + * tests/SOCK_Test.icc: + * tests/SPIPE_Test.icc: + * tests/SString_Test.icc: + * tests/SV_Shared_Memory_Test.icc: + * tests/Semaphore_Test.icc: + * tests/Service_Config_DLL.icc: + * tests/Service_Config_Test.icc: + * tests/Signal_Test.icc: + * tests/Sigset_Ops_Test.icc: + * tests/Simple_Message_Block_Test.icc: + * tests/Svc_Handler_Test.icc: + * tests/TP_Reactor_Test.icc: + * tests/TSS_Test.icc: + * tests/Task_Test.icc: + * tests/Thread_Manager_Test.icc: + * tests/Thread_Mutex_Test.icc: + * tests/Thread_Pool_Reactor_Resume_Test.icc: + * tests/Thread_Pool_Reactor_Test.icc: + * tests/Thread_Pool_Test.icc: + * tests/Time_Service_Test.icc: + * tests/Time_Value_Test.icc: + * tests/Timeprobe_Test.icc: + * tests/Timer_Queue_Test.icc: + * tests/TkReactor_Test.icc: + * tests/Token_Strategy_Test.icc: + * tests/Tokens_Test.icc: + * tests/UPIPE_SAP_Test.icc: + * tests/Upgradable_RW_Test.icc: + * tests/Vector_Test.icc: + * tests/XtReactor_Test.icc: Mostly updated to build with Visual Age + C++ 5 in incremental mode. Most of the tests that use templates + don't build. They require explicitly including the needed template + source files names in the .icc file. I don't have time to add them + all now - if anyone uses this compiler, please contact me. No wonder + IBM ditched this piece of junk. + Fri Jan 3 17:58:21 2003 Steve Huston <shuston@riverace.com> * ace/SSL/SSL_Context.cpp: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 8346487407f..5d329750d50 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,152 @@ +Sat Jan 4 18:46:19 2003 Steve Huston <shuston@riverace.com> + + * ace/config-aix5.1.h: Add a #define ACE_AIX_VERS 501 if ACE_AIX_VERS + isn't already defined. Helps to build with Visual Age C++ incremental + mode. Support for incremental mode is going away after ACE 5.3, but + this crutch can be used for now. + + * ace/Makefile.ace: Remove SOCK_Dgram_Mcast_T from TEMPLATE_FILES. See + Tue Jun 25 23:22:09 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + + * ace/ace.icc: Corrected the list of source files to build ACE with. + In addition to updating the source list, if building with Visual + Age C++ 5, add the TEMPLATE_FILES to the sources that get compiled. + Visual Age C++ 5 incremental needs to see them all. + + * examples/C++NPv1/Makefile: Add .NOTPARALLEL since some of the + sub-makes share object files and they can get confused. + + * tests/makeicc.pl: Add additional template-getting stuff for + Visual Age C++ 5. + + * tests/ARGV_Test.icc: + * tests/Aio_Platform_Test.icc: + * tests/Arg_Shifter_Test.icc: + * tests/Atomic_Op_Test.icc: + * tests/Auto_IncDec_Test.icc: + * tests/Barrier_Test.icc: + * tests/Basic_Types_Test.icc: + * tests/Bound_Ptr_Test.icc: + * tests/Buffer_Stream_Test.icc: + * tests/CDR_Array_Test.icc: + * tests/CDR_File_Test.icc: + * tests/CDR_Test.icc: + * tests/Cache_Map_Manager_Test.icc: + * tests/Cached_Accept_Conn_Test.icc: + * tests/Cached_Allocator_Test.icc: + * tests/Cached_Conn_Test.icc: + * tests/Capabilities_Test.icc: + * tests/Codecs_Test.icc: + * tests/Collection_Test.icc: + * tests/Config_Test.icc: + * tests/Conn_Test.icc: + * tests/DLL_Test.icc: + * tests/DLL_Test_Impl.icc: + * tests/DLList_Test.icc: + * tests/Date_Time_Test.icc: + * tests/Dev_Poll_Reactor_Test.icc: + * tests/Dirent_Test.icc: + * tests/Dynamic_Priority_Test.icc: + * tests/Enum_Interfaces_Test.icc: + * tests/Env_Value_Test.icc: + * tests/FIFO_Test.icc: + * tests/FlReactor_Test.icc: + * tests/Framework_Component_DLL.icc: + * tests/Framework_Component_Test.icc: + * tests/Future_Set_Test.icc: + * tests/Future_Test.icc: + * tests/Get_Opt_Test.icc: + * tests/Handle_Set_Test.icc: + * tests/Hash_Map_Bucket_Iterator_Test.icc: + * tests/Hash_Map_Manager_Test.icc: + * tests/High_Res_Timer_Test.icc: + * tests/INET_Addr_Test.icc: + * tests/IOStream_Test.icc: + * tests/Lazy_Map_Manager_Test.icc: + * tests/Log_Msg_Test.icc: + * tests/Logging_Strategy_Test.icc: + * tests/MEM_Stream_Test.icc: + * tests/MM_Shared_Memory_Test.icc: + * tests/MT_Reactor_Timer_Test.icc: + * tests/MT_Reactor_Upcall_Test.icc: + * tests/MT_SOCK_Test.icc: + * tests/Malloc_Test.icc: + * tests/Map_Manager_Test.icc: + * tests/Map_Test.icc: + * tests/Max_Default_Port_Test.icc: + * tests/Mem_Map_Test.icc: + * tests/Message_Block_Test.icc: + * tests/Message_Queue_Notifications_Test.icc: + * tests/Message_Queue_Test.icc: + * tests/Message_Queue_Test_Ex.icc: + * tests/Multicast_Test.icc: + * tests/Naming_Test.icc: + * tests/New_Fail_Test.icc: + * tests/Notify_Performance_Test.icc: + * tests/OS_Test.icc: + * tests/Object_Manager_Test.icc: + * tests/Obstack_Test.icc: + * tests/OrdMultiSet_Test.icc: + * tests/Pipe_Test.icc: + * tests/Priority_Buffer_Test.icc: + * tests/Priority_Reactor_Test.icc: + * tests/Priority_Task_Test.icc: + * tests/Proactor_Scatter_Gather_Test.icc: + * tests/Proactor_Test.icc: + * tests/Proactor_Timer_Test.icc: + * tests/Process_Manager_Test.icc: + * tests/Process_Mutex_Test.icc: + * tests/Process_Strategy_Test.icc: + * tests/RB_Tree_Test.icc: + * tests/Reactor_Dispatch_Order_Test.icc: + * tests/Reactor_Exceptions_Test.icc: + * tests/Reactor_Notify_Test.icc: + * tests/Reactor_Performance_Test.icc: + * tests/Reactor_Timer_Test.icc: + * tests/Reactors_Test.icc: + * tests/Reader_Writer_Test.icc: + * tests/Recursive_Condition_Test.icc: + * tests/Recursive_Mutex_Test.icc: + * tests/Refcounted_Auto_Ptr_Test.icc: + * tests/Reverse_Lock_Test.icc: + * tests/SOCK_Connector_Test.icc: + * tests/SOCK_Send_Recv_Test.icc: + * tests/SOCK_Test.icc: + * tests/SPIPE_Test.icc: + * tests/SString_Test.icc: + * tests/SV_Shared_Memory_Test.icc: + * tests/Semaphore_Test.icc: + * tests/Service_Config_DLL.icc: + * tests/Service_Config_Test.icc: + * tests/Signal_Test.icc: + * tests/Sigset_Ops_Test.icc: + * tests/Simple_Message_Block_Test.icc: + * tests/Svc_Handler_Test.icc: + * tests/TP_Reactor_Test.icc: + * tests/TSS_Test.icc: + * tests/Task_Test.icc: + * tests/Thread_Manager_Test.icc: + * tests/Thread_Mutex_Test.icc: + * tests/Thread_Pool_Reactor_Resume_Test.icc: + * tests/Thread_Pool_Reactor_Test.icc: + * tests/Thread_Pool_Test.icc: + * tests/Time_Service_Test.icc: + * tests/Time_Value_Test.icc: + * tests/Timeprobe_Test.icc: + * tests/Timer_Queue_Test.icc: + * tests/TkReactor_Test.icc: + * tests/Token_Strategy_Test.icc: + * tests/Tokens_Test.icc: + * tests/UPIPE_SAP_Test.icc: + * tests/Upgradable_RW_Test.icc: + * tests/Vector_Test.icc: + * tests/XtReactor_Test.icc: Mostly updated to build with Visual Age + C++ 5 in incremental mode. Most of the tests that use templates + don't build. They require explicitly including the needed template + source files names in the .icc file. I don't have time to add them + all now - if anyone uses this compiler, please contact me. No wonder + IBM ditched this piece of junk. + Fri Jan 3 17:58:21 2003 Steve Huston <shuston@riverace.com> * ace/SSL/SSL_Context.cpp: diff --git a/ace/Makefile.ace b/ace/Makefile.ace index 6d42407884d..9ae769d91e1 100644 --- a/ace/Makefile.ace +++ b/ace/Makefile.ace @@ -302,7 +302,6 @@ TEMPLATE_FILES = \ RB_Tree \ Select_Reactor_T \ Singleton \ - SOCK_Dgram_Mcast_T \ Strategies_T \ Stream \ Stream_Modules \ diff --git a/ace/ace.icc b/ace/ace.icc index 2837bebb2ed..cbdf73f38b0 100755 --- a/ace/ace.icc +++ b/ace/ace.icc @@ -11,6 +11,7 @@ group OS_FILES = "OS.cpp", "OS_Dirent.cpp", "OS_Memory.cpp", + "OS_QoS.cpp", "OS_String.cpp", "OS_TLI.cpp", "OS_Errno.cpp", @@ -28,6 +29,7 @@ group OS_INCLUDES = "OS.h", "OS_Dirent.h", "OS_Memory.h", + "OS_QoS.h", "OS_String.h", "OS_TLI.h", "OS_Errno.h", @@ -46,7 +48,6 @@ group UTILS_FILES = "ARGV.cpp", "Argv_Type_Converter.cpp", "Capabilities.cpp", - "Connection_Recycling_Strategy.cpp", "Containers.cpp", "Configuration.cpp", "Configuration_Import_Export.cpp", @@ -57,22 +58,23 @@ group UTILS_FILES = "Framework_Component.cpp", "Functor.cpp", "Get_Opt.cpp", - "Handle_Ops.cpp", "Hash_Map_Manager.cpp", + "Connection_Recycling_Strategy.cpp", "Hashable.cpp", + "Notification_Strategy.cpp", + "Recyclable.cpp", + "Refcountable.cpp", + "Handle_Ops.cpp", "Init_ACE.cpp", "Lib_Find.cpp", "Message_Block.cpp", "Method_Request.cpp", - "Notification_Strategy.cpp", "Object_Manager.cpp", - "Recyclable.cpp", - "Refcountable.cpp", "Registry.cpp", - "Sample_History.cpp", + "String_Base_Const.cpp", "SString.cpp", "Stats.cpp", - "String_Base_Const.cpp" + "Sample_History.cpp" // #### NOTE: see below for Filecache. group UTILS_INCLUDES = @@ -82,7 +84,6 @@ group UTILS_INCLUDES = "ARGV.h", "Argv_Type_Converter.h", "Capabilities.h", - "Connection_Recycling_Strategy.h", "Containers.h", "Configuration.h", "Configuration_Import_Export.h", @@ -93,23 +94,23 @@ group UTILS_INCLUDES = "Framework_Component.h", "Functor.h", "Get_Opt.h", - "Handle_Ops.h", "Hash_Map_Manager.h", + "Connection_Recycling_Strategy.h", "Hashable.h", - "High_Res_Timer.h", + "Notification_Strategy.h", + "Recyclable.h", + "Refcountable.h", + "Handle_Ops.h", "Init_ACE.h", "Lib_Find.h", "Message_Block.h", "Method_Request.h", - "Notification_Strategy.h", "Object_Manager.h", - "Recyclable.h", - "Refcountable.h", "Registry.h", - "Sample_History.h", + "String_Base_Const.h", "SString.h", "Stats.h", - "String_Base_Const.h" + "Sample_History.h" // #### NOTE: see below for Filecache. group LOGGING_FILES = @@ -138,6 +139,7 @@ group LOGGING_INCLUDES = group THREADS_FILES = "Activation_Queue.cpp", + "Atomic_Op.cpp", "Process.cpp", "Process_Manager.cpp", "Synch.cpp", @@ -155,6 +157,7 @@ group THREADS_FILES = group THREADS_INCLUDES = "Activation_Queue.h", + "Atomic_Op.h", "Process.h", "Process_Manager.h", "Synch.h", @@ -171,7 +174,6 @@ group THREADS_INCLUDES = "Token.h" group DEMUX_FILES = - "Dev_Poll_Reactor.cpp", "Event_Handler.cpp", "FlReactor.cpp", "Msg_WFMO_Reactor.cpp", @@ -184,6 +186,7 @@ group DEMUX_FILES = "Select_Reactor.cpp", "Select_Reactor_Base.cpp", "SUN_Proactor.cpp", + "Dev_Poll_Reactor.cpp", "TP_Reactor.cpp", "TkReactor.cpp", "WFMO_Reactor.cpp", @@ -191,7 +194,6 @@ group DEMUX_FILES = "QtReactor.cpp" group DEMUX_INCLUDES = - "Dev_Poll_Reactor.h", "Event_Handler.h", "FlReactor.h", "Msg_WFMO_Reactor.h", @@ -204,6 +206,7 @@ group DEMUX_INCLUDES = "Select_Reactor.h", "Select_Reactor_Base.h", "SUN_Proactor.h", + "Dev_Poll_Reactor.h", "TP_Reactor.h", "TkReactor.h", "WFMO_Reactor.h", @@ -370,6 +373,7 @@ group IPC_INCLUDES = group SVCCONF_FILES = "DLL.cpp", + "DLL_Manager.cpp", "Dynamic_Service_Base.cpp", "Parse_Node.cpp", "Service_Config.cpp", @@ -386,6 +390,7 @@ group SVCCONF_FILES = group SVCCONF_INCLUDES = "DLL.h", + "DLL_Manager.h", "Dynamic_Service_Base.h", "Parse_Node.h", "Service_Config.h", @@ -485,6 +490,12 @@ group TOKEN_INCLUDES = "Token_Manager.h", "Token_Request_Reply.h" +group CODECS_FILES = + "Codecs.cpp" + +group CODECS_INCLUDES = + "Codecs.h" + group OTHER_FILES = "Local_Name_Space.cpp", "Name_Proxy.cpp", @@ -512,10 +523,10 @@ group TEMPLATE_FILES = "Unbounded_Queue.cpp", "Asynch_Acceptor.cpp", "Asynch_Connector.cpp", + "Atomic_Op_T.cpp", "Auto_IncDec_T.cpp", "Auto_Ptr.cpp", "Based_Pointer_T.cpp", - "Bound_Ptr.cpp", "Connector.cpp", "Containers_T.cpp", "Cache_Map_Manager_T.cpp", @@ -549,7 +560,6 @@ group TEMPLATE_FILES = "Module.cpp", "Obstack_T.cpp", "Pair_T.cpp", - "Refcounted_Auto_Ptr.cpp", "RB_Tree.cpp", "Select_Reactor_T.cpp", "Singleton.cpp", @@ -603,6 +613,7 @@ option MEMORY_INCLUDES, TIMER_INCLUDES, TOKEN_INCLUDES, + CODECS_INCLUDES, OTHER_INCLUDES, "config.h", "config-aix-4.x.h", @@ -625,8 +636,11 @@ option MEMORY_FILES, TIMER_FILES, TOKEN_FILES, + CODECS_FILES, OTHER_FILES - + if ($__IBMCPP__ >= 500) { + source type(cpp) TEMPLATE_FILES + } source type (lib) "libtli_r.a" source type (lib) "libpthreads.a" source type (lib) "libc_r.a" @@ -635,3 +649,4 @@ option source type (imp) "pse.exp" } } + diff --git a/ace/config-aix5.1.h b/ace/config-aix5.1.h index c31eebd07fb..8103f64d902 100644 --- a/ace/config-aix5.1.h +++ b/ace/config-aix5.1.h @@ -2,6 +2,14 @@ // // Config file for AIX 5.1 +// This define is needed for building with Visual Age C++ 5 in incremental +// mode. In the batch mode build, platform_aix_ibm.GNU sets it. The incremental +// mode compiler won't be supported after ACE 5.3, so this will also go away +// in that timeframe, so don't worry about future AIX versions. +#if !defined (ACE_AIX_VERS) +# define ACE_AIX_VERS 501 +#endif + #include "ace/config-aix-4.x.h" // AIX 5.1 has AIO, but it doesn't have the same API as other POSIX diff --git a/examples/C++NPv1/Makefile b/examples/C++NPv1/Makefile index 62b894894f0..44164920b31 100644 --- a/examples/C++NPv1/Makefile +++ b/examples/C++NPv1/Makefile @@ -18,6 +18,10 @@ MKLIST = Makefile.Iterative_Logging_Server \ Makefile.RT_Thread_Per_Connection_Logging_Server \ Makefile.Thread_Per_Connection_Logging_Server +## Ensure that Makefiles in MKLIST are executed in sequence during a +## parallel build because we share some files between multiple libraries. +.NOTPARALLEL: + ## Makefile.Reactive_Logging_Server_Ex.mkfile is a dummy target which will cause ## $(MAKE) -f Makefile.Reactive_Logging_Server_Ex to be invoked %.mkfile: % diff --git a/tests/ARGV_Test.icc b/tests/ARGV_Test.icc index 06bae6dbff1..1c680df53f4 100644 --- a/tests/ARGV_Test.icc +++ b/tests/ARGV_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "ARGV_Test" { source type (cpp) "ARGV_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Aio_Platform_Test.icc b/tests/Aio_Platform_Test.icc index da98d0feb29..84a29830c65 100644 --- a/tests/Aio_Platform_Test.icc +++ b/tests/Aio_Platform_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Aio_Platform_Test" { source type (cpp) "Aio_Platform_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Arg_Shifter_Test.icc b/tests/Arg_Shifter_Test.icc index ae8bc3663f5..88152cc564f 100644 --- a/tests/Arg_Shifter_Test.icc +++ b/tests/Arg_Shifter_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Arg_Shifter_Test" { source type (cpp) "Arg_Shifter_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Atomic_Op_Test.icc b/tests/Atomic_Op_Test.icc index fc9a5358dc0..8cfc61da6b6 100644 --- a/tests/Atomic_Op_Test.icc +++ b/tests/Atomic_Op_Test.icc @@ -10,6 +10,14 @@ option target type (exe) "Atomic_Op_Test" { source type (cpp) "Atomic_Op_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + source type (cpp) "../ace/Atomic_Op_T.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Auto_IncDec_Test.icc b/tests/Auto_IncDec_Test.icc index 0a52bc3343a..e9f58398f6a 100644 --- a/tests/Auto_IncDec_Test.icc +++ b/tests/Auto_IncDec_Test.icc @@ -10,6 +10,15 @@ option target type (exe) "Auto_IncDec_Test" { source type (cpp) "Auto_IncDec_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + source type (cpp) "../ace/Atomic_Op_T.cpp" + source type (cpp) "../ace/Auto_IncDec_T.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Barrier_Test.icc b/tests/Barrier_Test.icc index 2c706cb2371..742a126255a 100644 --- a/tests/Barrier_Test.icc +++ b/tests/Barrier_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Barrier_Test" { source type (cpp) "Barrier_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Basic_Types_Test.icc b/tests/Basic_Types_Test.icc index 56e45d6be97..b5af29920bf 100644 --- a/tests/Basic_Types_Test.icc +++ b/tests/Basic_Types_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Basic_Types_Test" { source type (cpp) "Basic_Types_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Bound_Ptr_Test.icc b/tests/Bound_Ptr_Test.icc index e3a686594ab..53091b8f110 100644 --- a/tests/Bound_Ptr_Test.icc +++ b/tests/Bound_Ptr_Test.icc @@ -10,6 +10,14 @@ option target type (exe) "Bound_Ptr_Test" { source type (cpp) "Bound_Ptr_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + source type (cpp) "../ace/Task_T.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Buffer_Stream_Test.icc b/tests/Buffer_Stream_Test.icc index 5f8e3a8bca6..80d4569332f 100644 --- a/tests/Buffer_Stream_Test.icc +++ b/tests/Buffer_Stream_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Buffer_Stream_Test" { source type (cpp) "Buffer_Stream_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/CDR_Array_Test.icc b/tests/CDR_Array_Test.icc index f3dcf14c56c..3e2878c3ebe 100644 --- a/tests/CDR_Array_Test.icc +++ b/tests/CDR_Array_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "CDR_Array_Test" { source type (cpp) "CDR_Array_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/CDR_File_Test.icc b/tests/CDR_File_Test.icc index c0687839b1f..bfa344c409d 100644 --- a/tests/CDR_File_Test.icc +++ b/tests/CDR_File_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "CDR_File_Test" { source type (cpp) "CDR_File_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/CDR_Test.icc b/tests/CDR_Test.icc index e4fa7cbbc08..2e2b6f814d8 100644 --- a/tests/CDR_Test.icc +++ b/tests/CDR_Test.icc @@ -10,6 +10,14 @@ option target type (exe) "CDR_Test" { source type (cpp) "CDR_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + source type (cpp) "../ace/String_Base.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Cache_Map_Manager_Test.icc b/tests/Cache_Map_Manager_Test.icc index 18324753653..f2311907675 100644 --- a/tests/Cache_Map_Manager_Test.icc +++ b/tests/Cache_Map_Manager_Test.icc @@ -10,6 +10,21 @@ option target type (exe) "Cache_Map_Manager_Test" { source type (cpp) "Cache_Map_Manager_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + source type (cpp) "../ace/Cache_Map_Manager_T.cpp" + source type (cpp) "../ace/Map_Manager.cpp" + source type (cpp) "../ace/Caching_Strategies_T.cpp" + source type (cpp) "../ace/Caching_Utility_T.cpp" + source type (cpp) "../ace/Hash_Cache_Map_Manager_T.cpp" + source type (cpp) "../ace/Hash_Map_Manager_T.cpp" + source type (cpp) "../ace/Pair_T.cpp" + source type (cpp) "../ace/Functor_T.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Cached_Accept_Conn_Test.icc b/tests/Cached_Accept_Conn_Test.icc index 086e4a49dca..49291da36a6 100644 --- a/tests/Cached_Accept_Conn_Test.icc +++ b/tests/Cached_Accept_Conn_Test.icc @@ -10,6 +10,19 @@ option target type (exe) "Cached_Accept_Conn_Test" { source type (cpp) "Cached_Accept_Conn_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + source type (cpp) "../ace/Unbounded_Set.cpp" + source type (cpp) "../ace/Acceptor.cpp" + source type (cpp) "../ace/Connector.cpp" + source type (cpp) "../ace/Svc_Handler.cpp" + source type (cpp) "../ace/Caching_Strategies_T.cpp" + source type (cpp) "../ace/Strategies_T.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Cached_Allocator_Test.icc b/tests/Cached_Allocator_Test.icc new file mode 100644 index 00000000000..a82c51f1338 --- /dev/null +++ b/tests/Cached_Allocator_Test.icc @@ -0,0 +1,22 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type (exe) "Cached_Allocator_Test" + { + source type (cpp) "Cached_Allocator_Test.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/Cached_Conn_Test.icc b/tests/Cached_Conn_Test.icc index fad52af6a60..7d9a32425a3 100644 --- a/tests/Cached_Conn_Test.icc +++ b/tests/Cached_Conn_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Cached_Conn_Test" { source type (cpp) "Cached_Conn_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Capabilities_Test.icc b/tests/Capabilities_Test.icc index 54c5675925c..051f51f1f8f 100644 --- a/tests/Capabilities_Test.icc +++ b/tests/Capabilities_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Capabilities_Test" { source type (cpp) "Capabilities_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Codecs_Test.icc b/tests/Codecs_Test.icc new file mode 100644 index 00000000000..dcfc828b5b8 --- /dev/null +++ b/tests/Codecs_Test.icc @@ -0,0 +1,22 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type (exe) "Codecs_Test" + { + source type (cpp) "Codecs_Test.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/Collection_Test.icc b/tests/Collection_Test.icc index 64c778b20e0..cb3c5c98af8 100644 --- a/tests/Collection_Test.icc +++ b/tests/Collection_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Collection_Test" { source type (cpp) "Collection_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Config_Test.icc b/tests/Config_Test.icc index 2236d8d6680..5a04a900f03 100644 --- a/tests/Config_Test.icc +++ b/tests/Config_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Config_Test" { source type (cpp) "Config_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Conn_Test.icc b/tests/Conn_Test.icc index e96c2979c1d..6734595ce92 100644 --- a/tests/Conn_Test.icc +++ b/tests/Conn_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Conn_Test" { source type (cpp) "Conn_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/DLL_Test.icc b/tests/DLL_Test.icc index 6c974f63473..5f4b2589fa5 100644 --- a/tests/DLL_Test.icc +++ b/tests/DLL_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "DLL_Test" { source type (cpp) "DLL_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/DLL_Test_Impl.icc b/tests/DLL_Test_Impl.icc new file mode 100644 index 00000000000..27bd28e1cfb --- /dev/null +++ b/tests/DLL_Test_Impl.icc @@ -0,0 +1,25 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(exportAll), + link(linkwithsharedlib), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type ( shr ) "shr.o" + { + run after sources("shr.o") targets ("libDLL_Test.a") "ar -r -u libDLL_Test.a shr.o", "rm -rf shr.o" + run cleanup "rm -rf libDLL_Test.a shr.o" + + source type (cpp) "DLL_Test_Impl.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/DLList_Test.icc b/tests/DLList_Test.icc index 9868a24384b..b01633eccb3 100644 --- a/tests/DLList_Test.icc +++ b/tests/DLList_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "DLList_Test" { source type (cpp) "DLList_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Date_Time_Test.icc b/tests/Date_Time_Test.icc index 3140edab5a1..88912fb385d 100644 --- a/tests/Date_Time_Test.icc +++ b/tests/Date_Time_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Date_Time_Test" { source type (cpp) "Date_Time_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Dev_Poll_Reactor_Test.icc b/tests/Dev_Poll_Reactor_Test.icc new file mode 100644 index 00000000000..a568a93d647 --- /dev/null +++ b/tests/Dev_Poll_Reactor_Test.icc @@ -0,0 +1,22 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type (exe) "Dev_Poll_Reactor_Test" + { + source type (cpp) "Dev_Poll_Reactor_Test.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/Dirent_Test.icc b/tests/Dirent_Test.icc index a1f36185095..4b1d0ced6c1 100644 --- a/tests/Dirent_Test.icc +++ b/tests/Dirent_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Dirent_Test" { source type (cpp) "Dirent_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Dynamic_Priority_Test.icc b/tests/Dynamic_Priority_Test.icc index 711a275c1fe..f65129c147a 100644 --- a/tests/Dynamic_Priority_Test.icc +++ b/tests/Dynamic_Priority_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Dynamic_Priority_Test" { source type (cpp) "Dynamic_Priority_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Enum_Interfaces_Test.icc b/tests/Enum_Interfaces_Test.icc index 6e10cae7cb6..11c826d404f 100644 --- a/tests/Enum_Interfaces_Test.icc +++ b/tests/Enum_Interfaces_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Enum_Interfaces_Test" { source type (cpp) "Enum_Interfaces_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Env_Value_Test.icc b/tests/Env_Value_Test.icc index 94cfede3007..8c167d2040c 100644 --- a/tests/Env_Value_Test.icc +++ b/tests/Env_Value_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Env_Value_Test" { source type (cpp) "Env_Value_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/FIFO_Test.icc b/tests/FIFO_Test.icc new file mode 100644 index 00000000000..ef614df6ac0 --- /dev/null +++ b/tests/FIFO_Test.icc @@ -0,0 +1,22 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type (exe) "FIFO_Test" + { + source type (cpp) "FIFO_Test.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/FlReactor_Test.icc b/tests/FlReactor_Test.icc index 083783ffab5..c84dd9ad345 100644 --- a/tests/FlReactor_Test.icc +++ b/tests/FlReactor_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "FlReactor_Test" { source type (cpp) "FlReactor_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Framework_Component_DLL.icc b/tests/Framework_Component_DLL.icc new file mode 100644 index 00000000000..51300823965 --- /dev/null +++ b/tests/Framework_Component_DLL.icc @@ -0,0 +1,25 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(exportAll), + link(linkwithsharedlib), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type ( shr ) "shr.o" + { + run after sources("shr.o") targets ("libFramework_Component_DLL.a") "ar -r -u libFramework_Component_DLL.a shr.o", "rm -rf shr.o" + run cleanup "rm -rf libFramework_Component_DLL.a shr.o" + + source type (cpp) "Framework_Component_DLL.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/Framework_Component_Test.icc b/tests/Framework_Component_Test.icc index cb8caeb442f..4293e831fdd 100644 --- a/tests/Framework_Component_Test.icc +++ b/tests/Framework_Component_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Framework_Component_Test" { source type (cpp) "Framework_Component_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Future_Set_Test.icc b/tests/Future_Set_Test.icc index d088c8d6f71..7bc18037612 100644 --- a/tests/Future_Set_Test.icc +++ b/tests/Future_Set_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Future_Set_Test" { source type (cpp) "Future_Set_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Future_Test.icc b/tests/Future_Test.icc index ccafe087791..2c6a98d635b 100644 --- a/tests/Future_Test.icc +++ b/tests/Future_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Future_Test" { source type (cpp) "Future_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Get_Opt_Test.icc b/tests/Get_Opt_Test.icc index a3e18db1fb0..44c63990015 100644 --- a/tests/Get_Opt_Test.icc +++ b/tests/Get_Opt_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Get_Opt_Test" { source type (cpp) "Get_Opt_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Handle_Set_Test.icc b/tests/Handle_Set_Test.icc index b50cda29052..724a7c2627a 100644 --- a/tests/Handle_Set_Test.icc +++ b/tests/Handle_Set_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Handle_Set_Test" { source type (cpp) "Handle_Set_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Hash_Map_Bucket_Iterator_Test.icc b/tests/Hash_Map_Bucket_Iterator_Test.icc index 765b9fa77aa..83615f80a46 100644 --- a/tests/Hash_Map_Bucket_Iterator_Test.icc +++ b/tests/Hash_Map_Bucket_Iterator_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Hash_Map_Bucket_Iterator_Test" { source type (cpp) "Hash_Map_Bucket_Iterator_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Hash_Map_Manager_Test.icc b/tests/Hash_Map_Manager_Test.icc index 136d8dbc80f..859650f2ba8 100644 --- a/tests/Hash_Map_Manager_Test.icc +++ b/tests/Hash_Map_Manager_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Hash_Map_Manager_Test" { source type (cpp) "Hash_Map_Manager_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/High_Res_Timer_Test.icc b/tests/High_Res_Timer_Test.icc index a5a6694b0b6..2a7912f956d 100644 --- a/tests/High_Res_Timer_Test.icc +++ b/tests/High_Res_Timer_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "High_Res_Timer_Test" { source type (cpp) "High_Res_Timer_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/INET_Addr_Test.icc b/tests/INET_Addr_Test.icc index c897cdf43db..9f64c7e56ac 100644 --- a/tests/INET_Addr_Test.icc +++ b/tests/INET_Addr_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "INET_Addr_Test" { source type (cpp) "INET_Addr_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/IOStream_Test.icc b/tests/IOStream_Test.icc index 923ed7a43bd..ad3512552e9 100644 --- a/tests/IOStream_Test.icc +++ b/tests/IOStream_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "IOStream_Test" { source type (cpp) "IOStream_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Lazy_Map_Manager_Test.icc b/tests/Lazy_Map_Manager_Test.icc index a7af6543df2..74fb75ab22f 100644 --- a/tests/Lazy_Map_Manager_Test.icc +++ b/tests/Lazy_Map_Manager_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Lazy_Map_Manager_Test" { source type (cpp) "Lazy_Map_Manager_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Log_Msg_Test.icc b/tests/Log_Msg_Test.icc index c6a244abd00..23a13d793f4 100644 --- a/tests/Log_Msg_Test.icc +++ b/tests/Log_Msg_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Log_Msg_Test" { source type (cpp) "Log_Msg_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Logging_Strategy_Test.icc b/tests/Logging_Strategy_Test.icc index 10bc4939725..b3915a4ac6d 100644 --- a/tests/Logging_Strategy_Test.icc +++ b/tests/Logging_Strategy_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Logging_Strategy_Test" { source type (cpp) "Logging_Strategy_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/MEM_Stream_Test.icc b/tests/MEM_Stream_Test.icc index e2f00ffe494..7e255ac1a8b 100644 --- a/tests/MEM_Stream_Test.icc +++ b/tests/MEM_Stream_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "MEM_Stream_Test" { source type (cpp) "MEM_Stream_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/MM_Shared_Memory_Test.icc b/tests/MM_Shared_Memory_Test.icc index 3815c99b9db..1a486887057 100644 --- a/tests/MM_Shared_Memory_Test.icc +++ b/tests/MM_Shared_Memory_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "MM_Shared_Memory_Test" { source type (cpp) "MM_Shared_Memory_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/MT_Reactor_Timer_Test.icc b/tests/MT_Reactor_Timer_Test.icc index d34a02ec696..b4507698598 100644 --- a/tests/MT_Reactor_Timer_Test.icc +++ b/tests/MT_Reactor_Timer_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "MT_Reactor_Timer_Test" { source type (cpp) "MT_Reactor_Timer_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/MT_Reactor_Upcall_Test.icc b/tests/MT_Reactor_Upcall_Test.icc index 75d28309e0e..54cecaf52e7 100644 --- a/tests/MT_Reactor_Upcall_Test.icc +++ b/tests/MT_Reactor_Upcall_Test.icc @@ -7,9 +7,16 @@ option link(linkWithMultiThreadLib,yes), link(debug) { - target type (exe) "MT_Reactor_Upcall_Test" - { - source type (cpp) "MT_Reactor_Upcall_Test.cpp" - source platformLinkLibs - } + target type (exe) "MT_Reactor_Upcall_Test" + { + source type (cpp) "MT_Reactor_Upcall_Test.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs + } } diff --git a/tests/MT_SOCK_Test.icc b/tests/MT_SOCK_Test.icc index 77d2b7b0698..66a7edc1164 100644 --- a/tests/MT_SOCK_Test.icc +++ b/tests/MT_SOCK_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "MT_SOCK_Test" { source type (cpp) "MT_SOCK_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Malloc_Test.icc b/tests/Malloc_Test.icc index 8733c62934c..98de9090555 100644 --- a/tests/Malloc_Test.icc +++ b/tests/Malloc_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Malloc_Test" { source type (cpp) "Malloc_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Map_Manager_Test.icc b/tests/Map_Manager_Test.icc index 0aef50e3dc9..758dca5b580 100644 --- a/tests/Map_Manager_Test.icc +++ b/tests/Map_Manager_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Map_Manager_Test" { source type (cpp) "Map_Manager_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Map_Test.icc b/tests/Map_Test.icc index f53d0d6e9dc..f393c2489e2 100644 --- a/tests/Map_Test.icc +++ b/tests/Map_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Map_Test" { source type (cpp) "Map_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Max_Default_Port_Test.icc b/tests/Max_Default_Port_Test.icc index ff684f30759..40e2e74befb 100644 --- a/tests/Max_Default_Port_Test.icc +++ b/tests/Max_Default_Port_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Max_Default_Port_Test" { source type (cpp) "Max_Default_Port_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Mem_Map_Test.icc b/tests/Mem_Map_Test.icc index 8532031e085..bb75b124ed0 100644 --- a/tests/Mem_Map_Test.icc +++ b/tests/Mem_Map_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Mem_Map_Test" { source type (cpp) "Mem_Map_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Message_Block_Test.icc b/tests/Message_Block_Test.icc index deb961d78d6..3fc23dc2c70 100644 --- a/tests/Message_Block_Test.icc +++ b/tests/Message_Block_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Message_Block_Test" { source type (cpp) "Message_Block_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Message_Queue_Notifications_Test.icc b/tests/Message_Queue_Notifications_Test.icc index c576ca09def..c302096d76c 100644 --- a/tests/Message_Queue_Notifications_Test.icc +++ b/tests/Message_Queue_Notifications_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Message_Queue_Notifications_Test" { source type (cpp) "Message_Queue_Notifications_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Message_Queue_Test.icc b/tests/Message_Queue_Test.icc index a02553d7280..4bcab70bc7f 100644 --- a/tests/Message_Queue_Test.icc +++ b/tests/Message_Queue_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Message_Queue_Test" { source type (cpp) "Message_Queue_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Message_Queue_Test_Ex.icc b/tests/Message_Queue_Test_Ex.icc index 7e427e411a7..e301eaf2da1 100644 --- a/tests/Message_Queue_Test_Ex.icc +++ b/tests/Message_Queue_Test_Ex.icc @@ -10,6 +10,13 @@ option target type (exe) "Message_Queue_Test_Ex" { source type (cpp) "Message_Queue_Test_Ex.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Multicast_Test.icc b/tests/Multicast_Test.icc new file mode 100644 index 00000000000..93bd5db4700 --- /dev/null +++ b/tests/Multicast_Test.icc @@ -0,0 +1,22 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type (exe) "Multicast_Test" + { + source type (cpp) "Multicast_Test.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/Naming_Test.icc b/tests/Naming_Test.icc index c41bbb02c53..640ff7709be 100644 --- a/tests/Naming_Test.icc +++ b/tests/Naming_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Naming_Test" { source type (cpp) "Naming_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/New_Fail_Test.icc b/tests/New_Fail_Test.icc index 8c5879d414d..7c9fc8d133e 100644 --- a/tests/New_Fail_Test.icc +++ b/tests/New_Fail_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "New_Fail_Test" { source type (cpp) "New_Fail_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Notify_Performance_Test.icc b/tests/Notify_Performance_Test.icc index 34726f8e6c2..8e69665bd51 100644 --- a/tests/Notify_Performance_Test.icc +++ b/tests/Notify_Performance_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Notify_Performance_Test" { source type (cpp) "Notify_Performance_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/OS_Test.icc b/tests/OS_Test.icc index 6b3dcebebee..87f9badfff5 100644 --- a/tests/OS_Test.icc +++ b/tests/OS_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "OS_Test" { source type (cpp) "OS_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Object_Manager_Test.icc b/tests/Object_Manager_Test.icc index a3cf997dae9..469c7dd49c8 100644 --- a/tests/Object_Manager_Test.icc +++ b/tests/Object_Manager_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Object_Manager_Test" { source type (cpp) "Object_Manager_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Obstack_Test.icc b/tests/Obstack_Test.icc index 316fc0adca7..05d46f7d9d0 100644 --- a/tests/Obstack_Test.icc +++ b/tests/Obstack_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Obstack_Test" { source type (cpp) "Obstack_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/OrdMultiSet_Test.icc b/tests/OrdMultiSet_Test.icc index cd76bc847c6..31b2124bfdf 100644 --- a/tests/OrdMultiSet_Test.icc +++ b/tests/OrdMultiSet_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "OrdMultiSet_Test" { source type (cpp) "OrdMultiSet_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Pipe_Test.icc b/tests/Pipe_Test.icc index f12e55e4d0f..6b127789e79 100644 --- a/tests/Pipe_Test.icc +++ b/tests/Pipe_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Pipe_Test" { source type (cpp) "Pipe_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Priority_Buffer_Test.icc b/tests/Priority_Buffer_Test.icc index 0d09c6c3309..45020d07013 100644 --- a/tests/Priority_Buffer_Test.icc +++ b/tests/Priority_Buffer_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Priority_Buffer_Test" { source type (cpp) "Priority_Buffer_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Priority_Reactor_Test.icc b/tests/Priority_Reactor_Test.icc index c74cdff0408..3ef1f17389e 100644 --- a/tests/Priority_Reactor_Test.icc +++ b/tests/Priority_Reactor_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Priority_Reactor_Test" { source type (cpp) "Priority_Reactor_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Priority_Task_Test.icc b/tests/Priority_Task_Test.icc index 48f4a8629d4..6ddf5eee53c 100644 --- a/tests/Priority_Task_Test.icc +++ b/tests/Priority_Task_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Priority_Task_Test" { source type (cpp) "Priority_Task_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Proactor_Scatter_Gather_Test.icc b/tests/Proactor_Scatter_Gather_Test.icc new file mode 100644 index 00000000000..ce782704c69 --- /dev/null +++ b/tests/Proactor_Scatter_Gather_Test.icc @@ -0,0 +1,22 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type (exe) "Proactor_Scatter_Gather_Test" + { + source type (cpp) "Proactor_Scatter_Gather_Test.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/Proactor_Test.icc b/tests/Proactor_Test.icc new file mode 100644 index 00000000000..742aa04e54f --- /dev/null +++ b/tests/Proactor_Test.icc @@ -0,0 +1,22 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type (exe) "Proactor_Test" + { + source type (cpp) "Proactor_Test.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/Proactor_Timer_Test.icc b/tests/Proactor_Timer_Test.icc new file mode 100644 index 00000000000..15e1ac33310 --- /dev/null +++ b/tests/Proactor_Timer_Test.icc @@ -0,0 +1,22 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type (exe) "Proactor_Timer_Test" + { + source type (cpp) "Proactor_Timer_Test.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/Process_Manager_Test.icc b/tests/Process_Manager_Test.icc index d4642cf02bf..214f7b1c77e 100644 --- a/tests/Process_Manager_Test.icc +++ b/tests/Process_Manager_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Process_Manager_Test" { source type (cpp) "Process_Manager_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Process_Mutex_Test.icc b/tests/Process_Mutex_Test.icc index e34cdce05e7..9dc1af2b96a 100644 --- a/tests/Process_Mutex_Test.icc +++ b/tests/Process_Mutex_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Process_Mutex_Test" { source type (cpp) "Process_Mutex_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Process_Strategy_Test.icc b/tests/Process_Strategy_Test.icc index 7136661988f..d9749e639df 100644 --- a/tests/Process_Strategy_Test.icc +++ b/tests/Process_Strategy_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Process_Strategy_Test" { source type (cpp) "Process_Strategy_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/RB_Tree_Test.icc b/tests/RB_Tree_Test.icc index 3ea78cdfae1..a21f2ba6a0b 100644 --- a/tests/RB_Tree_Test.icc +++ b/tests/RB_Tree_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "RB_Tree_Test" { source type (cpp) "RB_Tree_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Reactor_Dispatch_Order_Test.icc b/tests/Reactor_Dispatch_Order_Test.icc index 16a4b9e4d22..6da2f138ed6 100644 --- a/tests/Reactor_Dispatch_Order_Test.icc +++ b/tests/Reactor_Dispatch_Order_Test.icc @@ -7,9 +7,16 @@ option link(linkWithMultiThreadLib,yes), link(debug) { - target type (exe) "Reactor_Dispatch_Order_Test" - { - source type (cpp) "Reactor_Dispatch_Order_Test.cpp" - source platformLinkLibs - } + target type (exe) "Reactor_Dispatch_Order_Test" + { + source type (cpp) "Reactor_Dispatch_Order_Test.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs + } } diff --git a/tests/Reactor_Exceptions_Test.icc b/tests/Reactor_Exceptions_Test.icc index bc7d5fc9058..de6cc7ae91c 100644 --- a/tests/Reactor_Exceptions_Test.icc +++ b/tests/Reactor_Exceptions_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Reactor_Exceptions_Test" { source type (cpp) "Reactor_Exceptions_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Reactor_Notify_Test.icc b/tests/Reactor_Notify_Test.icc index d2b8bb40f7a..6eefd3e02ce 100644 --- a/tests/Reactor_Notify_Test.icc +++ b/tests/Reactor_Notify_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Reactor_Notify_Test" { source type (cpp) "Reactor_Notify_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Reactor_Performance_Test.icc b/tests/Reactor_Performance_Test.icc index 26641d72d82..7dfe0809057 100644 --- a/tests/Reactor_Performance_Test.icc +++ b/tests/Reactor_Performance_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Reactor_Performance_Test" { source type (cpp) "Reactor_Performance_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Reactor_Timer_Test.icc b/tests/Reactor_Timer_Test.icc index cb8a7682960..98fef454a43 100644 --- a/tests/Reactor_Timer_Test.icc +++ b/tests/Reactor_Timer_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Reactor_Timer_Test" { source type (cpp) "Reactor_Timer_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Reactors_Test.icc b/tests/Reactors_Test.icc index b6abe6a1dce..8130c0ae1a8 100644 --- a/tests/Reactors_Test.icc +++ b/tests/Reactors_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Reactors_Test" { source type (cpp) "Reactors_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Reader_Writer_Test.icc b/tests/Reader_Writer_Test.icc index 9f3ff3e9db4..c256ccac5b3 100644 --- a/tests/Reader_Writer_Test.icc +++ b/tests/Reader_Writer_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Reader_Writer_Test" { source type (cpp) "Reader_Writer_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Recursive_Condition_Test.icc b/tests/Recursive_Condition_Test.icc index c80c17a22b4..b9fca71746f 100644 --- a/tests/Recursive_Condition_Test.icc +++ b/tests/Recursive_Condition_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Recursive_Condition_Test" { source type (cpp) "Recursive_Condition_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Recursive_Mutex_Test.icc b/tests/Recursive_Mutex_Test.icc index 7eb3f904149..5b9a75b8292 100644 --- a/tests/Recursive_Mutex_Test.icc +++ b/tests/Recursive_Mutex_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Recursive_Mutex_Test" { source type (cpp) "Recursive_Mutex_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Refcounted_Auto_Ptr_Test.icc b/tests/Refcounted_Auto_Ptr_Test.icc index 947cd5d62af..d94c8030261 100644 --- a/tests/Refcounted_Auto_Ptr_Test.icc +++ b/tests/Refcounted_Auto_Ptr_Test.icc @@ -1,4 +1,4 @@ -// Refcounted_Auto_Ptr_Test.icc,v 1.1 2000/02/24 19:04:53 jtucker Exp +// $Id$ include "vacpp_setup.icc" option @@ -10,6 +10,13 @@ option target type (exe) "Refcounted_Auto_Ptr_Test" { source type (cpp) "Refcounted_Auto_Ptr_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Reverse_Lock_Test.icc b/tests/Reverse_Lock_Test.icc index afee3953711..ac4f2531783 100644 --- a/tests/Reverse_Lock_Test.icc +++ b/tests/Reverse_Lock_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Reverse_Lock_Test" { source type (cpp) "Reverse_Lock_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/SOCK_Connector_Test.icc b/tests/SOCK_Connector_Test.icc index 3cdb5e52d80..606e317b174 100644 --- a/tests/SOCK_Connector_Test.icc +++ b/tests/SOCK_Connector_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "SOCK_Connector_Test" { source type (cpp) "SOCK_Connector_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/SOCK_Send_Recv_Test.icc b/tests/SOCK_Send_Recv_Test.icc index 57ed6eed44d..8ce21658526 100644 --- a/tests/SOCK_Send_Recv_Test.icc +++ b/tests/SOCK_Send_Recv_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "SOCK_Send_Recv_Test" { source type (cpp) "SOCK_Send_Recv_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/SOCK_Test.icc b/tests/SOCK_Test.icc index 6bfa7c2eb2c..9338423ff3c 100644 --- a/tests/SOCK_Test.icc +++ b/tests/SOCK_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "SOCK_Test" { source type (cpp) "SOCK_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/SPIPE_Test.icc b/tests/SPIPE_Test.icc index d850d3b7ad8..6fc05894e1d 100644 --- a/tests/SPIPE_Test.icc +++ b/tests/SPIPE_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "SPIPE_Test" { source type (cpp) "SPIPE_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/SString_Test.icc b/tests/SString_Test.icc index 4fcc1578e90..f5e2ffb2fd6 100644 --- a/tests/SString_Test.icc +++ b/tests/SString_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "SString_Test" { source type (cpp) "SString_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/SV_Shared_Memory_Test.icc b/tests/SV_Shared_Memory_Test.icc index b548198a5c1..76c76777f6b 100644 --- a/tests/SV_Shared_Memory_Test.icc +++ b/tests/SV_Shared_Memory_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "SV_Shared_Memory_Test" { source type (cpp) "SV_Shared_Memory_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Semaphore_Test.icc b/tests/Semaphore_Test.icc index 672426e8366..0173d180d13 100644 --- a/tests/Semaphore_Test.icc +++ b/tests/Semaphore_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Semaphore_Test" { source type (cpp) "Semaphore_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Service_Config_DLL.icc b/tests/Service_Config_DLL.icc new file mode 100644 index 00000000000..fa1ce18510f --- /dev/null +++ b/tests/Service_Config_DLL.icc @@ -0,0 +1,25 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(exportAll), + link(linkwithsharedlib), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type ( shr ) "shr.o" + { + run after sources("shr.o") targets ("libService_Config_DLL.a") "ar -r -u libService_Config_DLL.a shr.o", "rm -rf shr.o" + run cleanup "rm -rf libService_Config_DLL.a shr.o" + + source type (cpp) "Service_Config_DLL.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/Service_Config_Test.icc b/tests/Service_Config_Test.icc index 691ae6bc4fc..5987e9f6738 100644 --- a/tests/Service_Config_Test.icc +++ b/tests/Service_Config_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Service_Config_Test" { source type (cpp) "Service_Config_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Signal_Test.icc b/tests/Signal_Test.icc index 759b6964423..235292cd753 100644 --- a/tests/Signal_Test.icc +++ b/tests/Signal_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Signal_Test" { source type (cpp) "Signal_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Sigset_Ops_Test.icc b/tests/Sigset_Ops_Test.icc index 45053a6e284..f5a54aa38de 100644 --- a/tests/Sigset_Ops_Test.icc +++ b/tests/Sigset_Ops_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Sigset_Ops_Test" { source type (cpp) "Sigset_Ops_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Simple_Message_Block_Test.icc b/tests/Simple_Message_Block_Test.icc index ced834094fb..b82ca135fe0 100644 --- a/tests/Simple_Message_Block_Test.icc +++ b/tests/Simple_Message_Block_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Simple_Message_Block_Test" { source type (cpp) "Simple_Message_Block_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Svc_Handler_Test.icc b/tests/Svc_Handler_Test.icc index 036b4a3e4af..30f4f687678 100644 --- a/tests/Svc_Handler_Test.icc +++ b/tests/Svc_Handler_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Svc_Handler_Test" { source type (cpp) "Svc_Handler_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/TP_Reactor_Test.icc b/tests/TP_Reactor_Test.icc new file mode 100644 index 00000000000..e9f15d19212 --- /dev/null +++ b/tests/TP_Reactor_Test.icc @@ -0,0 +1,22 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type (exe) "TP_Reactor_Test" + { + source type (cpp) "TP_Reactor_Test.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/TSS_Test.icc b/tests/TSS_Test.icc index 004dd928427..f708a0d13be 100644 --- a/tests/TSS_Test.icc +++ b/tests/TSS_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "TSS_Test" { source type (cpp) "TSS_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Task_Test.icc b/tests/Task_Test.icc index 0fac69f86e8..231d51e8b06 100644 --- a/tests/Task_Test.icc +++ b/tests/Task_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Task_Test" { source type (cpp) "Task_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Thread_Manager_Test.icc b/tests/Thread_Manager_Test.icc index e07e11c1637..b7be7dcce86 100644 --- a/tests/Thread_Manager_Test.icc +++ b/tests/Thread_Manager_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Thread_Manager_Test" { source type (cpp) "Thread_Manager_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Thread_Mutex_Test.icc b/tests/Thread_Mutex_Test.icc index ef0ef862408..1901649aa0b 100644 --- a/tests/Thread_Mutex_Test.icc +++ b/tests/Thread_Mutex_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Thread_Mutex_Test" { source type (cpp) "Thread_Mutex_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Thread_Pool_Reactor_Resume_Test.icc b/tests/Thread_Pool_Reactor_Resume_Test.icc index 847f79efa7a..4feefc6069b 100644 --- a/tests/Thread_Pool_Reactor_Resume_Test.icc +++ b/tests/Thread_Pool_Reactor_Resume_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Thread_Pool_Reactor_Resume_Test" { source type (cpp) "Thread_Pool_Reactor_Resume_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Thread_Pool_Reactor_Test.icc b/tests/Thread_Pool_Reactor_Test.icc index 37d66f21de1..1307567e5f0 100644 --- a/tests/Thread_Pool_Reactor_Test.icc +++ b/tests/Thread_Pool_Reactor_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Thread_Pool_Reactor_Test" { source type (cpp) "Thread_Pool_Reactor_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Thread_Pool_Test.icc b/tests/Thread_Pool_Test.icc index 6c11c20620b..5ddbfa4b662 100644 --- a/tests/Thread_Pool_Test.icc +++ b/tests/Thread_Pool_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Thread_Pool_Test" { source type (cpp) "Thread_Pool_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Time_Service_Test.icc b/tests/Time_Service_Test.icc index b15ed41bd35..ca38af03ea1 100644 --- a/tests/Time_Service_Test.icc +++ b/tests/Time_Service_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Time_Service_Test" { source type (cpp) "Time_Service_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Time_Value_Test.icc b/tests/Time_Value_Test.icc index 2a038a30c5c..21b6fa42496 100644 --- a/tests/Time_Value_Test.icc +++ b/tests/Time_Value_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Time_Value_Test" { source type (cpp) "Time_Value_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Timeprobe_Test.icc b/tests/Timeprobe_Test.icc index cb2067e7bed..feb6f487bf1 100644 --- a/tests/Timeprobe_Test.icc +++ b/tests/Timeprobe_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Timeprobe_Test" { source type (cpp) "Timeprobe_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Timer_Queue_Test.icc b/tests/Timer_Queue_Test.icc index 635a92b645a..b3a43090ccb 100644 --- a/tests/Timer_Queue_Test.icc +++ b/tests/Timer_Queue_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Timer_Queue_Test" { source type (cpp) "Timer_Queue_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/TkReactor_Test.icc b/tests/TkReactor_Test.icc index d2606ce2291..1b3280eef4e 100644 --- a/tests/TkReactor_Test.icc +++ b/tests/TkReactor_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "TkReactor_Test" { source type (cpp) "TkReactor_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Token_Strategy_Test.icc b/tests/Token_Strategy_Test.icc new file mode 100644 index 00000000000..1afb367d555 --- /dev/null +++ b/tests/Token_Strategy_Test.icc @@ -0,0 +1,22 @@ +// $Id$ + +include "vacpp_setup.icc" +option + link(libSearchPath, platformLibSearchPath), + incl(searchPath, ".."), + link(linkWithMultiThreadLib,yes), + link(debug) + { + target type (exe) "Token_Strategy_Test" + { + source type (cpp) "Token_Strategy_Test.cpp" + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs + } + } diff --git a/tests/Tokens_Test.icc b/tests/Tokens_Test.icc index e382f351e81..e6cc8ce4824 100644 --- a/tests/Tokens_Test.icc +++ b/tests/Tokens_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Tokens_Test" { source type (cpp) "Tokens_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/UPIPE_SAP_Test.icc b/tests/UPIPE_SAP_Test.icc index 213ddaf1211..d4c7871ca75 100644 --- a/tests/UPIPE_SAP_Test.icc +++ b/tests/UPIPE_SAP_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "UPIPE_SAP_Test" { source type (cpp) "UPIPE_SAP_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Upgradable_RW_Test.icc b/tests/Upgradable_RW_Test.icc index b558be42ec9..7300935edc6 100644 --- a/tests/Upgradable_RW_Test.icc +++ b/tests/Upgradable_RW_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Upgradable_RW_Test" { source type (cpp) "Upgradable_RW_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/Vector_Test.icc b/tests/Vector_Test.icc index 464a6a15a14..794f8984940 100644 --- a/tests/Vector_Test.icc +++ b/tests/Vector_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "Vector_Test" { source type (cpp) "Vector_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/XtReactor_Test.icc b/tests/XtReactor_Test.icc index 8daf3839ce4..a2575231ff8 100644 --- a/tests/XtReactor_Test.icc +++ b/tests/XtReactor_Test.icc @@ -10,6 +10,13 @@ option target type (exe) "XtReactor_Test" { source type (cpp) "XtReactor_Test.cpp" - source platformLinkLibs + if ($__IBMCPP__ >= 500) { + option macros(global) { + source type (hpp) "test_config.h" + } + source type (cpp) "test_config.h" + source type (cpp) "../ace/Singleton.cpp" + } + source type (lib) platformLinkLibs } } diff --git a/tests/makeicc.pl b/tests/makeicc.pl index 13f4ae39a39..c9e9a42ec86 100755 --- a/tests/makeicc.pl +++ b/tests/makeicc.pl @@ -22,7 +22,14 @@ open(T,"> $a1\icc"); print T " target type (exe) \"$a1\"\n"; print T " {\n"; print T " source type (cpp) \"$a1\.cpp\"\n"; - print T " source platformLinkLibs\n"; + print T ' if ($__IBMCPP__ >= 500) {' . "\n"; + print T " option macros(global) {\n"; + print T " source type (hpp) \"test_config.h\"\n"; + print T " }\n"; + print T " source type (cpp) \"test_config.h\"\n"; + print T " source type (cpp) \"../ace/Singleton.cpp\"\n"; + print T " }\n"; + print T " source type (lib) platformLinkLibs\n"; print T " }\n"; print T " }\n"; close T; |