Wed Jun 25 11:00:00 2003 Justin Michel <michel_j@ociweb.com>

9 files changed, 52 insertions, 144 deletions

diff --git a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc
index 1f348726321..b25b1794768 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc
+++ b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc
@@ -1,163 +1,88 @@
-project(Reconnect): messaging, rteventexe {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Reconnect
-
+project(*Reconnect): rteventtestexe {
   Source_Files {
     Reconnect.cpp
   }
 }
 
-project(Shutdown): messaging, rteventexe {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Shutdown
-
+project(*Shutdown): rteventtestexe {
   Source_Files {
     Shutdown.cpp
   }
 }
 
-project(Observer): messaging, rteventexe {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Observer
-
+project(*Observer): rteventtestexe {
   Source_Files {
     Observer.cpp
   }
 }
 
-project(BCast): messaging, rteventexe {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = BCast
-
+project(*BCast): rteventtestexe {
   Source_Files {
     BCast.cpp
   }
 }
 
-project(Timeout): messaging, rteventexe {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Timeout
-
+project(*Timeout): rteventtestexe {
   Source_Files {
     Timeout.cpp
   }
 }
 
-project(Wildcard): messaging, rteventexe {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Wildcard
-
+project(*Wildcard): rteventtestexe {
   Source_Files {
     Wildcard.cpp
   }
 }
 
-project(Negation): messaging, rteventexe {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Negation
-
+project(*Negation): rteventtestexe {
   Source_Files {
     Negation.cpp
   }
 }
 
-project(Disconnect): messaging, rteventexe {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Disconnect
-
+project(*Disconnect): rteventtestexe {
   Source_Files {
     Disconnect.cpp
   }
 }
 
-project(MT_Disconnect): messaging, rteventexe {
-  depends  += RTEvent_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = MT_Disconnect
-
+project(*MT_Disconnect): rteventtestexe {
   Source_Files {
     MT_Disconnect.cpp
   }
 }
 
-project(Atomic_Reconnect): messaging, rteventexe {
-  depends  += RTEvent_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Atomic_Reconnect
-
+project(*Atomic_Reconnect): rteventtestexe {
   Source_Files {
     Atomic_Reconnect.cpp
   }
 }
 
-project(Bitmask): messaging, rteventexe {
-  depends  += RTEvent_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Bitmask
-
+project(*Bitmask): rteventtestexe {
   Source_Files {
     Bitmask.cpp
   }
 }
 
-project(Complex): messaging, rteventexe {
-  depends  += RTEvent_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Complex
-
+project(*Complex): rteventtestexe {
   Source_Files {
     Complex.cpp
   }
 }
 
-project(Gateway): messaging, rteventexe {
-  depends  += RTEvent_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Gateway
-
+project(*Gateway): rteventtestexe {
   Source_Files {
     Gateway.cpp
   }
 }
 
-project(Control): messaging, rteventexe {
-  depends  += RTEvent_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Control
-
+project(*Control): rteventtestexe {
   Source_Files {
     Control.cpp
   }
 }
 
-project(Random): messaging, rteventexe {
-  depends  += RTEvent_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
-  exename   = Random
-
+project(*Random) : rteventtestexe {
   Source_Files {
     Random.cpp
   }
diff --git a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
new file mode 100644
index 00000000000..3b0f0b416b5
--- /dev/null
+++ b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
@@ -0,0 +1,5 @@
+project : messaging, rteventexe, naming, iortable {
+  after    += RTEvent_Test_Lib
+  libs     += ECTests
+  includes += ../lib
+}
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc
index 75a2811ee50..f142bf79c6b 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc
@@ -1,10 +1,6 @@
-project(ECMcastTests Lib): orbsvcslib {
+project: orbsvcslib, rtevent, svc_utils, iortable, portableserver {
   sharedname = ECMcastTests
-  depends   += TAO RTEvent Svc_Utils IORTable PortableServer
-  libs      += TAO TAO_RTEvent TAO_Svc_Utils TAO_IORTable TAO_PortableServer
-  dllflags   = ECMCASTTESTS_BUILD_DLL
-  comps     += RTEvent
-
+  dynamicflags   = ECMCASTTESTS_BUILD_DLL
   Header_Files {
     ectest_export.h
   }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
index a7eab87ae62..0f1fd636a2a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
@@ -1,5 +1,5 @@
-project(supplier): messaging, rteventexe {
-  depends  += ECMcastTests_Lib CosNaming IORTable
+project(*supplier): messaging, rteventexe {
+  after  += ECMcastTests_Lib CosNaming IORTable
   libs     += ECMcastTests TAO_CosNaming TAO_IORTable
   includes += ../Common
   exename   = supplier
@@ -9,8 +9,8 @@ project(supplier): messaging, rteventexe {
   }
 }
 
-project(consumer): messaging, rteventexe {
-  depends  += ECMcastTests_Lib CosNaming IORTable
+project(*consumer): messaging, rteventexe {
+  after  += ECMcastTests_Lib CosNaming IORTable
   libs     += ECMcastTests TAO_CosNaming TAO_IORTable
   includes += ../Common
   exename   = consumer
@@ -20,8 +20,8 @@ project(consumer): messaging, rteventexe {
   }
 }
 
-project(gateway-ec): messaging, rteventexe {
-  depends  += ECMcastTests_Lib CosNaming IORTable
+project(*gateway-ec): messaging, rteventexe {
+  after  += ECMcastTests_Lib CosNaming IORTable
   libs     += ECMcastTests TAO_CosNaming TAO_IORTable
   includes += ../Common
   exename   = gateway-ec
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
index a7eab87ae62..0f1fd636a2a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
@@ -1,5 +1,5 @@
-project(supplier): messaging, rteventexe {
-  depends  += ECMcastTests_Lib CosNaming IORTable
+project(*supplier): messaging, rteventexe {
+  after  += ECMcastTests_Lib CosNaming IORTable
   libs     += ECMcastTests TAO_CosNaming TAO_IORTable
   includes += ../Common
   exename   = supplier
@@ -9,8 +9,8 @@ project(supplier): messaging, rteventexe {
   }
 }
 
-project(consumer): messaging, rteventexe {
-  depends  += ECMcastTests_Lib CosNaming IORTable
+project(*consumer): messaging, rteventexe {
+  after  += ECMcastTests_Lib CosNaming IORTable
   libs     += ECMcastTests TAO_CosNaming TAO_IORTable
   includes += ../Common
   exename   = consumer
@@ -20,8 +20,8 @@ project(consumer): messaging, rteventexe {
   }
 }
 
-project(gateway-ec): messaging, rteventexe {
-  depends  += ECMcastTests_Lib CosNaming IORTable
+project(*gateway-ec): messaging, rteventexe {
+  after  += ECMcastTests_Lib CosNaming IORTable
   libs     += ECMcastTests TAO_CosNaming TAO_IORTable
   includes += ../Common
   exename   = gateway-ec
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
index f760c85d215..15ce9690c3b 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
@@ -1,5 +1,5 @@
-project(application): messaging, rteventexe {
-  depends  += ECMcastTests_Lib CosNaming IORTable
+project(*application): messaging, rteventexe {
+  after  += ECMcastTests_Lib CosNaming IORTable
   libs     += ECMcastTests TAO_CosNaming TAO_IORTable
   includes += ../Common
   exename   = application
@@ -9,8 +9,8 @@ project(application): messaging, rteventexe {
   }
 }
 
-project(gateway-ec): messaging, rteventexe {
-  depends  += ECMcastTests_Lib CosNaming IORTable
+project(*gateway-ec): messaging, rteventexe {
+  after  += ECMcastTests_Lib CosNaming IORTable
   libs     += ECMcastTests TAO_CosNaming TAO_IORTable
   includes += ../Common
   exename   = gateway-ec
diff --git a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc
index 99093bb62f8..663d52a0877 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc
+++ b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc
@@ -1,53 +1,33 @@
-project(Throughput): messaging, rteventexe {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
+project(*Throughput): eventperftestexe {
   exename   = Throughput
-
   Source_Files {
     Throughput.cpp
   }
 }
 
-project(Connect): messaging, rteventexe {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
+project(*Connect): eventperftestexe {
   exename   = Connect
-
   Source_Files {
     Connect.cpp
   }
 }
 
-project(Inversion): messaging, rteventexe {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
+project(*Inversion): eventperftestexe {
   exename   = Inversion
-
   Source_Files {
     Inversion.cpp
   }
 }
 
-project(Latency): messaging, rteventexe, strategies {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
+project(*Latency): eventperftestexe, strategies {
   exename   = Latency
-
   Source_Files {
     Latency.cpp
   }
 }
 
-project(Latency_Server): messaging, rteventexe, strategies {
-  depends  += Event_Test_Lib CosNaming IORTable
-  libs     += ECTests TAO_CosNaming TAO_IORTable
-  includes += ../lib
+project(*Latency_Server): eventperftestexe, strategies {
   exename   = Latency_Server
-
   Source_Files {
     Latency_Server.cpp
   }
diff --git a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
new file mode 100644
index 00000000000..c9fab7fabf5
--- /dev/null
+++ b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
@@ -0,0 +1,6 @@
+project: messaging, rteventexe, naming, iortable {
+  after    += Event_Test_Lib
+  libs     += ECTests
+  includes += ../lib
+}
+
diff --git a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
index c7a87e6535d..15def363a05 100644
--- a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
+++ b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
@@ -1,10 +1,6 @@
-project(Event Test Lib): orbsvcslib {
-  sharedname = ECTests
-  depends   += RTEvent CosNaming Svc_Utils IORTable PortableServer
-  libs      += TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer
-  dllflags   = EC_TEST_BUILD_DLL
-  comps     += RTEvent
-
+project(Event Test Lib): orbsvcslib, rtevent, naming, svc_utils, iortable, portableserver {
+  sharedname   = ECTests
+  dynamicflags = EC_TEST_BUILD_DLL
   Header_Files {
     ectest_export.h
   }