ChangeLogTag:Thu Feb 24 12:35:31 2000 Steve Huston <shuston@riverace.com>

89 files changed, 1063 insertions, 1224 deletions

diff --git a/tests/ARGV_Test.icc b/tests/ARGV_Test.icc
new file mode 100644
index 00000000000..06bae6dbff1
--- /dev/null
+++ b/tests/ARGV_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "ARGV_Test"
+	{
+	   source type (cpp) "ARGV_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Aio_Platform_Test.icc b/tests/Aio_Platform_Test.icc
index 7d09ea6653e..da98d0feb29 100644
--- a/tests/Aio_Platform_Test.icc
+++ b/tests/Aio_Platform_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Aio_Platform_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Aio_Platform_Test"
 	{
 	   source type (cpp) "Aio_Platform_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Atomic_Op_Test.icc b/tests/Atomic_Op_Test.icc
index 0ea8582491a..fc9a5358dc0 100644
--- a/tests/Atomic_Op_Test.icc
+++ b/tests/Atomic_Op_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Atomic_Op_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Atomic_Op_Test"
 	{
 	   source type (cpp) "Atomic_Op_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Auto_IncDec_Test.icc b/tests/Auto_IncDec_Test.icc
new file mode 100644
index 00000000000..0a52bc3343a
--- /dev/null
+++ b/tests/Auto_IncDec_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Auto_IncDec_Test"
+	{
+	   source type (cpp) "Auto_IncDec_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Barrier_Test.icc b/tests/Barrier_Test.icc
index 0c93db4235a..2c706cb2371 100644
--- a/tests/Barrier_Test.icc
+++ b/tests/Barrier_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Barrier_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Barrier_Test"
 	{
 	   source type (cpp) "Barrier_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Basic_Types_Test.icc b/tests/Basic_Types_Test.icc
index e5f8ee7d26a..56e45d6be97 100644
--- a/tests/Basic_Types_Test.icc
+++ b/tests/Basic_Types_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Basic_Types_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Basic_Types_Test"
 	{
 	   source type (cpp) "Basic_Types_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Buffer_Stream_Test.icc b/tests/Buffer_Stream_Test.icc
index a96bd80dd17..5f8e3a8bca6 100644
--- a/tests/Buffer_Stream_Test.icc
+++ b/tests/Buffer_Stream_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Buffer_Stream_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Buffer_Stream_Test"
 	{
 	   source type (cpp) "Buffer_Stream_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/CDR_File_Test.icc b/tests/CDR_File_Test.icc
new file mode 100644
index 00000000000..c0687839b1f
--- /dev/null
+++ b/tests/CDR_File_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "CDR_File_Test"
+	{
+	   source type (cpp) "CDR_File_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/CDR_Test.icc b/tests/CDR_Test.icc
index 90e35af9bbe..e4fa7cbbc08 100644
--- a/tests/CDR_Test.icc
+++ b/tests/CDR_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "CDR_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "CDR_Test"
 	{
 	   source type (cpp) "CDR_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Cache_Map_Manager_Test.icc b/tests/Cache_Map_Manager_Test.icc
new file mode 100644
index 00000000000..18324753653
--- /dev/null
+++ b/tests/Cache_Map_Manager_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Cache_Map_Manager_Test"
+	{
+	   source type (cpp) "Cache_Map_Manager_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Cached_Accept_Conn_Test.icc b/tests/Cached_Accept_Conn_Test.icc
new file mode 100644
index 00000000000..086e4a49dca
--- /dev/null
+++ b/tests/Cached_Accept_Conn_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Cached_Accept_Conn_Test"
+	{
+	   source type (cpp) "Cached_Accept_Conn_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Cached_Conn_Test.icc b/tests/Cached_Conn_Test.icc
new file mode 100644
index 00000000000..fad52af6a60
--- /dev/null
+++ b/tests/Cached_Conn_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Cached_Conn_Test"
+	{
+	   source type (cpp) "Cached_Conn_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Capabilities_Test.icc b/tests/Capabilities_Test.icc
new file mode 100644
index 00000000000..54c5675925c
--- /dev/null
+++ b/tests/Capabilities_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Capabilities_Test"
+	{
+	   source type (cpp) "Capabilities_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Collection_Test.icc b/tests/Collection_Test.icc
index b36c67bb625..64c778b20e0 100644
--- a/tests/Collection_Test.icc
+++ b/tests/Collection_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Collection_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Collection_Test"
 	{
 	   source type (cpp) "Collection_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Conn_Test.icc b/tests/Conn_Test.icc
index 1ae4651b51f..e96c2979c1d 100644
--- a/tests/Conn_Test.icc
+++ b/tests/Conn_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Conn_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Conn_Test"
 	{
 	   source type (cpp) "Conn_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/DLL_Test.icc b/tests/DLL_Test.icc
index 783af1bd1d3..6c974f63473 100644
--- a/tests/DLL_Test.icc
+++ b/tests/DLL_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "DLL_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "DLL_Test"
 	{
 	   source type (cpp) "DLL_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/DLList_Test.icc b/tests/DLList_Test.icc
index 010a2e759ea..9868a24384b 100644
--- a/tests/DLList_Test.icc
+++ b/tests/DLList_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "DLList_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "DLList_Test"
 	{
 	   source type (cpp) "DLList_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Dynamic_Priority_Test.icc b/tests/Dynamic_Priority_Test.icc
index 2e32c40956f..711a275c1fe 100644
--- a/tests/Dynamic_Priority_Test.icc
+++ b/tests/Dynamic_Priority_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Dynamic_Priority_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Dynamic_Priority_Test"
 	{
 	   source type (cpp) "Dynamic_Priority_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Enum_Interfaces_Test.icc b/tests/Enum_Interfaces_Test.icc
index e02e53debf8..6e10cae7cb6 100644
--- a/tests/Enum_Interfaces_Test.icc
+++ b/tests/Enum_Interfaces_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Enum_Interfaces_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Enum_Interfaces_Test"
 	{
 	   source type (cpp) "Enum_Interfaces_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Env_Value_Test.icc b/tests/Env_Value_Test.icc
index 63665aee4a9..94cfede3007 100644
--- a/tests/Env_Value_Test.icc
+++ b/tests/Env_Value_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Env_Value_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Env_Value_Test"
 	{
 	   source type (cpp) "Env_Value_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/FlReactor_Test.icc b/tests/FlReactor_Test.icc
new file mode 100644
index 00000000000..083783ffab5
--- /dev/null
+++ b/tests/FlReactor_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "FlReactor_Test"
+	{
+	   source type (cpp) "FlReactor_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Future_Set_Test.icc b/tests/Future_Set_Test.icc
new file mode 100644
index 00000000000..d088c8d6f71
--- /dev/null
+++ b/tests/Future_Set_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Future_Set_Test"
+	{
+	   source type (cpp) "Future_Set_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Future_Test.icc b/tests/Future_Test.icc
index 6b62f1d82df..ccafe087791 100644
--- a/tests/Future_Test.icc
+++ b/tests/Future_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Future_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Future_Test"
 	{
 	   source type (cpp) "Future_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Handle_Set_Test.icc b/tests/Handle_Set_Test.icc
index c3b7f53f8ea..b50cda29052 100644
--- a/tests/Handle_Set_Test.icc
+++ b/tests/Handle_Set_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Handle_Set_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Handle_Set_Test"
 	{
 	   source type (cpp) "Handle_Set_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Hash_Map_Bucket_Iterator_Test.icc b/tests/Hash_Map_Bucket_Iterator_Test.icc
new file mode 100644
index 00000000000..765b9fa77aa
--- /dev/null
+++ b/tests/Hash_Map_Bucket_Iterator_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Hash_Map_Bucket_Iterator_Test"
+	{
+	   source type (cpp) "Hash_Map_Bucket_Iterator_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Hash_Map_Manager_Test.icc b/tests/Hash_Map_Manager_Test.icc
index a9245ae17ed..136d8dbc80f 100644
--- a/tests/Hash_Map_Manager_Test.icc
+++ b/tests/Hash_Map_Manager_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Hash_Map_Manager_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Hash_Map_Manager_Test"
 	{
 	   source type (cpp) "Hash_Map_Manager_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/High_Res_Timer_Test.icc b/tests/High_Res_Timer_Test.icc
index f703ae217df..a5a6694b0b6 100644
--- a/tests/High_Res_Timer_Test.icc
+++ b/tests/High_Res_Timer_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "High_Res_Timer_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "High_Res_Timer_Test"
 	{
 	   source type (cpp) "High_Res_Timer_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/IOStream_Test.icc b/tests/IOStream_Test.icc
index a02572c7eca..923ed7a43bd 100644
--- a/tests/IOStream_Test.icc
+++ b/tests/IOStream_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "IOStream_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "IOStream_Test"
 	{
 	   source type (cpp) "IOStream_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Lazy_Map_Manager_Test.icc b/tests/Lazy_Map_Manager_Test.icc
new file mode 100644
index 00000000000..a7af6543df2
--- /dev/null
+++ b/tests/Lazy_Map_Manager_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Lazy_Map_Manager_Test"
+	{
+	   source type (cpp) "Lazy_Map_Manager_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Log_Msg_Test.icc b/tests/Log_Msg_Test.icc
new file mode 100644
index 00000000000..c6a244abd00
--- /dev/null
+++ b/tests/Log_Msg_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Log_Msg_Test"
+	{
+	   source type (cpp) "Log_Msg_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/MM_Shared_Memory_Test.icc b/tests/MM_Shared_Memory_Test.icc
index 5cb87f2c105..3815c99b9db 100644
--- a/tests/MM_Shared_Memory_Test.icc
+++ b/tests/MM_Shared_Memory_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "MM_Shared_Memory_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "MM_Shared_Memory_Test"
 	{
 	   source type (cpp) "MM_Shared_Memory_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/MT_Reactor_Timer_Test.icc b/tests/MT_Reactor_Timer_Test.icc
index d391eaf0b86..d34a02ec696 100644
--- a/tests/MT_Reactor_Timer_Test.icc
+++ b/tests/MT_Reactor_Timer_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "MT_Reactor_Timer_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "MT_Reactor_Timer_Test"
 	{
 	   source type (cpp) "MT_Reactor_Timer_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/MT_SOCK_Test.icc b/tests/MT_SOCK_Test.icc
index 5c1ef1c81d0..77d2b7b0698 100644
--- a/tests/MT_SOCK_Test.icc
+++ b/tests/MT_SOCK_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "MT_SOCK_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "MT_SOCK_Test"
 	{
 	   source type (cpp) "MT_SOCK_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Malloc_Test.icc b/tests/Malloc_Test.icc
new file mode 100644
index 00000000000..8733c62934c
--- /dev/null
+++ b/tests/Malloc_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Malloc_Test"
+	{
+	   source type (cpp) "Malloc_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Map_Manager_Test.icc b/tests/Map_Manager_Test.icc
index af813897c7d..0aef50e3dc9 100644
--- a/tests/Map_Manager_Test.icc
+++ b/tests/Map_Manager_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Map_Manager_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Map_Manager_Test"
 	{
 	   source type (cpp) "Map_Manager_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Map_Test.icc b/tests/Map_Test.icc
index 1ac3b09db52..f53d0d6e9dc 100644
--- a/tests/Map_Test.icc
+++ b/tests/Map_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Map_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Map_Test"
 	{
 	   source type (cpp) "Map_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Mem_Map_Test.icc b/tests/Mem_Map_Test.icc
index 00a3e8c9dc6..8532031e085 100644
--- a/tests/Mem_Map_Test.icc
+++ b/tests/Mem_Map_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Mem_Map_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Mem_Map_Test"
 	{
 	   source type (cpp) "Mem_Map_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Message_Block_Test.icc b/tests/Message_Block_Test.icc
index bc1d3d8508b..deb961d78d6 100644
--- a/tests/Message_Block_Test.icc
+++ b/tests/Message_Block_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Message_Block_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Message_Block_Test"
 	{
 	   source type (cpp) "Message_Block_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Message_Queue_Notifications_Test.icc b/tests/Message_Queue_Notifications_Test.icc
index 1b4f8b21ae2..c576ca09def 100644
--- a/tests/Message_Queue_Notifications_Test.icc
+++ b/tests/Message_Queue_Notifications_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Message_Queue_Notifications_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Message_Queue_Notifications_Test"
 	{
 	   source type (cpp) "Message_Queue_Notifications_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Message_Queue_Test.icc b/tests/Message_Queue_Test.icc
index 21674f92c35..a02553d7280 100644
--- a/tests/Message_Queue_Test.icc
+++ b/tests/Message_Queue_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Message_Queue_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Message_Queue_Test"
 	{
 	   source type (cpp) "Message_Queue_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Naming_Test.icc b/tests/Naming_Test.icc
index 82bef6c6916..c41bbb02c53 100644
--- a/tests/Naming_Test.icc
+++ b/tests/Naming_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Naming_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Naming_Test"
 	{
 	   source type (cpp) "Naming_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/New_Fail_Test.icc b/tests/New_Fail_Test.icc
new file mode 100644
index 00000000000..8c5879d414d
--- /dev/null
+++ b/tests/New_Fail_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "New_Fail_Test"
+	{
+	   source type (cpp) "New_Fail_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Notify_Performance_Test.icc b/tests/Notify_Performance_Test.icc
index 2ff67813697..34726f8e6c2 100644
--- a/tests/Notify_Performance_Test.icc
+++ b/tests/Notify_Performance_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Notify_Performance_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Notify_Performance_Test"
 	{
 	   source type (cpp) "Notify_Performance_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Object_Manager_Test.icc b/tests/Object_Manager_Test.icc
new file mode 100644
index 00000000000..a3cf997dae9
--- /dev/null
+++ b/tests/Object_Manager_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Object_Manager_Test"
+	{
+	   source type (cpp) "Object_Manager_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/OrdMultiSet_Test.icc b/tests/OrdMultiSet_Test.icc
index b74e8f468b4..cd76bc847c6 100644
--- a/tests/OrdMultiSet_Test.icc
+++ b/tests/OrdMultiSet_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "OrdMultiSet_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "OrdMultiSet_Test"
 	{
 	   source type (cpp) "OrdMultiSet_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Pipe_Test.icc b/tests/Pipe_Test.icc
index bc6ad7d05d5..f12e55e4d0f 100644
--- a/tests/Pipe_Test.icc
+++ b/tests/Pipe_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Pipe_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Pipe_Test"
 	{
 	   source type (cpp) "Pipe_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Priority_Buffer_Test.icc b/tests/Priority_Buffer_Test.icc
index cfd3a72b880..0d09c6c3309 100644
--- a/tests/Priority_Buffer_Test.icc
+++ b/tests/Priority_Buffer_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Priority_Buffer_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Priority_Buffer_Test"
 	{
 	   source type (cpp) "Priority_Buffer_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Priority_Reactor_Test.icc b/tests/Priority_Reactor_Test.icc
index 46831825cc0..c74cdff0408 100644
--- a/tests/Priority_Reactor_Test.icc
+++ b/tests/Priority_Reactor_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Priority_Reactor_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Priority_Reactor_Test"
 	{
 	   source type (cpp) "Priority_Reactor_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Priority_Task_Test.icc b/tests/Priority_Task_Test.icc
index c2b446c877c..48f4a8629d4 100644
--- a/tests/Priority_Task_Test.icc
+++ b/tests/Priority_Task_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Priority_Task_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Priority_Task_Test"
 	{
 	   source type (cpp) "Priority_Task_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Process_Manager_Test.icc b/tests/Process_Manager_Test.icc
new file mode 100644
index 00000000000..d4642cf02bf
--- /dev/null
+++ b/tests/Process_Manager_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Process_Manager_Test"
+	{
+	   source type (cpp) "Process_Manager_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Process_Mutex_Test.icc b/tests/Process_Mutex_Test.icc
index 33ae797b3bf..e34cdce05e7 100644
--- a/tests/Process_Mutex_Test.icc
+++ b/tests/Process_Mutex_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Process_Mutex_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Process_Mutex_Test"
 	{
 	   source type (cpp) "Process_Mutex_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Process_Strategy_Test.icc b/tests/Process_Strategy_Test.icc
index 6d635f45967..7136661988f 100644
--- a/tests/Process_Strategy_Test.icc
+++ b/tests/Process_Strategy_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Process_Strategy_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Process_Strategy_Test"
 	{
 	   source type (cpp) "Process_Strategy_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Purgable_Map_Manager_Test.icc b/tests/Purgable_Map_Manager_Test.icc
index 0ffd1a6e76b..5fe85504cdc 100644
--- a/tests/Purgable_Map_Manager_Test.icc
+++ b/tests/Purgable_Map_Manager_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Purgable_Map_Manager_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Purgable_Map_Manager_Test"
 	{
 	   source type (cpp) "Purgable_Map_Manager_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/RB_Tree_Test.icc b/tests/RB_Tree_Test.icc
index 647fe72248e..3ea78cdfae1 100644
--- a/tests/RB_Tree_Test.icc
+++ b/tests/RB_Tree_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "RB_Tree_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "RB_Tree_Test"
 	{
 	   source type (cpp) "RB_Tree_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Reactor_Exceptions_Test.icc b/tests/Reactor_Exceptions_Test.icc
index be4e903690f..bc7d5fc9058 100644
--- a/tests/Reactor_Exceptions_Test.icc
+++ b/tests/Reactor_Exceptions_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Reactor_Exceptions_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Reactor_Exceptions_Test"
 	{
 	   source type (cpp) "Reactor_Exceptions_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Reactor_Notify_Test.icc b/tests/Reactor_Notify_Test.icc
index 60e80213aa5..d2b8bb40f7a 100644
--- a/tests/Reactor_Notify_Test.icc
+++ b/tests/Reactor_Notify_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Reactor_Notify_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Reactor_Notify_Test"
 	{
 	   source type (cpp) "Reactor_Notify_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Reactor_Performance_Test.icc b/tests/Reactor_Performance_Test.icc
index 1c8c6bf81bf..26641d72d82 100644
--- a/tests/Reactor_Performance_Test.icc
+++ b/tests/Reactor_Performance_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Reactor_Performance_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Reactor_Performance_Test"
 	{
 	   source type (cpp) "Reactor_Performance_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Reactor_Timer_Test.icc b/tests/Reactor_Timer_Test.icc
index 7803cfb2fea..cb8a7682960 100644
--- a/tests/Reactor_Timer_Test.icc
+++ b/tests/Reactor_Timer_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Reactor_Timer_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Reactor_Timer_Test"
 	{
 	   source type (cpp) "Reactor_Timer_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Reactors_Test.icc b/tests/Reactors_Test.icc
index 08ee8110b58..b6abe6a1dce 100644
--- a/tests/Reactors_Test.icc
+++ b/tests/Reactors_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Reactors_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Reactors_Test"
 	{
 	   source type (cpp) "Reactors_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Reader_Writer_Test.icc b/tests/Reader_Writer_Test.icc
index 1066d73ee30..9f3ff3e9db4 100644
--- a/tests/Reader_Writer_Test.icc
+++ b/tests/Reader_Writer_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Reader_Writer_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Reader_Writer_Test"
 	{
 	   source type (cpp) "Reader_Writer_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Recursive_Mutex_Test.icc b/tests/Recursive_Mutex_Test.icc
index 765c7537b05..7eb3f904149 100644
--- a/tests/Recursive_Mutex_Test.icc
+++ b/tests/Recursive_Mutex_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Recursive_Mutex_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Recursive_Mutex_Test"
 	{
 	   source type (cpp) "Recursive_Mutex_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Reverse_Lock_Test.icc b/tests/Reverse_Lock_Test.icc
new file mode 100644
index 00000000000..afee3953711
--- /dev/null
+++ b/tests/Reverse_Lock_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Reverse_Lock_Test"
+	{
+	   source type (cpp) "Reverse_Lock_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/SOCK_Connector_Test.icc b/tests/SOCK_Connector_Test.icc
index 65474d09c4f..3cdb5e52d80 100644
--- a/tests/SOCK_Connector_Test.icc
+++ b/tests/SOCK_Connector_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "SOCK_Connector_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "SOCK_Connector_Test"
 	{
 	   source type (cpp) "SOCK_Connector_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/SOCK_Send_Recv_Test.icc b/tests/SOCK_Send_Recv_Test.icc
new file mode 100644
index 00000000000..57ed6eed44d
--- /dev/null
+++ b/tests/SOCK_Send_Recv_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "SOCK_Send_Recv_Test"
+	{
+	   source type (cpp) "SOCK_Send_Recv_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/SOCK_Test.icc b/tests/SOCK_Test.icc
index bff3f281b73..6bfa7c2eb2c 100644
--- a/tests/SOCK_Test.icc
+++ b/tests/SOCK_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "SOCK_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "SOCK_Test"
 	{
 	   source type (cpp) "SOCK_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/SPIPE_Test.icc b/tests/SPIPE_Test.icc
index 06adf2cd6fd..d850d3b7ad8 100644
--- a/tests/SPIPE_Test.icc
+++ b/tests/SPIPE_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "SPIPE_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "SPIPE_Test"
 	{
 	   source type (cpp) "SPIPE_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/SString_Test.icc b/tests/SString_Test.icc
index b78d81ee967..4fcc1578e90 100644
--- a/tests/SString_Test.icc
+++ b/tests/SString_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "SString_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "SString_Test"
 	{
 	   source type (cpp) "SString_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/SV_Shared_Memory_Test.icc b/tests/SV_Shared_Memory_Test.icc
index b9523b7f01d..b548198a5c1 100644
--- a/tests/SV_Shared_Memory_Test.icc
+++ b/tests/SV_Shared_Memory_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "SV_Shared_Memory_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "SV_Shared_Memory_Test"
 	{
 	   source type (cpp) "SV_Shared_Memory_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Semaphore_Test.icc b/tests/Semaphore_Test.icc
index ddea71a4643..672426e8366 100644
--- a/tests/Semaphore_Test.icc
+++ b/tests/Semaphore_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Semaphore_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Semaphore_Test"
 	{
 	   source type (cpp) "Semaphore_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Service_Config_Test.icc b/tests/Service_Config_Test.icc
index ad6a2672a33..691ae6bc4fc 100644
--- a/tests/Service_Config_Test.icc
+++ b/tests/Service_Config_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Service_Config_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Service_Config_Test"
 	{
 	   source type (cpp) "Service_Config_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Signal_Test.icc b/tests/Signal_Test.icc
new file mode 100644
index 00000000000..759b6964423
--- /dev/null
+++ b/tests/Signal_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Signal_Test"
+	{
+	   source type (cpp) "Signal_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Sigset_Ops_Test.icc b/tests/Sigset_Ops_Test.icc
index 402f4a58cc5..45053a6e284 100644
--- a/tests/Sigset_Ops_Test.icc
+++ b/tests/Sigset_Ops_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Sigset_Ops_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Sigset_Ops_Test"
 	{
 	   source type (cpp) "Sigset_Ops_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Simple_Message_Block_Test.icc b/tests/Simple_Message_Block_Test.icc
index 491d98b82ab..ced834094fb 100644
--- a/tests/Simple_Message_Block_Test.icc
+++ b/tests/Simple_Message_Block_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Simple_Message_Block_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Simple_Message_Block_Test"
 	{
 	   source type (cpp) "Simple_Message_Block_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Svc_Handler_Test.icc b/tests/Svc_Handler_Test.icc
new file mode 100644
index 00000000000..036b4a3e4af
--- /dev/null
+++ b/tests/Svc_Handler_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Svc_Handler_Test"
+	{
+	   source type (cpp) "Svc_Handler_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/TSS_Test.icc b/tests/TSS_Test.icc
index aa297680546..004dd928427 100644
--- a/tests/TSS_Test.icc
+++ b/tests/TSS_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "TSS_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "TSS_Test"
 	{
 	   source type (cpp) "TSS_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Task_Test.icc b/tests/Task_Test.icc
index b8ca8f285eb..0fac69f86e8 100644
--- a/tests/Task_Test.icc
+++ b/tests/Task_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Task_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Task_Test"
 	{
 	   source type (cpp) "Task_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Thread_Manager_Test.icc b/tests/Thread_Manager_Test.icc
index dded477b8fd..e07e11c1637 100644
--- a/tests/Thread_Manager_Test.icc
+++ b/tests/Thread_Manager_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Thread_Manager_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Thread_Manager_Test"
 	{
 	   source type (cpp) "Thread_Manager_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Thread_Mutex_Test.icc b/tests/Thread_Mutex_Test.icc
index 7faf8bd52fd..ef0ef862408 100644
--- a/tests/Thread_Mutex_Test.icc
+++ b/tests/Thread_Mutex_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Thread_Mutex_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Thread_Mutex_Test"
 	{
 	   source type (cpp) "Thread_Mutex_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Thread_Pool_Reactor_Test.icc b/tests/Thread_Pool_Reactor_Test.icc
index fc15a6ae3cf..37d66f21de1 100644
--- a/tests/Thread_Pool_Reactor_Test.icc
+++ b/tests/Thread_Pool_Reactor_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Thread_Pool_Reactor_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Thread_Pool_Reactor_Test"
 	{
 	   source type (cpp) "Thread_Pool_Reactor_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Thread_Pool_Test.icc b/tests/Thread_Pool_Test.icc
index 4b90a1380a8..6c11c20620b 100644
--- a/tests/Thread_Pool_Test.icc
+++ b/tests/Thread_Pool_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Thread_Pool_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Thread_Pool_Test"
 	{
 	   source type (cpp) "Thread_Pool_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Time_Service_Test.icc b/tests/Time_Service_Test.icc
index 563240411b2..b15ed41bd35 100644
--- a/tests/Time_Service_Test.icc
+++ b/tests/Time_Service_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Time_Service_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Time_Service_Test"
 	{
 	   source type (cpp) "Time_Service_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Time_Value_Test.icc b/tests/Time_Value_Test.icc
index f88e9c66963..2a038a30c5c 100644
--- a/tests/Time_Value_Test.icc
+++ b/tests/Time_Value_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Time_Value_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Time_Value_Test"
 	{
 	   source type (cpp) "Time_Value_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Timeprobe_Test.icc b/tests/Timeprobe_Test.icc
index c1d9dc3a194..cb2067e7bed 100644
--- a/tests/Timeprobe_Test.icc
+++ b/tests/Timeprobe_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Timeprobe_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Timeprobe_Test"
 	{
 	   source type (cpp) "Timeprobe_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Timer_Queue_Test.icc b/tests/Timer_Queue_Test.icc
index 37276b4070f..635a92b645a 100644
--- a/tests/Timer_Queue_Test.icc
+++ b/tests/Timer_Queue_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Timer_Queue_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Timer_Queue_Test"
 	{
 	   source type (cpp) "Timer_Queue_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/TkReactor_Test.icc b/tests/TkReactor_Test.icc
new file mode 100644
index 00000000000..d2606ce2291
--- /dev/null
+++ b/tests/TkReactor_Test.icc
@@ -0,0 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
+option
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "TkReactor_Test"
+	{
+	   source type (cpp) "TkReactor_Test.cpp"
+	   source platformLinkLibs
+	}
+    }
diff --git a/tests/Tokens_Test.icc b/tests/Tokens_Test.icc
index 3381ea44ca5..e382f351e81 100644
--- a/tests/Tokens_Test.icc
+++ b/tests/Tokens_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Tokens_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Tokens_Test"
 	{
 	   source type (cpp) "Tokens_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/UPIPE_SAP_Test.icc b/tests/UPIPE_SAP_Test.icc
index 785888c0180..213ddaf1211 100644
--- a/tests/UPIPE_SAP_Test.icc
+++ b/tests/UPIPE_SAP_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "UPIPE_SAP_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "UPIPE_SAP_Test"
 	{
 	   source type (cpp) "UPIPE_SAP_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/Upgradable_RW_Test.icc b/tests/Upgradable_RW_Test.icc
index 117be19b9f2..b558be42ec9 100644
--- a/tests/Upgradable_RW_Test.icc
+++ b/tests/Upgradable_RW_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "Upgradable_RW_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "Upgradable_RW_Test"
 	{
 	   source type (cpp) "Upgradable_RW_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }
diff --git a/tests/XtReactor_Test.icc b/tests/XtReactor_Test.icc
index c37c4d06afb..8daf3839ce4 100644
--- a/tests/XtReactor_Test.icc
+++ b/tests/XtReactor_Test.icc
@@ -1,22 +1,15 @@
+// $Id$
+
+include "vacpp_setup.icc"
 option
-    define ("ACE_HAS_WINSOCK2","1"),
-    define ("__ACE_INLINE__","0"),
-    define ("WIN32","1"),
-    define ("_WINDOWS","1"),
-    define("ACE_HAS_DLL","0"),
-    link(libSearchPath,'H:\ACE_wrappers\ace'),
-    incl(searchPath,'H:\ACE_wrappers'),
-    link(linkWithMultiThreadLib,yes)
-     {
-	target "XtReactor_Test.exe"
+    link(libSearchPath, platformLibSearchPath),
+    incl(searchPath, ".."),
+    link(linkWithMultiThreadLib,yes),
+    link(debug)
+    {
+	target type (exe) "XtReactor_Test"
 	{
 	   source type (cpp) "XtReactor_Test.cpp"
-
-	   source type (lib) "aced.lib"
-   	   source type (lib) "advapi32.lib"
-	   source type (lib) "user32.lib"
-	   source type (lib) "ws2_32.lib"
-	   source type (lib) "wsock32.lib"
-	   source type (lib) "mswsock.lib"
+	   source platformLinkLibs
 	}
-   }
+    }