summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc6
-rw-r--r--TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc2
4 files changed, 12 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bd8225ec409..b449c5e534f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec 20 13:56:10 UTC 2011 Marcel Smit <msmit@remedy.nl>
+
+ * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc:
+ * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc:
+ * tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc:
+ Projects must avoid CORBA-e-micro.
+
Tue Dec 20 09:55:08 UTC 2011 Martin Corino <mcorino@remedy.nl>
* tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp:
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc
index 0e1f9788ad5..5c4218c929f 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*Collocated): taoserver, pi, pi_server, interceptors {
+project(*Collocated): taoserver, pi, pi_server, interceptors, avoids_corba_e_micro {
exename = PI_ProcMode_Collocated_Test
Source_Files {
testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
index 240208b4dda..22c2a76d8d4 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*idl): taoidldefaults {
+project(*idl): taoidldefaults, avoids_corba_e_micro {
idlflags -= -St
IDL_Files {
test.idl
@@ -9,7 +9,7 @@ project(*idl): taoidldefaults {
custom_only = 1
}
-project(*RemoteServer): taoserver, pi_server, interceptors {
+project(*RemoteServer): taoserver, pi_server, interceptors, avoids_corba_e_micro {
exename = PI_ProcMode_Remote_TestServer
after += *idl
Source_Files {
@@ -27,7 +27,7 @@ project(*RemoteServer): taoserver, pi_server, interceptors {
}
}
-project(*RemoteClient): taoclient, portableserver, pi, interceptors {
+project(*RemoteClient): taoclient, portableserver, pi, interceptors, avoids_corba_e_micro {
exename = PI_ProcMode_Remote_TestClient
after += *idl
after += *RemoteServer
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc b/TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc
index 131b4b94e54..30d2e2053c9 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*Server): taoserver, pi, interceptors {
+project(*Server): taoserver, pi, interceptors, avoids_corba_e_micro {
Source_Files {
test_i.cpp
Server_ORBInitializer.cpp