diff options
author | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-29 03:54:25 +0000 |
---|---|---|
committer | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-29 03:54:25 +0000 |
commit | 54b3b98d059cbe99ca6a2e6f8c57b7b6ae1ca7b2 (patch) | |
tree | 7051e7d1b33cebb65d779acc8b2ab2fe65e783be | |
parent | 9901e27179774390289710131d08a9870471c2d7 (diff) | |
download | ATCD-54b3b98d059cbe99ca6a2e6f8c57b7b6ae1ca7b2.tar.gz |
ChangeLogTag:Mon Aug 28 22:46:02 2000 Marina Spivak <marina@cs.wustl.edu>
-rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 19 | ||||
-rw-r--r-- | TAO/tests/Makefile | 3 | ||||
-rw-r--r-- | TAO/tests/Makefile.bor | 1 | ||||
-rw-r--r-- | TAO/tests/RTCORBA/Client_Propagated/client.cpp | 4 | ||||
-rw-r--r-- | TAO/tests/RTCORBA/Client_Propagated/server.cpp | 6 | ||||
-rw-r--r-- | TAO/tests/RTCORBA/Makefile | 29 | ||||
-rw-r--r-- | TAO/tests/RTCORBA/Makefile.bor | 9 | ||||
-rw-r--r-- | TAO/tests/RTCORBA/Server_Protocol/client.cpp | 4 | ||||
-rw-r--r-- | TAO/tests/RTCORBA/Server_Protocol/server.cpp | 4 |
9 files changed, 77 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index e0dc2ee152a..5efae8bf58d 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,22 @@ +Mon Aug 28 22:46:02 2000 Marina Spivak <marina@cs.wustl.edu> + + * tests/Makefile + * tests/Makefile.bor: + + Modified to include RTCORBA subdirectory. + + * tests/RTCORBA/Makefile + * tests/RTCORBA/Makefile.bor: + + Added. + + * tests/RTCORBA/Server_Protocol/client.cpp + * tests/RTCORBA/Server_Protocol/server.cpp + * tests/RTCORBA/Client_Propagated/client.cpp + * tests/RTCORBA/Client_Propagated/server.cpp: + + Added TAO_HAS_RT_CORBA == 1 guards. + Mon Aug 28 22:14:51 2000 Marina Spivak <marina@cs.wustl.edu> * tests/README diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile index 9ca9aa73ad0..33d1f20fd0b 100644 --- a/TAO/tests/Makefile +++ b/TAO/tests/Makefile @@ -42,7 +42,8 @@ DIRS = CDR \ Explicit_Event_Loop \ DynAny_Test \ Policies \ - LongUpcalls + LongUpcalls \ + RTCORBA ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/tests/Makefile.bor b/TAO/tests/Makefile.bor index 1711fd29015..4419bc047dc 100644 --- a/TAO/tests/Makefile.bor +++ b/TAO/tests/Makefile.bor @@ -16,6 +16,7 @@ DIRS = \ IORManipulation \ MProfile \ Param_Test \ + RTCORBA \ Timeout !include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index 2dee66955a7..ec280666d95 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -1,5 +1,7 @@ // $Id$ +#if (TAO_HAS_RT_CORBA == 1) + #include "testC.h" #include "ace/Get_Opt.h" @@ -134,3 +136,5 @@ main (int argc, char *argv[]) return 0; } + +#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index 7e13b1e69d8..8f2fef3a154 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -1,5 +1,7 @@ // $Id$ +#if (TAO_HAS_RT_CORBA == 1) + #include "testS.h" #include "ace/Get_Opt.h" @@ -218,7 +220,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Final priority of the servant thread" " = its initial priority\n")); - + } ACE_CATCHANY { @@ -230,3 +232,5 @@ main (int argc, char *argv[]) return 0; } + +#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tests/RTCORBA/Makefile b/TAO/tests/RTCORBA/Makefile new file mode 100644 index 00000000000..8fdb85248ba --- /dev/null +++ b/TAO/tests/RTCORBA/Makefile @@ -0,0 +1,29 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +# Makefile for RTCORBA tests +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +DIRS = Client_Propagated \ + Server_Protocol + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/TAO/tests/RTCORBA/Makefile.bor b/TAO/tests/RTCORBA/Makefile.bor new file mode 100644 index 00000000000..7ee96f0290e --- /dev/null +++ b/TAO/tests/RTCORBA/Makefile.bor @@ -0,0 +1,9 @@ +# +# Makefile for building RTCORBA tests +# + +DIRS = \ + Client_Propagated \ + Server_Protocol + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp index 6926777cd31..71caaccd13f 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp @@ -1,5 +1,7 @@ // $Id$ +#if (TAO_HAS_RT_CORBA == 1) + #include "testC.h" #include "ace/Get_Opt.h" @@ -73,3 +75,5 @@ main (int argc, char *argv[]) return 0; } + +#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp index 1af2aef0663..d6fbb359d5a 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp @@ -1,5 +1,7 @@ // $Id$ +#if (TAO_HAS_RT_CORBA == 1) + #include "testS.h" #include "ace/Get_Opt.h" #include "tao/RT_Policy_i.h" @@ -277,3 +279,5 @@ main (int argc, char *argv[]) return 0; } + +#endif /* TAO_HAS_RT_CORBA == 1 */ |