ChangeLogTag:Mon May 19 04:30:45 UTC 2003 Don Hinton <dhinton@dresystems.com>

123 files changed, 140 insertions, 122 deletions

diff --git a/ChangeLog b/ChangeLog
index 83696fefd8e..09f0e7c8571 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon May 19 04:30:45 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * tests/*.icc:
+          Added Main.cpp to all executable projects.
+
+        * tests/libTest_Output.icc:
+        * tests/tests.icp:
+          Added new file, libTest_Output.icc, and added it to tests.icp.
+
+        * tests/vacpp_setup.icc:
+          Added Test_Output to platformLinkLibs.
+
 Mon May 19 03:12:23 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * tests/Makefile.am:
diff --git a/tests/ARGV_Test.icc b/tests/ARGV_Test.icc
index 1c680df53f4..c7737450164 100644
--- a/tests/ARGV_Test.icc
+++ b/tests/ARGV_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "ARGV_Test"
 	{
-	   source type (cpp) "ARGV_Test.cpp"
+	   source type (cpp) "ARGV_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Aio_Platform_Test.icc b/tests/Aio_Platform_Test.icc
index 84a29830c65..5f8d27dca0f 100644
--- a/tests/Aio_Platform_Test.icc
+++ b/tests/Aio_Platform_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Aio_Platform_Test"
 	{
-	   source type (cpp) "Aio_Platform_Test.cpp"
+	   source type (cpp) "Aio_Platform_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Atomic_Op_Test.icc b/tests/Atomic_Op_Test.icc
index 8cfc61da6b6..2ce3d0c48f1 100644
--- a/tests/Atomic_Op_Test.icc
+++ b/tests/Atomic_Op_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Atomic_Op_Test"
 	{
-	   source type (cpp) "Atomic_Op_Test.cpp"
+	   source type (cpp) "Atomic_Op_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Auto_IncDec_Test.icc b/tests/Auto_IncDec_Test.icc
index e9f58398f6a..423ab587c9a 100644
--- a/tests/Auto_IncDec_Test.icc
+++ b/tests/Auto_IncDec_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Auto_IncDec_Test"
 	{
-	   source type (cpp) "Auto_IncDec_Test.cpp"
+	   source type (cpp) "Auto_IncDec_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Barrier_Test.icc b/tests/Barrier_Test.icc
index 742a126255a..a101d6cc9ba 100644
--- a/tests/Barrier_Test.icc
+++ b/tests/Barrier_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Barrier_Test"
 	{
-	   source type (cpp) "Barrier_Test.cpp"
+	   source type (cpp) "Barrier_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Basic_Types_Test.icc b/tests/Basic_Types_Test.icc
index b5af29920bf..f9beda50e86 100644
--- a/tests/Basic_Types_Test.icc
+++ b/tests/Basic_Types_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Basic_Types_Test"
 	{
-	   source type (cpp) "Basic_Types_Test.cpp"
+	   source type (cpp) "Basic_Types_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Bound_Ptr_Test.icc b/tests/Bound_Ptr_Test.icc
index 53091b8f110..ca4b3e21f1f 100644
--- a/tests/Bound_Ptr_Test.icc
+++ b/tests/Bound_Ptr_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Bound_Ptr_Test"
 	{
-	   source type (cpp) "Bound_Ptr_Test.cpp"
+	   source type (cpp) "Bound_Ptr_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Buffer_Stream_Test.icc b/tests/Buffer_Stream_Test.icc
index 80d4569332f..27192ea1d31 100644
--- a/tests/Buffer_Stream_Test.icc
+++ b/tests/Buffer_Stream_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Buffer_Stream_Test"
 	{
-	   source type (cpp) "Buffer_Stream_Test.cpp"
+	   source type (cpp) "Buffer_Stream_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/CDR_Array_Test.icc b/tests/CDR_Array_Test.icc
index 3e2878c3ebe..a1ce8f4e1ee 100644
--- a/tests/CDR_Array_Test.icc
+++ b/tests/CDR_Array_Test.icc
@@ -7,7 +7,7 @@ option
     link(linkWithMultiThreadLib,yes),
     link(debug)
     {
-	target type (exe) "CDR_Array_Test"
+	target type (exe) "CDR_Array_Test", "Main.cpp"
 	{
 	   source type (cpp) "CDR_Array_Test.cpp"
 	   if ($__IBMCPP__ >= 500) {
diff --git a/tests/CDR_File_Test.icc b/tests/CDR_File_Test.icc
index bfa344c409d..e438c3ccf4a 100644
--- a/tests/CDR_File_Test.icc
+++ b/tests/CDR_File_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "CDR_File_Test"
 	{
-	   source type (cpp) "CDR_File_Test.cpp"
+	   source type (cpp) "CDR_File_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/CDR_Test.icc b/tests/CDR_Test.icc
index 2e2b6f814d8..d762463b284 100644
--- a/tests/CDR_Test.icc
+++ b/tests/CDR_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "CDR_Test"
 	{
-	   source type (cpp) "CDR_Test.cpp"
+	   source type (cpp) "CDR_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Cache_Map_Manager_Test.icc b/tests/Cache_Map_Manager_Test.icc
index f2311907675..d3e8fd595ff 100644
--- a/tests/Cache_Map_Manager_Test.icc
+++ b/tests/Cache_Map_Manager_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Cache_Map_Manager_Test"
 	{
-	   source type (cpp) "Cache_Map_Manager_Test.cpp"
+	   source type (cpp) "Cache_Map_Manager_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Cached_Accept_Conn_Test.icc b/tests/Cached_Accept_Conn_Test.icc
index 49291da36a6..757c9065fea 100644
--- a/tests/Cached_Accept_Conn_Test.icc
+++ b/tests/Cached_Accept_Conn_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Cached_Accept_Conn_Test"
 	{
-	   source type (cpp) "Cached_Accept_Conn_Test.cpp"
+	   source type (cpp) "Cached_Accept_Conn_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Cached_Allocator_Test.icc b/tests/Cached_Allocator_Test.icc
index a82c51f1338..f18d98807bb 100644
--- a/tests/Cached_Allocator_Test.icc
+++ b/tests/Cached_Allocator_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Cached_Allocator_Test"
 	{
-	   source type (cpp) "Cached_Allocator_Test.cpp"
+	   source type (cpp) "Cached_Allocator_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Cached_Conn_Test.icc b/tests/Cached_Conn_Test.icc
index 7d9a32425a3..b0a5823f121 100644
--- a/tests/Cached_Conn_Test.icc
+++ b/tests/Cached_Conn_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Cached_Conn_Test"
 	{
-	   source type (cpp) "Cached_Conn_Test.cpp"
+	   source type (cpp) "Cached_Conn_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Capabilities_Test.icc b/tests/Capabilities_Test.icc
index 051f51f1f8f..9248643a260 100644
--- a/tests/Capabilities_Test.icc
+++ b/tests/Capabilities_Test.icc
@@ -7,7 +7,7 @@ option
     link(linkWithMultiThreadLib,yes),
     link(debug)
     {
-	target type (exe) "Capabilities_Test"
+	target type (exe) "Capabilities_Test", "Main.cpp"
 	{
 	   source type (cpp) "Capabilities_Test.cpp"
 	   if ($__IBMCPP__ >= 500) {
diff --git a/tests/Codecs_Test.icc b/tests/Codecs_Test.icc
index dcfc828b5b8..157576e8c43 100644
--- a/tests/Codecs_Test.icc
+++ b/tests/Codecs_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Codecs_Test"
 	{
-	   source type (cpp) "Codecs_Test.cpp"
+	   source type (cpp) "Codecs_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Collection_Test.icc b/tests/Collection_Test.icc
index cb3c5c98af8..c76fc10441d 100644
--- a/tests/Collection_Test.icc
+++ b/tests/Collection_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Collection_Test"
 	{
-	   source type (cpp) "Collection_Test.cpp"
+	   source type (cpp) "Collection_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Config_Test.icc b/tests/Config_Test.icc
index 5a04a900f03..bb4340aa8ce 100644
--- a/tests/Config_Test.icc
+++ b/tests/Config_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Config_Test"
 	{
-	   source type (cpp) "Config_Test.cpp"
+	   source type (cpp) "Config_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Conn_Test.icc b/tests/Conn_Test.icc
index 6734595ce92..a74e3d1ffff 100644
--- a/tests/Conn_Test.icc
+++ b/tests/Conn_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Conn_Test"
 	{
-	   source type (cpp) "Conn_Test.cpp"
+	   source type (cpp) "Conn_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/DLL_Test.icc b/tests/DLL_Test.icc
index 5f4b2589fa5..deab6de021b 100644
--- a/tests/DLL_Test.icc
+++ b/tests/DLL_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "DLL_Test"
 	{
-	   source type (cpp) "DLL_Test.cpp"
+	   source type (cpp) "DLL_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/DLList_Test.icc b/tests/DLList_Test.icc
index b01633eccb3..ba3a7a26452 100644
--- a/tests/DLList_Test.icc
+++ b/tests/DLList_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "DLList_Test"
 	{
-	   source type (cpp) "DLList_Test.cpp"
+	   source type (cpp) "DLList_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Date_Time_Test.icc b/tests/Date_Time_Test.icc
index 88912fb385d..f409cfdba9f 100644
--- a/tests/Date_Time_Test.icc
+++ b/tests/Date_Time_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Date_Time_Test"
 	{
-	   source type (cpp) "Date_Time_Test.cpp"
+	   source type (cpp) "Date_Time_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Dirent_Test.icc b/tests/Dirent_Test.icc
index 4b1d0ced6c1..7e667e2bc97 100644
--- a/tests/Dirent_Test.icc
+++ b/tests/Dirent_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Dirent_Test"
 	{
-	   source type (cpp) "Dirent_Test.cpp"
+	   source type (cpp) "Dirent_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Dynamic_Priority_Test.icc b/tests/Dynamic_Priority_Test.icc
index f65129c147a..2aa01c0d0e2 100644
--- a/tests/Dynamic_Priority_Test.icc
+++ b/tests/Dynamic_Priority_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Dynamic_Priority_Test"
 	{
-	   source type (cpp) "Dynamic_Priority_Test.cpp"
+	   source type (cpp) "Dynamic_Priority_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Enum_Interfaces_Test.icc b/tests/Enum_Interfaces_Test.icc
index 11c826d404f..369a9eed142 100644
--- a/tests/Enum_Interfaces_Test.icc
+++ b/tests/Enum_Interfaces_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Enum_Interfaces_Test"
 	{
-	   source type (cpp) "Enum_Interfaces_Test.cpp"
+	   source type (cpp) "Enum_Interfaces_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Env_Value_Test.icc b/tests/Env_Value_Test.icc
index 8c167d2040c..445ad5b08a9 100644
--- a/tests/Env_Value_Test.icc
+++ b/tests/Env_Value_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Env_Value_Test"
 	{
-	   source type (cpp) "Env_Value_Test.cpp"
+	   source type (cpp) "Env_Value_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/FIFO_Test.icc b/tests/FIFO_Test.icc
index ef614df6ac0..97f1702beab 100644
--- a/tests/FIFO_Test.icc
+++ b/tests/FIFO_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "FIFO_Test"
 	{
-	   source type (cpp) "FIFO_Test.cpp"
+	   source type (cpp) "FIFO_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/FlReactor_Test.icc b/tests/FlReactor_Test.icc
index c84dd9ad345..6b04c173906 100644
--- a/tests/FlReactor_Test.icc
+++ b/tests/FlReactor_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "FlReactor_Test"
 	{
-	   source type (cpp) "FlReactor_Test.cpp"
+	   source type (cpp) "FlReactor_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Framework_Component_Test.icc b/tests/Framework_Component_Test.icc
index 4293e831fdd..4f2e2e9df2f 100644
--- a/tests/Framework_Component_Test.icc
+++ b/tests/Framework_Component_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Framework_Component_Test"
 	{
-	   source type (cpp) "Framework_Component_Test.cpp"
+	   source type (cpp) "Framework_Component_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Future_Set_Test.icc b/tests/Future_Set_Test.icc
index 7bc18037612..78ca38a1245 100644
--- a/tests/Future_Set_Test.icc
+++ b/tests/Future_Set_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Future_Set_Test"
 	{
-	   source type (cpp) "Future_Set_Test.cpp"
+	   source type (cpp) "Future_Set_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Future_Test.icc b/tests/Future_Test.icc
index 2c6a98d635b..f761a455b90 100644
--- a/tests/Future_Test.icc
+++ b/tests/Future_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Future_Test"
 	{
-	   source type (cpp) "Future_Test.cpp"
+	   source type (cpp) "Future_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Get_Opt_Test.icc b/tests/Get_Opt_Test.icc
index 44c63990015..682848b31a3 100644
--- a/tests/Get_Opt_Test.icc
+++ b/tests/Get_Opt_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Get_Opt_Test"
 	{
-	   source type (cpp) "Get_Opt_Test.cpp"
+	   source type (cpp) "Get_Opt_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Handle_Set_Test.icc b/tests/Handle_Set_Test.icc
index 724a7c2627a..5dd33470b02 100644
--- a/tests/Handle_Set_Test.icc
+++ b/tests/Handle_Set_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Handle_Set_Test"
 	{
-	   source type (cpp) "Handle_Set_Test.cpp"
+	   source type (cpp) "Handle_Set_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Hash_Map_Bucket_Iterator_Test.icc b/tests/Hash_Map_Bucket_Iterator_Test.icc
index 83615f80a46..56937373a43 100644
--- a/tests/Hash_Map_Bucket_Iterator_Test.icc
+++ b/tests/Hash_Map_Bucket_Iterator_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Hash_Map_Bucket_Iterator_Test"
 	{
-	   source type (cpp) "Hash_Map_Bucket_Iterator_Test.cpp"
+	   source type (cpp) "Hash_Map_Bucket_Iterator_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Hash_Map_Manager_Test.icc b/tests/Hash_Map_Manager_Test.icc
index 859650f2ba8..1d2f4c7c24b 100644
--- a/tests/Hash_Map_Manager_Test.icc
+++ b/tests/Hash_Map_Manager_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Hash_Map_Manager_Test"
 	{
-	   source type (cpp) "Hash_Map_Manager_Test.cpp"
+	   source type (cpp) "Hash_Map_Manager_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/High_Res_Timer_Test.icc b/tests/High_Res_Timer_Test.icc
index 2a7912f956d..7064e33cb77 100644
--- a/tests/High_Res_Timer_Test.icc
+++ b/tests/High_Res_Timer_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "High_Res_Timer_Test"
 	{
-	   source type (cpp) "High_Res_Timer_Test.cpp"
+	   source type (cpp) "High_Res_Timer_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/INET_Addr_Test.icc b/tests/INET_Addr_Test.icc
index 9f64c7e56ac..206f1648f96 100644
--- a/tests/INET_Addr_Test.icc
+++ b/tests/INET_Addr_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "INET_Addr_Test"
 	{
-	   source type (cpp) "INET_Addr_Test.cpp"
+	   source type (cpp) "INET_Addr_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/IOStream_Test.icc b/tests/IOStream_Test.icc
index ad3512552e9..55f5b2420d1 100644
--- a/tests/IOStream_Test.icc
+++ b/tests/IOStream_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "IOStream_Test"
 	{
-	   source type (cpp) "IOStream_Test.cpp"
+	   source type (cpp) "IOStream_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Lazy_Map_Manager_Test.icc b/tests/Lazy_Map_Manager_Test.icc
index 74fb75ab22f..b8a12343639 100644
--- a/tests/Lazy_Map_Manager_Test.icc
+++ b/tests/Lazy_Map_Manager_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Lazy_Map_Manager_Test"
 	{
-	   source type (cpp) "Lazy_Map_Manager_Test.cpp"
+	   source type (cpp) "Lazy_Map_Manager_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Log_Msg_Test.icc b/tests/Log_Msg_Test.icc
index 23a13d793f4..4eecca0b5b6 100644
--- a/tests/Log_Msg_Test.icc
+++ b/tests/Log_Msg_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Log_Msg_Test"
 	{
-	   source type (cpp) "Log_Msg_Test.cpp"
+	   source type (cpp) "Log_Msg_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Logging_Strategy_Test.icc b/tests/Logging_Strategy_Test.icc
index b3915a4ac6d..5b0c3a4d61c 100644
--- a/tests/Logging_Strategy_Test.icc
+++ b/tests/Logging_Strategy_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Logging_Strategy_Test"
 	{
-	   source type (cpp) "Logging_Strategy_Test.cpp"
+	   source type (cpp) "Logging_Strategy_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/MEM_Stream_Test.icc b/tests/MEM_Stream_Test.icc
index 7e255ac1a8b..e646a1d6b51 100644
--- a/tests/MEM_Stream_Test.icc
+++ b/tests/MEM_Stream_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "MEM_Stream_Test"
 	{
-	   source type (cpp) "MEM_Stream_Test.cpp"
+	   source type (cpp) "MEM_Stream_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/MM_Shared_Memory_Test.icc b/tests/MM_Shared_Memory_Test.icc
index 1a486887057..8121515f247 100644
--- a/tests/MM_Shared_Memory_Test.icc
+++ b/tests/MM_Shared_Memory_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "MM_Shared_Memory_Test"
 	{
-	   source type (cpp) "MM_Shared_Memory_Test.cpp"
+	   source type (cpp) "MM_Shared_Memory_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/MT_Reactor_Timer_Test.icc b/tests/MT_Reactor_Timer_Test.icc
index b4507698598..0528c719217 100644
--- a/tests/MT_Reactor_Timer_Test.icc
+++ b/tests/MT_Reactor_Timer_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "MT_Reactor_Timer_Test"
 	{
-	   source type (cpp) "MT_Reactor_Timer_Test.cpp"
+	   source type (cpp) "MT_Reactor_Timer_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/MT_Reactor_Upcall_Test.icc b/tests/MT_Reactor_Upcall_Test.icc
index 54cecaf52e7..a73923f841b 100644
--- a/tests/MT_Reactor_Upcall_Test.icc
+++ b/tests/MT_Reactor_Upcall_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "MT_Reactor_Upcall_Test"
 	{
-	   source type (cpp) "MT_Reactor_Upcall_Test.cpp"
+	   source type (cpp) "MT_Reactor_Upcall_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/MT_SOCK_Test.icc b/tests/MT_SOCK_Test.icc
index 66a7edc1164..a2c60d99b92 100644
--- a/tests/MT_SOCK_Test.icc
+++ b/tests/MT_SOCK_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "MT_SOCK_Test"
 	{
-	   source type (cpp) "MT_SOCK_Test.cpp"
+	   source type (cpp) "MT_SOCK_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Malloc_Test.icc b/tests/Malloc_Test.icc
index 98de9090555..1d05b202b6b 100644
--- a/tests/Malloc_Test.icc
+++ b/tests/Malloc_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Malloc_Test"
 	{
-	   source type (cpp) "Malloc_Test.cpp"
+	   source type (cpp) "Malloc_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Map_Manager_Test.icc b/tests/Map_Manager_Test.icc
index 758dca5b580..3084162941d 100644
--- a/tests/Map_Manager_Test.icc
+++ b/tests/Map_Manager_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Map_Manager_Test"
 	{
-	   source type (cpp) "Map_Manager_Test.cpp"
+	   source type (cpp) "Map_Manager_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Map_Test.icc b/tests/Map_Test.icc
index f393c2489e2..bb203fc3994 100644
--- a/tests/Map_Test.icc
+++ b/tests/Map_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Map_Test"
 	{
-	   source type (cpp) "Map_Test.cpp"
+	   source type (cpp) "Map_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Max_Default_Port_Test.icc b/tests/Max_Default_Port_Test.icc
index 40e2e74befb..ba834b8972a 100644
--- a/tests/Max_Default_Port_Test.icc
+++ b/tests/Max_Default_Port_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Max_Default_Port_Test"
 	{
-	   source type (cpp) "Max_Default_Port_Test.cpp"
+	   source type (cpp) "Max_Default_Port_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Mem_Map_Test.icc b/tests/Mem_Map_Test.icc
index bb75b124ed0..77868c5f054 100644
--- a/tests/Mem_Map_Test.icc
+++ b/tests/Mem_Map_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Mem_Map_Test"
 	{
-	   source type (cpp) "Mem_Map_Test.cpp"
+	   source type (cpp) "Mem_Map_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Message_Block_Test.icc b/tests/Message_Block_Test.icc
index 3fc23dc2c70..c6f50b5b73c 100644
--- a/tests/Message_Block_Test.icc
+++ b/tests/Message_Block_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Message_Block_Test"
 	{
-	   source type (cpp) "Message_Block_Test.cpp"
+	   source type (cpp) "Message_Block_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Message_Queue_Notifications_Test.icc b/tests/Message_Queue_Notifications_Test.icc
index c302096d76c..431bfd69fa0 100644
--- a/tests/Message_Queue_Notifications_Test.icc
+++ b/tests/Message_Queue_Notifications_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Message_Queue_Notifications_Test"
 	{
-	   source type (cpp) "Message_Queue_Notifications_Test.cpp"
+	   source type (cpp) "Message_Queue_Notifications_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Message_Queue_Test.icc b/tests/Message_Queue_Test.icc
index 4bcab70bc7f..074c1784690 100644
--- a/tests/Message_Queue_Test.icc
+++ b/tests/Message_Queue_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Message_Queue_Test"
 	{
-	   source type (cpp) "Message_Queue_Test.cpp"
+	   source type (cpp) "Message_Queue_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Message_Queue_Test_Ex.icc b/tests/Message_Queue_Test_Ex.icc
index e301eaf2da1..feb54d5799f 100644
--- a/tests/Message_Queue_Test_Ex.icc
+++ b/tests/Message_Queue_Test_Ex.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Message_Queue_Test_Ex"
 	{
-	   source type (cpp) "Message_Queue_Test_Ex.cpp"
+	   source type (cpp) "Message_Queue_Test_Ex.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Multicast_Test.icc b/tests/Multicast_Test.icc
index 93bd5db4700..76a63f12fe3 100644
--- a/tests/Multicast_Test.icc
+++ b/tests/Multicast_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Multicast_Test"
 	{
-	   source type (cpp) "Multicast_Test.cpp"
+	   source type (cpp) "Multicast_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Multihomed_INET_Addr_Test.icc b/tests/Multihomed_INET_Addr_Test.icc
index 3b4ba8e2851..c30b2202a57 100644
--- a/tests/Multihomed_INET_Addr_Test.icc
+++ b/tests/Multihomed_INET_Addr_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Multihomed_INET_Addr_Test"
 	{
-	   source type (cpp) "Multihomed_INET_Addr_Test.cpp"
+	   source type (cpp) "Multihomed_INET_Addr_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Naming_Test.icc b/tests/Naming_Test.icc
index 640ff7709be..5a386a33f1f 100644
--- a/tests/Naming_Test.icc
+++ b/tests/Naming_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Naming_Test"
 	{
-	   source type (cpp) "Naming_Test.cpp"
+	   source type (cpp) "Naming_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/New_Fail_Test.icc b/tests/New_Fail_Test.icc
index 7c9fc8d133e..90ae576ef7b 100644
--- a/tests/New_Fail_Test.icc
+++ b/tests/New_Fail_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "New_Fail_Test"
 	{
-	   source type (cpp) "New_Fail_Test.cpp"
+	   source type (cpp) "New_Fail_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Notify_Performance_Test.icc b/tests/Notify_Performance_Test.icc
index 8e69665bd51..b4ed6048b6e 100644
--- a/tests/Notify_Performance_Test.icc
+++ b/tests/Notify_Performance_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Notify_Performance_Test"
 	{
-	   source type (cpp) "Notify_Performance_Test.cpp"
+	   source type (cpp) "Notify_Performance_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/OS_Test.icc b/tests/OS_Test.icc
index 87f9badfff5..ba95522ccca 100644
--- a/tests/OS_Test.icc
+++ b/tests/OS_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "OS_Test"
 	{
-	   source type (cpp) "OS_Test.cpp"
+	   source type (cpp) "OS_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Object_Manager_Test.icc b/tests/Object_Manager_Test.icc
index 469c7dd49c8..7384ba87496 100644
--- a/tests/Object_Manager_Test.icc
+++ b/tests/Object_Manager_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Object_Manager_Test"
 	{
-	   source type (cpp) "Object_Manager_Test.cpp"
+	   source type (cpp) "Object_Manager_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Obstack_Test.icc b/tests/Obstack_Test.icc
index 05d46f7d9d0..894fb7f75c5 100644
--- a/tests/Obstack_Test.icc
+++ b/tests/Obstack_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Obstack_Test"
 	{
-	   source type (cpp) "Obstack_Test.cpp"
+	   source type (cpp) "Obstack_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/OrdMultiSet_Test.icc b/tests/OrdMultiSet_Test.icc
index 31b2124bfdf..f03d63e0bdc 100644
--- a/tests/OrdMultiSet_Test.icc
+++ b/tests/OrdMultiSet_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "OrdMultiSet_Test"
 	{
-	   source type (cpp) "OrdMultiSet_Test.cpp"
+	   source type (cpp) "OrdMultiSet_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Pipe_Test.icc b/tests/Pipe_Test.icc
index 6b127789e79..f8c23c9507b 100644
--- a/tests/Pipe_Test.icc
+++ b/tests/Pipe_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Pipe_Test"
 	{
-	   source type (cpp) "Pipe_Test.cpp"
+	   source type (cpp) "Pipe_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Priority_Buffer_Test.icc b/tests/Priority_Buffer_Test.icc
index 45020d07013..5b297b93e75 100644
--- a/tests/Priority_Buffer_Test.icc
+++ b/tests/Priority_Buffer_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Priority_Buffer_Test"
 	{
-	   source type (cpp) "Priority_Buffer_Test.cpp"
+	   source type (cpp) "Priority_Buffer_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Priority_Reactor_Test.icc b/tests/Priority_Reactor_Test.icc
index 3ef1f17389e..ca6132d9b43 100644
--- a/tests/Priority_Reactor_Test.icc
+++ b/tests/Priority_Reactor_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Priority_Reactor_Test"
 	{
-	   source type (cpp) "Priority_Reactor_Test.cpp"
+	   source type (cpp) "Priority_Reactor_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Priority_Task_Test.icc b/tests/Priority_Task_Test.icc
index 6ddf5eee53c..c6b76db7275 100644
--- a/tests/Priority_Task_Test.icc
+++ b/tests/Priority_Task_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Priority_Task_Test"
 	{
-	   source type (cpp) "Priority_Task_Test.cpp"
+	   source type (cpp) "Priority_Task_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Proactor_Scatter_Gather_Test.icc b/tests/Proactor_Scatter_Gather_Test.icc
index ce782704c69..09b34622f93 100644
--- a/tests/Proactor_Scatter_Gather_Test.icc
+++ b/tests/Proactor_Scatter_Gather_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Proactor_Scatter_Gather_Test"
 	{
-	   source type (cpp) "Proactor_Scatter_Gather_Test.cpp"
+	   source type (cpp) "Proactor_Scatter_Gather_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Proactor_Test.icc b/tests/Proactor_Test.icc
index 742aa04e54f..2cf78b0696e 100644
--- a/tests/Proactor_Test.icc
+++ b/tests/Proactor_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Proactor_Test"
 	{
-	   source type (cpp) "Proactor_Test.cpp"
+	   source type (cpp) "Proactor_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Proactor_Timer_Test.icc b/tests/Proactor_Timer_Test.icc
index 15e1ac33310..ab7579266a8 100644
--- a/tests/Proactor_Timer_Test.icc
+++ b/tests/Proactor_Timer_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Proactor_Timer_Test"
 	{
-	   source type (cpp) "Proactor_Timer_Test.cpp"
+	   source type (cpp) "Proactor_Timer_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Process_Manager_Test.icc b/tests/Process_Manager_Test.icc
index 214f7b1c77e..7bf87659e2f 100644
--- a/tests/Process_Manager_Test.icc
+++ b/tests/Process_Manager_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Process_Manager_Test"
 	{
-	   source type (cpp) "Process_Manager_Test.cpp"
+	   source type (cpp) "Process_Manager_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Process_Mutex_Test.icc b/tests/Process_Mutex_Test.icc
index 9dc1af2b96a..ec1f6b0cfcc 100644
--- a/tests/Process_Mutex_Test.icc
+++ b/tests/Process_Mutex_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Process_Mutex_Test"
 	{
-	   source type (cpp) "Process_Mutex_Test.cpp"
+	   source type (cpp) "Process_Mutex_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Process_Strategy_Test.icc b/tests/Process_Strategy_Test.icc
index d9749e639df..94db0505180 100644
--- a/tests/Process_Strategy_Test.icc
+++ b/tests/Process_Strategy_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Process_Strategy_Test"
 	{
-	   source type (cpp) "Process_Strategy_Test.cpp"
+	   source type (cpp) "Process_Strategy_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/RB_Tree_Test.icc b/tests/RB_Tree_Test.icc
index a21f2ba6a0b..38cec83f100 100644
--- a/tests/RB_Tree_Test.icc
+++ b/tests/RB_Tree_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "RB_Tree_Test"
 	{
-	   source type (cpp) "RB_Tree_Test.cpp"
+	   source type (cpp) "RB_Tree_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Reactor_Dispatch_Order_Test.icc b/tests/Reactor_Dispatch_Order_Test.icc
index 6da2f138ed6..eeba8104e09 100644
--- a/tests/Reactor_Dispatch_Order_Test.icc
+++ b/tests/Reactor_Dispatch_Order_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Reactor_Dispatch_Order_Test"
 	{
-	   source type (cpp) "Reactor_Dispatch_Order_Test.cpp"
+	   source type (cpp) "Reactor_Dispatch_Order_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Reactor_Exceptions_Test.icc b/tests/Reactor_Exceptions_Test.icc
index de6cc7ae91c..ef4c24bf027 100644
--- a/tests/Reactor_Exceptions_Test.icc
+++ b/tests/Reactor_Exceptions_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Reactor_Exceptions_Test"
 	{
-	   source type (cpp) "Reactor_Exceptions_Test.cpp"
+	   source type (cpp) "Reactor_Exceptions_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Reactor_Notify_Test.icc b/tests/Reactor_Notify_Test.icc
index 6eefd3e02ce..e0d7996d8f7 100644
--- a/tests/Reactor_Notify_Test.icc
+++ b/tests/Reactor_Notify_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Reactor_Notify_Test"
 	{
-	   source type (cpp) "Reactor_Notify_Test.cpp"
+	   source type (cpp) "Reactor_Notify_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Reactor_Performance_Test.icc b/tests/Reactor_Performance_Test.icc
index 7dfe0809057..75f9e81a4de 100644
--- a/tests/Reactor_Performance_Test.icc
+++ b/tests/Reactor_Performance_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Reactor_Performance_Test"
 	{
-	   source type (cpp) "Reactor_Performance_Test.cpp"
+	   source type (cpp) "Reactor_Performance_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Reactor_Timer_Test.icc b/tests/Reactor_Timer_Test.icc
index 98fef454a43..ce7c81a1c6e 100644
--- a/tests/Reactor_Timer_Test.icc
+++ b/tests/Reactor_Timer_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Reactor_Timer_Test"
 	{
-	   source type (cpp) "Reactor_Timer_Test.cpp"
+	   source type (cpp) "Reactor_Timer_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Reactors_Test.icc b/tests/Reactors_Test.icc
index 8130c0ae1a8..c4111b097b4 100644
--- a/tests/Reactors_Test.icc
+++ b/tests/Reactors_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Reactors_Test"
 	{
-	   source type (cpp) "Reactors_Test.cpp"
+	   source type (cpp) "Reactors_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Reader_Writer_Test.icc b/tests/Reader_Writer_Test.icc
index c256ccac5b3..e68d23e9d08 100644
--- a/tests/Reader_Writer_Test.icc
+++ b/tests/Reader_Writer_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Reader_Writer_Test"
 	{
-	   source type (cpp) "Reader_Writer_Test.cpp"
+	   source type (cpp) "Reader_Writer_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Recursive_Condition_Test.icc b/tests/Recursive_Condition_Test.icc
index b9fca71746f..f706a5309b4 100644
--- a/tests/Recursive_Condition_Test.icc
+++ b/tests/Recursive_Condition_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Recursive_Condition_Test"
 	{
-	   source type (cpp) "Recursive_Condition_Test.cpp"
+	   source type (cpp) "Recursive_Condition_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Recursive_Mutex_Test.icc b/tests/Recursive_Mutex_Test.icc
index 5b9a75b8292..e4e4df26ce5 100644
--- a/tests/Recursive_Mutex_Test.icc
+++ b/tests/Recursive_Mutex_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Recursive_Mutex_Test"
 	{
-	   source type (cpp) "Recursive_Mutex_Test.cpp"
+	   source type (cpp) "Recursive_Mutex_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Refcounted_Auto_Ptr_Test.icc b/tests/Refcounted_Auto_Ptr_Test.icc
index d94c8030261..e6dfa7031da 100644
--- a/tests/Refcounted_Auto_Ptr_Test.icc
+++ b/tests/Refcounted_Auto_Ptr_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Refcounted_Auto_Ptr_Test"
 	{
-	   source type (cpp) "Refcounted_Auto_Ptr_Test.cpp"
+	   source type (cpp) "Refcounted_Auto_Ptr_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Reverse_Lock_Test.icc b/tests/Reverse_Lock_Test.icc
index ac4f2531783..c54d8839e38 100644
--- a/tests/Reverse_Lock_Test.icc
+++ b/tests/Reverse_Lock_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Reverse_Lock_Test"
 	{
-	   source type (cpp) "Reverse_Lock_Test.cpp"
+	   source type (cpp) "Reverse_Lock_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/SOCK_Connector_Test.icc b/tests/SOCK_Connector_Test.icc
index 606e317b174..5c8b84664eb 100644
--- a/tests/SOCK_Connector_Test.icc
+++ b/tests/SOCK_Connector_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "SOCK_Connector_Test"
 	{
-	   source type (cpp) "SOCK_Connector_Test.cpp"
+	   source type (cpp) "SOCK_Connector_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/SOCK_Send_Recv_Test.icc b/tests/SOCK_Send_Recv_Test.icc
index 8ce21658526..6dab36427c6 100644
--- a/tests/SOCK_Send_Recv_Test.icc
+++ b/tests/SOCK_Send_Recv_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "SOCK_Send_Recv_Test"
 	{
-	   source type (cpp) "SOCK_Send_Recv_Test.cpp"
+	   source type (cpp) "SOCK_Send_Recv_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/SOCK_Test.icc b/tests/SOCK_Test.icc
index 9338423ff3c..e9f23c5fe99 100644
--- a/tests/SOCK_Test.icc
+++ b/tests/SOCK_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "SOCK_Test"
 	{
-	   source type (cpp) "SOCK_Test.cpp"
+	   source type (cpp) "SOCK_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/SPIPE_Test.icc b/tests/SPIPE_Test.icc
index 6fc05894e1d..71b7abf6ca7 100644
--- a/tests/SPIPE_Test.icc
+++ b/tests/SPIPE_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "SPIPE_Test"
 	{
-	   source type (cpp) "SPIPE_Test.cpp"
+	   source type (cpp) "SPIPE_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/SString_Test.icc b/tests/SString_Test.icc
index f5e2ffb2fd6..66eb4c07cf8 100644
--- a/tests/SString_Test.icc
+++ b/tests/SString_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "SString_Test"
 	{
-	   source type (cpp) "SString_Test.cpp"
+	   source type (cpp) "SString_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/SV_Shared_Memory_Test.icc b/tests/SV_Shared_Memory_Test.icc
index 76c76777f6b..f838cac8b61 100644
--- a/tests/SV_Shared_Memory_Test.icc
+++ b/tests/SV_Shared_Memory_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "SV_Shared_Memory_Test"
 	{
-	   source type (cpp) "SV_Shared_Memory_Test.cpp"
+	   source type (cpp) "SV_Shared_Memory_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Semaphore_Test.icc b/tests/Semaphore_Test.icc
index 0173d180d13..316ef04bc23 100644
--- a/tests/Semaphore_Test.icc
+++ b/tests/Semaphore_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Semaphore_Test"
 	{
-	   source type (cpp) "Semaphore_Test.cpp"
+	   source type (cpp) "Semaphore_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Service_Config_Test.icc b/tests/Service_Config_Test.icc
index 5987e9f6738..c67c45b9fb1 100644
--- a/tests/Service_Config_Test.icc
+++ b/tests/Service_Config_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Service_Config_Test"
 	{
-	   source type (cpp) "Service_Config_Test.cpp"
+	   source type (cpp) "Service_Config_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Signal_Test.icc b/tests/Signal_Test.icc
index 235292cd753..f86378387ea 100644
--- a/tests/Signal_Test.icc
+++ b/tests/Signal_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Signal_Test"
 	{
-	   source type (cpp) "Signal_Test.cpp"
+	   source type (cpp) "Signal_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Sigset_Ops_Test.icc b/tests/Sigset_Ops_Test.icc
index f5a54aa38de..0a74a2285a1 100644
--- a/tests/Sigset_Ops_Test.icc
+++ b/tests/Sigset_Ops_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Sigset_Ops_Test"
 	{
-	   source type (cpp) "Sigset_Ops_Test.cpp"
+	   source type (cpp) "Sigset_Ops_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Simple_Message_Block_Test.icc b/tests/Simple_Message_Block_Test.icc
index b82ca135fe0..5ada97b33a0 100644
--- a/tests/Simple_Message_Block_Test.icc
+++ b/tests/Simple_Message_Block_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Simple_Message_Block_Test"
 	{
-	   source type (cpp) "Simple_Message_Block_Test.cpp"
+	   source type (cpp) "Simple_Message_Block_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Svc_Handler_Test.icc b/tests/Svc_Handler_Test.icc
index 30f4f687678..c3a79331994 100644
--- a/tests/Svc_Handler_Test.icc
+++ b/tests/Svc_Handler_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Svc_Handler_Test"
 	{
-	   source type (cpp) "Svc_Handler_Test.cpp"
+	   source type (cpp) "Svc_Handler_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/TP_Reactor_Test.icc b/tests/TP_Reactor_Test.icc
index e9f15d19212..b11c1e9910a 100644
--- a/tests/TP_Reactor_Test.icc
+++ b/tests/TP_Reactor_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "TP_Reactor_Test"
 	{
-	   source type (cpp) "TP_Reactor_Test.cpp"
+	   source type (cpp) "TP_Reactor_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/TSS_Test.icc b/tests/TSS_Test.icc
index f708a0d13be..0535b9b2cfa 100644
--- a/tests/TSS_Test.icc
+++ b/tests/TSS_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "TSS_Test"
 	{
-	   source type (cpp) "TSS_Test.cpp"
+	   source type (cpp) "TSS_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Task_Test.icc b/tests/Task_Test.icc
index 231d51e8b06..6064c4360a2 100644
--- a/tests/Task_Test.icc
+++ b/tests/Task_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Task_Test"
 	{
-	   source type (cpp) "Task_Test.cpp"
+	   source type (cpp) "Task_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Thread_Manager_Test.icc b/tests/Thread_Manager_Test.icc
index b7be7dcce86..bcee2d487c4 100644
--- a/tests/Thread_Manager_Test.icc
+++ b/tests/Thread_Manager_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Thread_Manager_Test"
 	{
-	   source type (cpp) "Thread_Manager_Test.cpp"
+	   source type (cpp) "Thread_Manager_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Thread_Mutex_Test.icc b/tests/Thread_Mutex_Test.icc
index 1901649aa0b..dcecaec5b6d 100644
--- a/tests/Thread_Mutex_Test.icc
+++ b/tests/Thread_Mutex_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Thread_Mutex_Test"
 	{
-	   source type (cpp) "Thread_Mutex_Test.cpp"
+	   source type (cpp) "Thread_Mutex_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Thread_Pool_Reactor_Resume_Test.icc b/tests/Thread_Pool_Reactor_Resume_Test.icc
index 4feefc6069b..2844ad55cda 100644
--- a/tests/Thread_Pool_Reactor_Resume_Test.icc
+++ b/tests/Thread_Pool_Reactor_Resume_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Thread_Pool_Reactor_Resume_Test"
 	{
-	   source type (cpp) "Thread_Pool_Reactor_Resume_Test.cpp"
+	   source type (cpp) "Thread_Pool_Reactor_Resume_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Thread_Pool_Reactor_Test.icc b/tests/Thread_Pool_Reactor_Test.icc
index 1307567e5f0..a38064790af 100644
--- a/tests/Thread_Pool_Reactor_Test.icc
+++ b/tests/Thread_Pool_Reactor_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Thread_Pool_Reactor_Test"
 	{
-	   source type (cpp) "Thread_Pool_Reactor_Test.cpp"
+	   source type (cpp) "Thread_Pool_Reactor_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Thread_Pool_Test.icc b/tests/Thread_Pool_Test.icc
index 5ddbfa4b662..bf375796b64 100644
--- a/tests/Thread_Pool_Test.icc
+++ b/tests/Thread_Pool_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Thread_Pool_Test"
 	{
-	   source type (cpp) "Thread_Pool_Test.cpp"
+	   source type (cpp) "Thread_Pool_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Time_Service_Test.icc b/tests/Time_Service_Test.icc
index ca38af03ea1..f4bea80cbaa 100644
--- a/tests/Time_Service_Test.icc
+++ b/tests/Time_Service_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Time_Service_Test"
 	{
-	   source type (cpp) "Time_Service_Test.cpp"
+	   source type (cpp) "Time_Service_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Time_Value_Test.icc b/tests/Time_Value_Test.icc
index 21b6fa42496..d5786675efc 100644
--- a/tests/Time_Value_Test.icc
+++ b/tests/Time_Value_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Time_Value_Test"
 	{
-	   source type (cpp) "Time_Value_Test.cpp"
+	   source type (cpp) "Time_Value_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Timeprobe_Test.icc b/tests/Timeprobe_Test.icc
index feb6f487bf1..d800f46e752 100644
--- a/tests/Timeprobe_Test.icc
+++ b/tests/Timeprobe_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Timeprobe_Test"
 	{
-	   source type (cpp) "Timeprobe_Test.cpp"
+	   source type (cpp) "Timeprobe_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Timer_Queue_Test.icc b/tests/Timer_Queue_Test.icc
index b3a43090ccb..5cae8cd8f81 100644
--- a/tests/Timer_Queue_Test.icc
+++ b/tests/Timer_Queue_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Timer_Queue_Test"
 	{
-	   source type (cpp) "Timer_Queue_Test.cpp"
+	   source type (cpp) "Timer_Queue_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/TkReactor_Test.icc b/tests/TkReactor_Test.icc
index 1b3280eef4e..3a16d4960a3 100644
--- a/tests/TkReactor_Test.icc
+++ b/tests/TkReactor_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "TkReactor_Test"
 	{
-	   source type (cpp) "TkReactor_Test.cpp"
+	   source type (cpp) "TkReactor_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Token_Strategy_Test.icc b/tests/Token_Strategy_Test.icc
index 1afb367d555..dc0e04f154b 100644
--- a/tests/Token_Strategy_Test.icc
+++ b/tests/Token_Strategy_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Token_Strategy_Test"
 	{
-	   source type (cpp) "Token_Strategy_Test.cpp"
+	   source type (cpp) "Token_Strategy_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Tokens_Test.icc b/tests/Tokens_Test.icc
index e6cc8ce4824..6db29f96e56 100644
--- a/tests/Tokens_Test.icc
+++ b/tests/Tokens_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Tokens_Test"
 	{
-	   source type (cpp) "Tokens_Test.cpp"
+	   source type (cpp) "Tokens_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/UPIPE_SAP_Test.icc b/tests/UPIPE_SAP_Test.icc
index d4c7871ca75..5628dbae23b 100644
--- a/tests/UPIPE_SAP_Test.icc
+++ b/tests/UPIPE_SAP_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "UPIPE_SAP_Test"
 	{
-	   source type (cpp) "UPIPE_SAP_Test.cpp"
+	   source type (cpp) "UPIPE_SAP_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Unbounded_Set_Test.icc b/tests/Unbounded_Set_Test.icc
index 7bfe45b0937..ca74f3a44e9 100644
--- a/tests/Unbounded_Set_Test.icc
+++ b/tests/Unbounded_Set_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Unbounded_Set_Test"
 	{
-	   source type (cpp) "Unbounded_Set_Test.cpp"
+	   source type (cpp) "Unbounded_Set_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Unbounded_Set_Test_Ex.icc b/tests/Unbounded_Set_Test_Ex.icc
index c781aede52d..d886e403f6c 100644
--- a/tests/Unbounded_Set_Test_Ex.icc
+++ b/tests/Unbounded_Set_Test_Ex.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Unbounded_Set_Test_Ex"
 	{
-	   source type (cpp) "Unbounded_Set_Test_Ex.cpp"
+	   source type (cpp) "Unbounded_Set_Test_Ex.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Upgradable_RW_Test.icc b/tests/Upgradable_RW_Test.icc
index 7300935edc6..fadb519b737 100644
--- a/tests/Upgradable_RW_Test.icc
+++ b/tests/Upgradable_RW_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Upgradable_RW_Test"
 	{
-	   source type (cpp) "Upgradable_RW_Test.cpp"
+	   source type (cpp) "Upgradable_RW_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/Vector_Test.icc b/tests/Vector_Test.icc
index 794f8984940..85f8563c1a2 100644
--- a/tests/Vector_Test.icc
+++ b/tests/Vector_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "Vector_Test"
 	{
-	   source type (cpp) "Vector_Test.cpp"
+	   source type (cpp) "Vector_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/XtReactor_Test.icc b/tests/XtReactor_Test.icc
index a2575231ff8..e3e55b668f7 100644
--- a/tests/XtReactor_Test.icc
+++ b/tests/XtReactor_Test.icc
@@ -9,7 +9,7 @@ option
     {
 	target type (exe) "XtReactor_Test"
 	{
-	   source type (cpp) "XtReactor_Test.cpp"
+	   source type (cpp) "XtReactor_Test.cpp", "Main.cpp"
 	   if ($__IBMCPP__ >= 500) {
 	     option macros(global) {
 	       source type (hpp) "test_config.h"
diff --git a/tests/tests.icp b/tests/tests.icp
index 9d592631c25..7e580d72b66 100644
--- a/tests/tests.icp
+++ b/tests/tests.icp
@@ -2,6 +2,10 @@
 //
 // Visual Age C++ 5 Project file for building all the tests.
 
+subproject libTest_Output icc "libTest_Output.icc", ics "libTest_Output.ics"
+{
+}
+
 subproject Arg_Shifter_Test icc "Arg_Shifter_Test.icc", ics "Arg_Shifter_Test.ics"
 {
 }
diff --git a/tests/vacpp_setup.icc b/tests/vacpp_setup.icc
index 377b3e61cc5..18252b7679d 100644
--- a/tests/vacpp_setup.icc
+++ b/tests/vacpp_setup.icc
@@ -17,7 +17,8 @@ if $__TOS_WIN__ {
                                  "user32.lib",
                                  "ws2_32.lib",
                                  "wsock32.lib",
-                                 "mswsock.lib"
+                                 "mswsock.lib",
+                                 "Test_Output.lib"
 }
 if $__TOS_AIX__ {
         option PlatformOptions =
@@ -27,5 +28,6 @@ if $__TOS_AIX__ {
                 opt(level, 3),
                 gen(enumsize, small)
         platformLibSearchPath = "../ace"
-        group platformLinkLibs = "libACE.a"
+        group platformLinkLibs = "libACE.a",
+                                 "libTest_Output.a"
 }