summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests')
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc4
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc3
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc6
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc5
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc4
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc13
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc8
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Basic.mpc16
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc4
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc2
-rw-r--r--TAO/orbsvcs/tests/Property/Property.mpc7
-rw-r--r--TAO/orbsvcs/tests/Sched/Sched.mpc2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc3
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc4
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/Callback.mpc6
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc13
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc4
-rw-r--r--TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc4
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc2
-rw-r--r--TAO/orbsvcs/tests/Time/Time.mpc3
-rw-r--r--TAO/orbsvcs/tests/Trading/Trading.mpc4
32 files changed, 73 insertions, 68 deletions
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
index c08a6a105cf..cb49cc2358a 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
@@ -1,4 +1,4 @@
-project : orbsvcsexe, messaging, taoserver, event, naming, svc_utils, iortable, corba_messaging {
+project : orbsvcsexe, messaging, taoserver, event, naming, svc_utils, iortable {
after += CosEvent_Test_Lib
libs += CECTests
includes += ../lib
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
index 64c4e2cbc93..1925cb18283 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
+++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
@@ -1,4 +1,4 @@
-project(CosEvent Test Lib): orbsvcslib, event, naming, svc_utils, iortable, portableserver, corba_messaging {
+project(CosEvent Test Lib): orbsvcslib, event, naming, svc_utils, iortable, portableserver {
sharedname = CECTests
dynamicflags = CEC_TEST_BUILD_DLL
Header_Files {
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
index b18305d9dfd..9f24bdc487e 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
@@ -1,4 +1,4 @@
-project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging, corba_messaging {
+project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging {
exename = ECM_Supplier
Source_Files {
ECM_Data.cpp
@@ -6,7 +6,7 @@ project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging, corba_m
}
}
-project(ECM Consumer): rteventexe, rtsched, naming, iortable, messaging, corba_messaging {
+project(ECM Consumer): rteventexe, rtsched, naming, iortable, messaging {
exename = ECM_Consumer
Source_Files {
ECM_Data.cpp
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc b/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
new file mode 100644
index 00000000000..895427c4339
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
@@ -0,0 +1,3 @@
+project(EC_MT_Mcast): rteventexe, messaging {
+ exename = MCast
+}
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
index 54b07f50600..bd03a22d6d4 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
@@ -1,3 +1,3 @@
-project(EC_Mcast): rteventexe, messaging, corba_messaging {
+project(EC_Mcast): rteventexe, messaging {
exename = EC_Mcast
}
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
index 97b1a32b606..7ad66908fb9 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
@@ -1,3 +1,3 @@
-project(EC_Multiple): rteventexe, rtoldevent, rtschedevent, naming, iortable, messaging, corba_messaging {
+project(EC_Multiple): rteventexe, rtoldevent, rtschedevent, naming, iortable, messaging {
exename = EC_Multiple
}
diff --git a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
index b2618598556..1256f6edba6 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
+++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
@@ -1,4 +1,4 @@
-project(ECT Supplier): rteventexe, rtoldevent, rtsched, naming, iortable, messaging, corba_messaging {
+project(ECT Supplier): rteventexe, rtoldevent, rtsched, naming, iortable, messaging {
exename = ECT_Supplier
comps += Naming RTOLDEvent
@@ -9,7 +9,7 @@ project(ECT Supplier): rteventexe, rtoldevent, rtsched, naming, iortable, messag
}
}
-project(ECT Consumer): rteventexe, rtoldevent, rtsched, naming, iortable, messaging, corba_messaging {
+project(ECT Consumer): rteventexe, rtoldevent, rtsched, naming, iortable, messaging {
exename = ECT_Consumer
comps += Naming RTOLDEvent
@@ -20,7 +20,7 @@ project(ECT Consumer): rteventexe, rtoldevent, rtsched, naming, iortable, messag
}
}
-project(ECT Throughput): rteventexe, rtoldevent, rtsched, naming, iortable, messaging, corba_messaging {
+project(ECT Throughput): rteventexe, rtoldevent, rtsched, naming, iortable, messaging {
exename = ECT_Throughput
comps += Naming RTOLDEvent
diff --git a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
index 38e54d1ab3c..c9fab7fabf5 100644
--- a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
+++ b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
@@ -1,4 +1,4 @@
-project: messaging, rteventexe, naming, iortable, corba_messaging {
+project: messaging, rteventexe, naming, iortable {
after += Event_Test_Lib
libs += ECTests
includes += ../lib
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
index 3ceeb4c709a..52f12659a37 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
@@ -1,12 +1,11 @@
-project(*server): server, orbsvcsexe, iormanip, ftorb {
+project(*server): portableserver, orbsvcsexe, iormanip, ftorb {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Manager): taoserver, orbsvcsexe, iormanip, ftorb {
- exename = Manager
+project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb {
Source_Files {
testC.cpp
Manager.cpp
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
index 7830e63a8a6..a7d46dbeccb 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
@@ -1,3 +1,3 @@
-project(IOGRTest): taoserver, orbsvcsexe, iormanip, ftorb {
+project(IOGRTest): portableserver, orbsvcsexe, iormanip, ftorb {
exename = IOGRTest
}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc
index b94dc0ab17c..950ce66679d 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver, ifr_client {
+project(*server): taoexe, portableserver, ifr_client {
avoids += minimum_corba
Source_Files {
@@ -7,7 +7,7 @@ project(*server): taoserver, ifr_client {
}
}
-project(*client): taoserver, ifr_client, dynamicinterface {
+project(*client): taoexe, portableserver, ifr_client, dynamicinterface {
avoids += minimum_corba
IDL_Files {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
new file mode 100644
index 00000000000..7cd2e4c0241
--- /dev/null
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
@@ -0,0 +1,13 @@
+project(*server): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils {
+ Source_Files {
+ server.cpp
+ LB_server.cpp
+ Basic.cpp
+ }
+}
+
+project(*client): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils {
+ Source_Files {
+ client.cpp
+ }
+} \ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
new file mode 100644
index 00000000000..cf940d41f7e
--- /dev/null
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
@@ -0,0 +1,2 @@
+project : orbsvcsexe, dslogadmin, naming, dynamicany, iortable, etcl {
+} \ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
index 22511d8ea6d..9f78bcadbf1 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
@@ -1,15 +1,11 @@
-project(*server): server, orbsvcsexe {
- comps += PortableGroup
-
+project(*server): orbsvcsexe, portablegroup, portableserver {
Source_Files {
McastHello.cpp
server.cpp
}
}
-project(*client): client, orbsvcsexe {
- comps += PortableGroup
-
+project(*client): orbsvcsexe, portablegroup, portableserver {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
index b23d1388ccc..b44d9380f30 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
+++ b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
@@ -1,47 +1,35 @@
project(*Notify ConnectDisconnect): notifytest {
- exename = ConnectDisconnect
-
Source_Files {
ConnectDisconnect.cpp
}
}
-project(*Notify LifeCycle): notifytest {
- exename = LifeCycle
-
+project(*Notify LifeCycle): notifytest, naming {
Source_Files {
LifeCycle.cpp
}
}
-project(*Notify IdAssignment): notifytest {
- exename = IdAssignment
-
+project(*Notify IdAssignment): notifytest, naming {
Source_Files {
IdAssignment.cpp
}
}
project(*Notify Events): notifytest {
- exename = Events
-
Source_Files {
Events.cpp
}
}
project(*Notify AdminProperties): notifytest {
- exename = AdminProperties
-
Source_Files {
AdminProperties.cpp
}
}
project(*Notify Simple): notifytest {
- exename = Simple
-
Source_Files {
Simple.cpp
}
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc
index 5ee6ac4d4f7..108d551895e 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc
@@ -1,4 +1,4 @@
-project(*Notify Structured Supplier): notifytest {
+project(*Notify Structured Supplier): notifytest, naming {
exename = Structured_Supplier
Source_Files {
@@ -6,7 +6,7 @@ project(*Notify Structured Supplier): notifytest {
}
}
-project(*Notify Structured Consumer): notifytest {
+project(*Notify Structured Consumer): notifytest, naming {
exename = Structured_Consumer
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc
index d8c014e0cab..e362b11ada8 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc
@@ -1,4 +1,4 @@
-project(*Notify Structured Supplier): notifytest {
+project(*Notify Structured Supplier): notifytest, naming {
exename = Structured_Supplier
Source_Files {
@@ -7,7 +7,7 @@ project(*Notify Structured Supplier): notifytest {
}
}
-project(*Notify Structured Consumer): notifytest {
+project(*Notify Structured Consumer): notifytest, naming {
exename = Structured_Consumer
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
index 7e0cd7fbc09..4cc646ec5dc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
@@ -1,4 +1,4 @@
-project(NotifyTests_Lib): orbsvcslib, notify {
+project(NotifyTests_Lib): orbsvcslib, notify, naming {
sharedname = NotifyTests
dynamicflags = TAO_NOTIFY_TEST_BUILD_DLL
} \ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
index 84a3653adac..f0463d665e5 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
@@ -1,3 +1,3 @@
-project(*notify perf RedGreen): notifytest {
+project(*notify perf RedGreen): notifytest, naming {
exename = RedGreen_Test
}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
index 144536943a2..740e3e54598 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
@@ -1,3 +1,3 @@
-project(*notify perf Throughput): notifytest, strategies, messaging {
+project(*notify perf Throughput): notifytest, strategies, messaging, naming {
exename = Throughput
}
diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc
index a522e058a80..43c4f1a6890 100644
--- a/TAO/orbsvcs/tests/Property/Property.mpc
+++ b/TAO/orbsvcs/tests/Property/Property.mpc
@@ -1,13 +1,12 @@
-project(*server): taoserver, namingexe, property {
+project(*server): namingexe, property {
Source_Files {
server.cpp
}
}
-project(*client): server, namingexe, property {
- exename = client
+project(*client): namingexe, property {
Source_Files {
- server.cpp
+ client.cpp
}
}
diff --git a/TAO/orbsvcs/tests/Sched/Sched.mpc b/TAO/orbsvcs/tests/Sched/Sched.mpc
index 867eebf770d..a0ac07993ea 100644
--- a/TAO/orbsvcs/tests/Sched/Sched.mpc
+++ b/TAO/orbsvcs/tests/Sched/Sched.mpc
@@ -1,3 +1,3 @@
-project: taoserver, namingexe, rtsched {
+project: namingexe, rtsched {
exename = Sched
}
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
index e51d0d2888f..ad90edfe6c1 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
@@ -1,5 +1,4 @@
-project: taoserver, namingexe, rtsched {
- exename = Sched_Conf
+project: namingexe, rtsched {
Source_Files {
Sched_Conf.cpp
}
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
index d2151a236e9..b89a22b668a 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
+++ b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
@@ -1,11 +1,11 @@
-project(*security server): taoserver, ssl {
+project(*security server): taoexe, portableserver, ssl {
Source_Files {
TX_Object_i.cpp
server.cpp
}
}
-project(*security client): taoclient, ssl {
+project(*security client): taoexe, ssl {
Source_Files {
TX_ObjectC.cpp
client.cpp
diff --git a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
index afe593a5d41..a25691b74cf 100644
--- a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
+++ b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
@@ -1,4 +1,4 @@
-project(*security server): taoserver, ssl {
+project(*security server): taoexe, portableserver, ssl {
IDL_Files {
server.idl
client.idl
@@ -13,9 +13,7 @@ project(*security server): taoserver, ssl {
}
}
-project(*security client): taoserver, ssl {
- exename = client
-
+project(*security client): taoexe, portableserver, ssl {
IDL_Files {
server.idl
client.idl
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
new file mode 100644
index 00000000000..34f47576f33
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
@@ -0,0 +1,13 @@
+project(*server): taoexe, portableserver, ssliop {
+ Source_Files {
+ test_i.cpp
+ server.cpp
+ }
+}
+
+project(*client): taoexe, portableserver, ssliop {
+ Source_Files {
+ client.cpp
+ }
+}
+
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
index 2736c3d344c..00386651f79 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
@@ -1,4 +1,4 @@
-project(*security server): orbsvcsexe, portableserver, ssl {
+project(*security server): orbsvcsexe, portableserver, ssl, ssliop {
Source_Files {
Server_Worker.cpp
test_i.cpp
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
index 2164d5133bb..4e2ea300711 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
@@ -1,11 +1,11 @@
-project(*security server): taoserver, orbsvcsexe, security, ssl {
+project(*security server): taoexe, portableserver, orbsvcsexe, security, ssl {
Source_Files {
Foo_i.cpp
server.cpp
}
}
-project(*security client): taoclient, orbsvcsexe, security, ssl {
+project(*security client): taoexe, orbsvcsexe, security, ssl {
Source_Files {
FooC.cpp
client.cpp
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
index f6d5f7a0e8d..d7484d719f8 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
@@ -1,11 +1,11 @@
-project(*security server): taoserver, orbsvcsexe, ssl, security {
+project(*security server): taoexe, portableserver, orbsvcsexe, ssl, security {
Source_Files {
SLevel1_Test_i.cpp
server.cpp
}
}
-project(*security client): taoclient, orbsvcsexe, ssl, security {
+project(*security client): taoexe, orbsvcsexe, ssl, security {
Source_Files {
SLevel1_TestC.cpp
client.cpp
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
index 71352b6ae9c..e96fa11a0d0 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
+++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
@@ -1,6 +1,4 @@
project(*Client) : namingexe {
- exename = client
-
Source_Files {
client.cpp
}
diff --git a/TAO/orbsvcs/tests/Time/Time.mpc b/TAO/orbsvcs/tests/Time/Time.mpc
index 6939095c7fd..f85b4648872 100644
--- a/TAO/orbsvcs/tests/Time/Time.mpc
+++ b/TAO/orbsvcs/tests/Time/Time.mpc
@@ -1,3 +1,2 @@
-project(*client): taoserver, namingexe, time {
- exename = client
+project(*client): namingexe, time {
}
diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc
index 94db6d210e4..fe3b0a0f407 100644
--- a/TAO/orbsvcs/tests/Trading/Trading.mpc
+++ b/TAO/orbsvcs/tests/Trading/Trading.mpc
@@ -1,6 +1,7 @@
project(*Test Lib): orbsvcslib, trading, naming, svc_utils, iortable, dynamicany, portableserver {
sharedname = TTest
dynamicflags = TRADING_TEST_BUILD_DLL
+ idlflags += -Wb,export_macro=Trading_Test_Export -Wb,export_include=ttest_export.h
Source_Files {
TT_Info.cpp
@@ -22,7 +23,6 @@ project(*Test Lib): orbsvcslib, trading, naming, svc_utils, iortable, dynamicany
project(*export test): namingexe, trading, dynamicany {
after += Trading_Test_Lib
libs += TTest
- exename = export_test
IDL_Files {
}
@@ -35,7 +35,6 @@ project(*export test): namingexe, trading, dynamicany {
project(*import test): namingexe, trading, dynamicany {
after += Trading_Test_Lib
libs += TTest
- exename = import_test
IDL_Files {
}
@@ -48,7 +47,6 @@ project(*import test): namingexe, trading, dynamicany {
project(*colocated test): namingexe, trading, dynamicany {
after += Trading_Test_Lib
libs += TTest
- exename = colocated_test
IDL_Files {
}