diff options
author | isisbuilds <isisbuilds@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-07 18:47:00 +0000 |
---|---|---|
committer | isisbuilds <isisbuilds@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-07 18:47:00 +0000 |
commit | 754a1f7d9849b9ef51b7cd723d5ffeca7f0b1934 (patch) | |
tree | 2ce309675111e7690bed1482a99b484a0e33fe65 | |
parent | 7e0954c083579e3085d4799ef64c9613b1f2a29e (diff) | |
download | ATCD-754a1f7d9849b9ef51b7cd723d5ffeca7f0b1934.tar.gz |
ChangeLogTag:Wed Dec 7 05:43:53 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
-rw-r--r-- | TAO/ChangeLog | 8 | ||||
-rw-r--r-- | TAO/tests/Connection_Timeout/Connection_Timeout.mpc | 1 | ||||
-rw-r--r-- | TAO/tests/Hang_Shutdown/Hang.mpc | 3 | ||||
-rw-r--r-- | TAO/tests/Param_Test/Param_Test.mpc | 5 |
4 files changed, 14 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d2fab756f19..b46a0af32bf 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Dec 7 05:43:53 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tests/Connection_Timeout/Connection_Timeout.mpc: + * tests/Hang_Shutdown/Hang.mpc: + * tests/Param_Test/Param_Test.mpc: + + Disable these projects when "ace_for_tao" is enabled. + Wed Dec 7 10:59:55 USMST 2005 Yan Dai <dai_y@ociweb.com> * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp: diff --git a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc index c1e095ba54b..7ae4e1c4bf3 100644 --- a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc +++ b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc @@ -2,6 +2,7 @@ // $Id$ project(*client): taoclient, messaging, portableserver { + avoids += ace_for_tao Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Hang_Shutdown/Hang.mpc b/TAO/tests/Hang_Shutdown/Hang.mpc index 164f34dd522..9d58d8df81e 100644 --- a/TAO/tests/Hang_Shutdown/Hang.mpc +++ b/TAO/tests/Hang_Shutdown/Hang.mpc @@ -10,7 +10,8 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { - after += *Server + avoids += ace_for_tao + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc index 062a84c7147..4ad4fa1ba44 100644 --- a/TAO/tests/Param_Test/Param_Test.mpc +++ b/TAO/tests/Param_Test/Param_Test.mpc @@ -9,8 +9,9 @@ project(*Server): taoserver, minimum_corba { } project(*Client): taoserver, minimum_corba, dynamicinterface { - exename = client - after += *Server + avoids += ace_for_tao + exename = client + after += *Server Source_Files { any.cpp |