diff options
Diffstat (limited to 'TAO/tests')
876 files changed, 1493 insertions, 43152 deletions
diff --git a/TAO/tests/AMH_Exceptions/.cvsignore b/TAO/tests/AMH_Exceptions/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/AMH_Exceptions/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc index 40ae9a4d2a7..5188e4a669b 100644 --- a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc +++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc @@ -1,21 +1,9 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, amh { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, amh, strategies { - after += *idl Source_Files { server.cpp - TestS.cpp - TestC.cpp - } - IDL_Files { } } @@ -23,9 +11,5 @@ project(*Client): taoexe, amh, portableserver, strategies { after += *Server Source_Files { client.cpp - TestS.cpp - TestC.cpp - } - IDL_Files { } } diff --git a/TAO/tests/AMH_Exceptions/Makefile.am b/TAO/tests/AMH_Exceptions/Makefile.am deleted file mode 100644 index 7641cf89759..00000000000 --- a/TAO/tests/AMH_Exceptions/Makefile.am +++ /dev/null @@ -1,125 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.AMH_Exceptions_Idl.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.AMH_Exceptions_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.AMH_Exceptions_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/AMH_Exceptions/Test.idl b/TAO/tests/AMH_Exceptions/Test.idl index 6a9ae77044b..c3ffd609ca4 100644 --- a/TAO/tests/AMH_Exceptions/Test.idl +++ b/TAO/tests/AMH_Exceptions/Test.idl @@ -23,8 +23,6 @@ module Test { Timestamp test_method (in Timestamp send_time) raises (InvalidTimestamp, ServerOverload); - - oneway void shutdown (); }; }; diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp index 60dbc3e8da3..9ff92b2933d 100644 --- a/TAO/tests/AMH_Exceptions/client.cpp +++ b/TAO/tests/AMH_Exceptions/client.cpp @@ -30,19 +30,14 @@ main (int argc, char *argv[]) 1); } - ACE_TRY { - Test::Timestamp time = 10; - roundtrip->test_method (time ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCH(Test::ServerOverload, ov) - { - ACE_DEBUG ((LM_DEBUG, "Received expected exception\n")); - received_expected_exception = 1; - - roundtrip->shutdown (); - } - ACE_ENDTRY; + Test::Timestamp time = 10; + roundtrip->test_method (time ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCH(Test::ServerOverload, ov) + { + ACE_DEBUG ((LM_DEBUG, "Received expected exception\n")); + received_expected_exception = 1; } ACE_CATCHANY { diff --git a/TAO/tests/AMH_Exceptions/run_test.pl b/TAO/tests/AMH_Exceptions/run_test.pl index 7bd307293bf..11dc1f3e86a 100755 --- a/TAO/tests/AMH_Exceptions/run_test.pl +++ b/TAO/tests/AMH_Exceptions/run_test.pl @@ -42,7 +42,7 @@ if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) { $client = $CL->SpawnWaitKill (30); # Clean up. -$amhserver= $AMH->WaitKill (15); +$amhserver= $AMH->TerminateWaitKill (5); if ($amhserver != 0) { print STDERR "ERROR: AMH Server returned $amhserver\n"; diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index 4bc543e5537..05d82934074 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -3,7 +3,6 @@ #include "ace/OS_NS_stdio.h" #include "TestS.h" -#include "tao/ORB_Core.h" /***************************/ /*** Servant Declaration ***/ @@ -19,9 +18,6 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - protected: CORBA::ORB_ptr orb_; }; @@ -60,12 +56,6 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, ACE_UNUSED_ARG (send_time); } -void -ST_AMH_Servant::shutdown (Test::AMH_RoundtripResponseHandler_ptr /*_tao_rh*/ ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); -} /*** Server Declaration ***/ @@ -202,7 +192,7 @@ ST_AMH_Server::run_event_loop () ACE_TRY { ACE_Time_Value period (0, 11000); - while (!this->orb_->orb_core ()->has_shutdown ()) + while (1) { this->orb_->perform_work (&period); ACE_TRY_CHECK; diff --git a/TAO/tests/AMH_Oneway/.cvsignore b/TAO/tests/AMH_Oneway/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/AMH_Oneway/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc index fb289ca96cb..a0a1fbb883e 100644 --- a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc +++ b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc @@ -1,21 +1,9 @@ // -*- MPC -*- // $Id$ -project(*idl) : taoidldefaults, amh { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*client) : taoexe, portableserver, amh { - after += *idl source_files { client.cpp - TestS.cpp - TestC.cpp - } - IDL_Files { } } @@ -23,9 +11,5 @@ project(*server) : taoserver, amh, strategies { after += *client source_files { server.cpp - TestS.cpp - TestC.cpp - } - IDL_Files { } } diff --git a/TAO/tests/AMH_Oneway/Makefile.am b/TAO/tests/AMH_Oneway/Makefile.am deleted file mode 100644 index bfb5b5cda46..00000000000 --- a/TAO/tests/AMH_Oneway/Makefile.am +++ /dev/null @@ -1,124 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.AMH_Oneway_Idl.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.AMH_Oneway_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.AMH_Oneway_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/AMI/.cvsignore b/TAO/tests/AMI/.cvsignore new file mode 100644 index 00000000000..92a316986cf --- /dev/null +++ b/TAO/tests/AMI/.cvsignore @@ -0,0 +1,3 @@ +client +server +simple_client diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc index 69265f72525..894442827ba 100644 --- a/TAO/tests/AMI/AMI.mpc +++ b/TAO/tests/AMI/AMI.mpc @@ -1,33 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, ami { - IDL_Files { - ami_test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging, ami { - after += *idl Source_Files { ami_test_i.cpp - ami_testS.cpp - ami_testC.cpp server.cpp } - IDL_Files { - } } project(*Client): messaging, taoexe, portableserver, ami { after += *Server Source_Files { client.cpp - ami_testS.cpp - ami_testC.cpp - } - IDL_Files { } } @@ -35,9 +19,5 @@ project(*Simple Client): messaging, taoexe, portableserver, ami { after += *Server Source_Files { simple_client.cpp - ami_testS.cpp - ami_testC.cpp - } - IDL_Files { } } diff --git a/TAO/tests/AMI/Makefile.am b/TAO/tests/AMI/Makefile.am deleted file mode 100644 index 3f15bbd9d7d..00000000000 --- a/TAO/tests/AMI/Makefile.am +++ /dev/null @@ -1,166 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.AMI_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -CLEANFILES = \ - ami_test-stamp \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp - -ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl - @touch $@ - -noinst_HEADERS = \ - ami_test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ami_testC.cpp \ - ami_testS.cpp \ - ami_test_i.cpp \ - server.cpp \ - ami_test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ami_testC.cpp \ - ami_testS.cpp \ - client.cpp \ - ami_test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Simple_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += simple_client - -simple_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -simple_client_SOURCES = \ - ami_testC.cpp \ - ami_testS.cpp \ - simple_client.cpp \ - ami_test_i.h - -simple_client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/AMI_Buffering/.cvsignore b/TAO/tests/AMI_Buffering/.cvsignore new file mode 100644 index 00000000000..5c0ae7e0d7e --- /dev/null +++ b/TAO/tests/AMI_Buffering/.cvsignore @@ -0,0 +1,3 @@ +admin +client +server diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc index 5fb820f88c7..a4156b9a83f 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc @@ -1,22 +1,10 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, ami { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, ami { - after += *idl Source_Files { AMI_Buffering.cpp server.cpp - TestS.cpp - TestC.cpp - } - IDL_Files { } } @@ -27,10 +15,6 @@ project(*Client): taoserver, ami { Client_Task.cpp Reply_Handler.cpp client.cpp - TestS.cpp - TestC.cpp - } - IDL_Files { } } @@ -40,9 +24,5 @@ project(*Admin): taoserver, ami { Source_Files { AMI_Buffering_Admin.cpp admin.cpp - TestS.cpp - TestC.cpp - } - IDL_Files { } } diff --git a/TAO/tests/AMI_Buffering/Makefile.am b/TAO/tests/AMI_Buffering/Makefile.am deleted file mode 100644 index aa8c2e7ef34..00000000000 --- a/TAO/tests/AMI_Buffering/Makefile.am +++ /dev/null @@ -1,170 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.AMI_Buffering_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Buffering_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - AMI_Buffering.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - AMI_Buffering.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Buffering_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - Reply_Handler.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - Reply_Handler.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Buffering_Admin.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += admin - -admin_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -admin_SOURCES = \ - AMI_Buffering_Admin.cpp \ - TestC.cpp \ - TestS.cpp \ - admin.cpp \ - AMI_Buffering_Admin.h - -admin_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/AMI_Timeouts/.cvsignore b/TAO/tests/AMI_Timeouts/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/AMI_Timeouts/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc index ae39f7b15c7..bf72e8baca6 100644 --- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc +++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc @@ -1,36 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, ami { - IDL_Files { - timeout.idl - } - custom_only = 1 -} - project(*Server): taoserver, ami { - after += *idl Source_Files { timeout_i.cpp timeout_client.cpp server.cpp - timeoutS.cpp - timeoutC.cpp - } - IDL_Files { } } project(*Client): taoserver, ami { - after += *Server exename = client Source_Files { timeout_i.cpp timeout_client.cpp client.cpp - timeoutS.cpp - timeoutC.cpp - } - IDL_Files { } } + diff --git a/TAO/tests/AMI_Timeouts/Makefile.am b/TAO/tests/AMI_Timeouts/Makefile.am deleted file mode 100644 index 8695c412368..00000000000 --- a/TAO/tests/AMI_Timeouts/Makefile.am +++ /dev/null @@ -1,137 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.AMI_Timeouts_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - timeoutC.cpp \ - timeoutC.h \ - timeoutC.inl \ - timeoutS.cpp \ - timeoutS.h \ - timeoutS.inl - -CLEANFILES = \ - timeout-stamp \ - timeoutC.cpp \ - timeoutC.h \ - timeoutC.inl \ - timeoutS.cpp \ - timeoutS.h \ - timeoutS.inl - -timeoutC.cpp timeoutC.h timeoutC.inl timeoutS.cpp timeoutS.h timeoutS.inl: timeout-stamp - -timeout-stamp: $(srcdir)/timeout.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/timeout.idl - @touch $@ - -noinst_HEADERS = \ - timeout.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Timeouts_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - timeoutC.cpp \ - timeoutS.cpp \ - timeout_client.cpp \ - timeout_i.cpp \ - timeout_client.h \ - timeout_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Timeouts_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - timeoutC.cpp \ - timeoutS.cpp \ - timeout_client.cpp \ - timeout_i.cpp \ - timeout_client.h \ - timeout_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Abstract_Interface/.cvsignore b/TAO/tests/Abstract_Interface/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Abstract_Interface/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc index 38681100160..d6846a4b229 100644 --- a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc +++ b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc @@ -1,18 +1,9 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, valuetype { - IDL_Files { - test.idl - } - - custom_only = 1 -} - project(*client) : taoclient, valuetype { - after += *idl - IDL_Files { + test.idl } Source_Files { @@ -27,9 +18,9 @@ project(*client) : taoclient, valuetype { project(*server) : taoserver, valuetype { after += *client - after += *idl IDL_Files { + test.idl } Source_Files { diff --git a/TAO/tests/Abstract_Interface/Makefile.am b/TAO/tests/Abstract_Interface/Makefile.am deleted file mode 100644 index a170672dcbd..00000000000 --- a/TAO/tests/Abstract_Interface/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Abstract_Interface_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Abstract_Interface_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testC.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Abstract_Interface_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - testC.h \ - testS.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Any/Makefile.am b/TAO/tests/Any/Makefile.am deleted file mode 100644 index 3f2d34af807..00000000000 --- a/TAO/tests/Any/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Recursive - diff --git a/TAO/tests/Any/Recursive/Makefile.am b/TAO/tests/Any/Recursive/Makefile.am deleted file mode 100644 index 12f227990da..00000000000 --- a/TAO/tests/Any/Recursive/Makefile.am +++ /dev/null @@ -1,143 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.RecursiveHello_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - NonRecursiveC.cpp \ - NonRecursiveC.h \ - NonRecursiveC.inl \ - NonRecursiveS.cpp \ - NonRecursiveS.h \ - NonRecursiveS.inl - -CLEANFILES += \ - NonRecursive-stamp \ - NonRecursiveC.cpp \ - NonRecursiveC.h \ - NonRecursiveC.inl \ - NonRecursiveS.cpp \ - NonRecursiveS.h \ - NonRecursiveS.inl - -NonRecursiveC.cpp NonRecursiveC.h NonRecursiveC.inl NonRecursiveS.cpp NonRecursiveS.h NonRecursiveS.inl: NonRecursive-stamp - -NonRecursive-stamp: $(srcdir)/NonRecursive.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/NonRecursive.idl - @touch $@ - -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - NonRecursive.idl \ - Test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.RecursiveHello_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - NonRecursiveC.cpp \ - NonRecursiveS.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.RecursiveHello_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - NonRecursiveC.cpp \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Any/Recursive/RecursiveHello.mpc b/TAO/tests/Any/Recursive/RecursiveHello.mpc index 00c51507577..739a66df566 100644 --- a/TAO/tests/Any/Recursive/RecursiveHello.mpc +++ b/TAO/tests/Any/Recursive/RecursiveHello.mpc @@ -2,38 +2,20 @@ // // $Id$ -project(*idl): taoidldefaults, valuetype { - IDL_Files { - NonRecursive.idl - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, valuetype { - after += *idl - Source_Files { Hello.cpp server.cpp - TestC.cpp - TestS.cpp - NonRecursiveC.cpp - NonRecursiveS.cpp - } - IDL_Files { } } -project(*Client): taoclient, valuetype, typecodefactory { - after += *idl +project(*Client): taoclient, valuetype, typecodefactory, ifr_client { after += *Server - + Source_Files { TestC.cpp NonRecursiveC.cpp client.cpp } - IDL_Files { - } } + diff --git a/TAO/tests/BiDirectional/.cvsignore b/TAO/tests/BiDirectional/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/BiDirectional/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc index bb389945946..55e22534e4a 100644 --- a/TAO/tests/BiDirectional/BiDirectional.mpc +++ b/TAO/tests/BiDirectional/BiDirectional.mpc @@ -1,34 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1; -} - -project(*Server): taoserver, anytypecode, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { - after += *idl +project(*Server): taoserver, anytypecode, minimum_corba, bidir_giop { Source_Files { test_i.cpp server.cpp - testC.cpp - testS.cpp - } - IDL_Files { } } -project(*Client): taoserver, anytypecode, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { +project(*Client): taoserver, anytypecode, minimum_corba, bidir_giop { exename = client - after += *idl + after += *Server Source_Files { test_i.cpp client.cpp - testC.cpp - testS.cpp - } - IDL_Files { } } + diff --git a/TAO/tests/BiDirectional/Makefile.am b/TAO/tests/BiDirectional/Makefile.am deleted file mode 100644 index 996008bc27a..00000000000 --- a/TAO/tests/BiDirectional/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.BiDirectional_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.BiDirectional_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.BiDirectional_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc index a76649bfc17..abcf650df1b 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc +++ b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc @@ -1,34 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { - after += *idl +project(*Server): taoserver, minimum_corba, bidir_giop { Source_Files { test_i.cpp server.cpp - testC.cpp - testS.cpp - } - IDL_Files { } } -project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { - after += *idl +project(*Client): taoexe, portableserver, minimum_corba, bidir_giop { + after += *Server Source_Files { test_i.cpp client.cpp - testC.cpp - testS.cpp - } - IDL_Files { } } diff --git a/TAO/tests/BiDirectional_DelayedUpcall/Makefile.am b/TAO/tests/BiDirectional_DelayedUpcall/Makefile.am deleted file mode 100644 index 4b2dc0eb6d4..00000000000 --- a/TAO/tests/BiDirectional_DelayedUpcall/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.BiDir_DelayedUpcall_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.BiDir_DelayedUpcall_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.BiDir_DelayedUpcall_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/BiDirectional_MultipleORB/.cvsignore b/TAO/tests/BiDirectional_MultipleORB/.cvsignore new file mode 100644 index 00000000000..96882f0dbca --- /dev/null +++ b/TAO/tests/BiDirectional_MultipleORB/.cvsignore @@ -0,0 +1 @@ +destroy diff --git a/TAO/tests/BiDirectional_MultipleORB/Makefile.am b/TAO/tests/BiDirectional_MultipleORB/Makefile.am deleted file mode 100644 index 99a47f9ef1d..00000000000 --- a/TAO/tests/BiDirectional_MultipleORB/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.destroy.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = destroy - -destroy_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -destroy_SOURCES = \ - destroy.cpp - -destroy_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.mpc b/TAO/tests/BiDirectional_MultipleORB/destroy.mpc index 5b30ddc1b1c..b8dd7761667 100644 --- a/TAO/tests/BiDirectional_MultipleORB/destroy.mpc +++ b/TAO/tests/BiDirectional_MultipleORB/destroy.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: taoserver, anytypecode, bidir_giop, avoids_corba_e_micro { +project: taoserver, anytypecode, bidir_giop { exename = destroy Source_Files { destroy.cpp diff --git a/TAO/tests/BiDirectional_NestedUpcall/.cvsignore b/TAO/tests/BiDirectional_NestedUpcall/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/BiDirectional_NestedUpcall/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc index 7d7848bccd9..abcf650df1b 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc +++ b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc @@ -1,33 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { - after += *idl +project(*Server): taoserver, minimum_corba, bidir_giop { Source_Files { test_i.cpp server.cpp - testC.cpp - testS.cpp - } - IDL_Files { } } -project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { - after += *idl +project(*Client): taoexe, portableserver, minimum_corba, bidir_giop { + after += *Server Source_Files { test_i.cpp client.cpp - testC.cpp - testS.cpp - } - IDL_Files { } } + diff --git a/TAO/tests/BiDirectional_NestedUpcall/Makefile.am b/TAO/tests/BiDirectional_NestedUpcall/Makefile.am deleted file mode 100644 index b7c0afa2f6d..00000000000 --- a/TAO/tests/BiDirectional_NestedUpcall/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.BiDir_NestedUpcall_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.BiDir_NestedUpcall_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.BiDir_NestedUpcall_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Big_AMI/Big_AMI.mpc b/TAO/tests/Big_AMI/Big_AMI.mpc index 106dd5900d8..2493ddfb825 100644 --- a/TAO/tests/Big_AMI/Big_AMI.mpc +++ b/TAO/tests/Big_AMI/Big_AMI.mpc @@ -1,34 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, ami { - IDL_Files { - ami_test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging, ami { - after += *idl Source_Files { ami_test_i.cpp - ami_testC.cpp - ami_testS.cpp server.cpp } - IDL_Files { - } } project(*Client): taoserver, messaging, ami { exename = client - after += *idl after += *Server Source_Files { - ami_testC.cpp - ami_testS.cpp client.cpp } - IDL_Files { - } } diff --git a/TAO/tests/Big_AMI/Makefile.am b/TAO/tests/Big_AMI/Makefile.am deleted file mode 100644 index db96e2ed6d9..00000000000 --- a/TAO/tests/Big_AMI/Makefile.am +++ /dev/null @@ -1,132 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Big_AMI_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -CLEANFILES = \ - ami_test-stamp \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp - -ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl - @touch $@ - -noinst_HEADERS = \ - ami_test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Big_AMI_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ami_testC.cpp \ - ami_testS.cpp \ - ami_test_i.cpp \ - server.cpp \ - ami_test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Big_AMI_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ami_testC.cpp \ - ami_testS.cpp \ - client.cpp \ - ami_test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Big_Oneways/.cvsignore b/TAO/tests/Big_Oneways/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Big_Oneways/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc index 6ce9fa45d76..5cf458a0b1e 100644 --- a/TAO/tests/Big_Oneways/Big_Oneways.mpc +++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc @@ -1,37 +1,21 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { Coordinator.cpp Session_Control.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoexe, portableserver { - after += *idl after += *Server Source_Files { Peer.cpp Session.cpp Session_Task.cpp client.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } + diff --git a/TAO/tests/Big_Oneways/Makefile.am b/TAO/tests/Big_Oneways/Makefile.am deleted file mode 100644 index ccd06c2e748..00000000000 --- a/TAO/tests/Big_Oneways/Makefile.am +++ /dev/null @@ -1,115 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Big_Oneways_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Big_Oneways_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Coordinator.cpp \ - Session_Control.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Coordinator.h \ - Session_Control.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Big_Oneways_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Peer.cpp \ - Session.cpp \ - Session_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Peer.h \ - Session.h \ - Session_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Big_Reply/.cvsignore b/TAO/tests/Big_Reply/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Big_Reply/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Big_Reply/Big_Reply.mpc b/TAO/tests/Big_Reply/Big_Reply.mpc index ca9b2157786..648403b35a4 100644 --- a/TAO/tests/Big_Reply/Big_Reply.mpc +++ b/TAO/tests/Big_Reply/Big_Reply.mpc @@ -1,34 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl + idlflags += -Sa -St after += *Client Source_Files { Big_Reply_i.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoclient { - after += *idl Source_Files { TestC.cpp Client_Task.cpp client.cpp } - IDL_Files { - } } diff --git a/TAO/tests/Big_Reply/Makefile.am b/TAO/tests/Big_Reply/Makefile.am deleted file mode 100644 index c6b26c68326..00000000000 --- a/TAO/tests/Big_Reply/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Big_Reply_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Big_Reply_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Big_Reply_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Big_Reply_i.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Big_Reply_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Big_Request_Muxing/.cvsignore b/TAO/tests/Big_Request_Muxing/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc index 1e41a5c9274..5d5b10de0c1 100644 --- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc +++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc @@ -1,33 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging { - after += *idl Source_Files { Payload_Receiver.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoclient, messaging { - after += *idl after += *Server Source_Files { TestC.cpp Client_Task.cpp client.cpp } - IDL_Files { - } } diff --git a/TAO/tests/Big_Request_Muxing/Makefile.am b/TAO/tests/Big_Request_Muxing/Makefile.am deleted file mode 100644 index 854de3a0a4c..00000000000 --- a/TAO/tests/Big_Request_Muxing/Makefile.am +++ /dev/null @@ -1,120 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Big_Request_Muxing_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Big_Request_Muxing_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Payload_Receiver.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Payload_Receiver.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Big_Request_Muxing_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Big_Twoways/.cvsignore b/TAO/tests/Big_Twoways/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Big_Twoways/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Big_Twoways/Big_Twoways.mpc b/TAO/tests/Big_Twoways/Big_Twoways.mpc index 6ce9fa45d76..5cf458a0b1e 100644 --- a/TAO/tests/Big_Twoways/Big_Twoways.mpc +++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc @@ -1,37 +1,21 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { Coordinator.cpp Session_Control.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoexe, portableserver { - after += *idl after += *Server Source_Files { Peer.cpp Session.cpp Session_Task.cpp client.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } + diff --git a/TAO/tests/Big_Twoways/Makefile.am b/TAO/tests/Big_Twoways/Makefile.am deleted file mode 100644 index 8892badb59a..00000000000 --- a/TAO/tests/Big_Twoways/Makefile.am +++ /dev/null @@ -1,115 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Big_Twoways_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Big_Twoways_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Coordinator.cpp \ - Session_Control.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Coordinator.h \ - Session_Control.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Big_Twoways_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Peer.cpp \ - Session.cpp \ - Session_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Peer.h \ - Session.h \ - Session_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Blocking_Sync_None/.cvsignore b/TAO/tests/Blocking_Sync_None/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Blocking_Sync_None/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc index 9bdc2b936c5..f2870ef39d9 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc @@ -1,32 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging { - after += *idl Source_Files { Blocking_Sync_None.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoclient, messaging { - after += *idl after += *Server Source_Files { TestC.cpp client.cpp } - IDL_Files { - } } + diff --git a/TAO/tests/Blocking_Sync_None/Makefile.am b/TAO/tests/Blocking_Sync_None/Makefile.am deleted file mode 100644 index 94403919f0c..00000000000 --- a/TAO/tests/Blocking_Sync_None/Makefile.am +++ /dev/null @@ -1,119 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Blocking_Sync_None_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Blocking_Sync_None_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Blocking_Sync_None.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Blocking_Sync_None.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Blocking_Sync_None_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Blocking_Sync_None.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1020_Basic_Regression/.cvsignore b/TAO/tests/Bug_1020_Basic_Regression/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Bug_1020_Basic_Regression/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc index e34a19f5abc..792a118237c 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc +++ b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc @@ -1,36 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging { - after += *idl Source_Files { Echo_Caller.cpp Server_Task.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoclient, messaging { - after += *idl after += *Server Source_Files { Echo.cpp Client_Task.cpp client.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } diff --git a/TAO/tests/Bug_1020_Basic_Regression/Makefile.am b/TAO/tests/Bug_1020_Basic_Regression/Makefile.am deleted file mode 100644 index 2cf5823bc29..00000000000 --- a/TAO/tests/Bug_1020_Basic_Regression/Makefile.am +++ /dev/null @@ -1,125 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1020_Basic_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_1020_Basic_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Echo_Caller.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Echo_Caller.h \ - Server_Task.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1020_Basic_Regression_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - Echo.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - Echo.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1020_Regression/.cvsignore b/TAO/tests/Bug_1020_Regression/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Bug_1020_Regression/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc index 33bc4b81e31..02b8056c191 100644 --- a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc +++ b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc @@ -1,36 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging { - after += *idl Source_Files { ORB_Task.cpp Server_i.cpp Server_Task.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoexe, messaging { - after += *idl Source_Files { Echo.cpp ORB_Task.cpp client.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } diff --git a/TAO/tests/Bug_1020_Regression/Makefile.am b/TAO/tests/Bug_1020_Regression/Makefile.am deleted file mode 100644 index 57b64ceb1d0..00000000000 --- a/TAO/tests/Bug_1020_Regression/Makefile.am +++ /dev/null @@ -1,127 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1020_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_1020_Regression_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Echo.cpp \ - ORB_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Echo.h \ - ORB_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1020_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ORB_Task.cpp \ - Server_Task.cpp \ - Server_i.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - ORB_Task.h \ - Server_Task.h \ - Server_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc b/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc index 86c800e8fef..106400400ae 100644 --- a/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc +++ b/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc @@ -1,35 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - idlflags += -Sa -St - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl + idlflags += -Sa -St Source_Files { BlobServer.cpp server.cpp - testC.cpp - testS.cpp - } - IDL_Files { } } project(*Client): taoserver { exename = client - after += *idl after += *Server Source_Files { client.cpp - testC.cpp - testS.cpp - } - IDL_Files { } } + diff --git a/TAO/tests/Bug_1254_Regression/Makefile.am b/TAO/tests/Bug_1254_Regression/Makefile.am deleted file mode 100644 index 558d743db78..00000000000 --- a/TAO/tests/Bug_1254_Regression/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1254_Regression_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Bug_1254_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - BlobServer.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - BlobServer.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_1254_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testS.cpp \ - BlobServer.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1269_Regression/.cvsignore b/TAO/tests/Bug_1269_Regression/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Bug_1269_Regression/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc index 1a4a34003bc..e38622c756d 100644 --- a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc +++ b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc @@ -1,35 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only =1 -} - project(*Server): taoserver, messaging { - after += *idl Source_Files { Echo_Caller.cpp Server_Timer.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoclient, messaging { - after += *idl after += *Server Source_Files { Echo.cpp client.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } diff --git a/TAO/tests/Bug_1269_Regression/Makefile.am b/TAO/tests/Bug_1269_Regression/Makefile.am deleted file mode 100644 index 0522a5fb3c2..00000000000 --- a/TAO/tests/Bug_1269_Regression/Makefile.am +++ /dev/null @@ -1,123 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1269_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_1269_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Echo_Caller.cpp \ - Server_Timer.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Echo_Caller.h \ - Server_Timer.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1269_Regression_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Echo.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Echo.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1270_Regression/.cvsignore b/TAO/tests/Bug_1270_Regression/.cvsignore new file mode 100644 index 00000000000..d955c473987 --- /dev/null +++ b/TAO/tests/Bug_1270_Regression/.cvsignore @@ -0,0 +1,3 @@ +client +server +shutdown diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc index a594a344e69..146c41a5026 100644 --- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc +++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc @@ -1,47 +1,25 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only =1 -} - project(*Server): taoserver, messaging { - after += *idl Source_Files { Echo_Caller.cpp Server_Timer.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoclient, messaging { - after += *idl after += *Server Source_Files { Echo.cpp client.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Shutdown): taoexe, messaging { - after += *idl after += *Client Source_Files { shutdown.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } diff --git a/TAO/tests/Bug_1270_Regression/Makefile.am b/TAO/tests/Bug_1270_Regression/Makefile.am deleted file mode 100644 index 444f9979eae..00000000000 --- a/TAO/tests/Bug_1270_Regression/Makefile.am +++ /dev/null @@ -1,158 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1270_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_1270_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Echo_Caller.cpp \ - Server_Timer.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Echo_Caller.h \ - Server_Timer.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1270_Regression_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Echo.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Echo.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1270_Regression_Shutdown.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += shutdown - -shutdown_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -shutdown_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - shutdown.cpp \ - Echo.h \ - Echo_Caller.h \ - ORB_Task.h \ - Server_Timer.h - -shutdown_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1330_Regression/.cvsignore b/TAO/tests/Bug_1330_Regression/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Bug_1330_Regression/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc index 803bdf58c37..93a6bb0d168 100644 --- a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc +++ b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc @@ -1,32 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, iortable { - after += *idl Source_Files { Test_i.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { TestC.cpp client.cpp } - IDL_Files { - } } diff --git a/TAO/tests/Bug_1330_Regression/Makefile.am b/TAO/tests/Bug_1330_Regression/Makefile.am deleted file mode 100644 index a32d8094a1d..00000000000 --- a/TAO/tests/Bug_1330_Regression/Makefile.am +++ /dev/null @@ -1,107 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1330_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_1330_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ - Test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_1330_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1361_Regression/.cvsignore b/TAO/tests/Bug_1361_Regression/.cvsignore new file mode 100644 index 00000000000..d955c473987 --- /dev/null +++ b/TAO/tests/Bug_1361_Regression/.cvsignore @@ -0,0 +1,3 @@ +client +server +shutdown diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc index 3e3ececcc65..f0247d4c080 100644 --- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc +++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc @@ -1,49 +1,27 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging { - after += *idl Source_Files { Server_Thread_Pool.cpp Echo_Caller.cpp ORB_Task.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoclient, messaging { - after += *idl after += *Server Source_Files { Echo.cpp ORB_Task.cpp client.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Shutdown): taoexe, messaging { - after += *idl after += *Client Source_Files { shutdown.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } diff --git a/TAO/tests/Bug_1361_Regression/Makefile.am b/TAO/tests/Bug_1361_Regression/Makefile.am deleted file mode 100644 index d20be7f6810..00000000000 --- a/TAO/tests/Bug_1361_Regression/Makefile.am +++ /dev/null @@ -1,163 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1361_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_1361_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Echo_Caller.cpp \ - ORB_Task.cpp \ - Server_Thread_Pool.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Echo_Caller.h \ - ORB_Task.h \ - Server_Thread_Pool.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1361_Regression_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Echo.cpp \ - ORB_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Echo.h \ - ORB_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1361_Regression_Shutdown.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += shutdown - -shutdown_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -shutdown_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - shutdown.cpp \ - Echo.h \ - Echo_Caller.h \ - ORB_Task.h \ - Server_Thread_Pool.h \ - Server_Timer.h - -shutdown_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1476_Regression/.cvsignore b/TAO/tests/Bug_1476_Regression/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Bug_1476_Regression/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc index 7fecacc059b..a149ce848c3 100644 --- a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc +++ b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc @@ -1,37 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging { - after += *idl Source_Files { Server_Task.cpp Sender_i.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoclient, messaging { - after += *idl after += *Server Source_Files { Client_Task.cpp Server_Task.cpp client.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } diff --git a/TAO/tests/Bug_1476_Regression/Makefile.am b/TAO/tests/Bug_1476_Regression/Makefile.am deleted file mode 100644 index e3dca0c929b..00000000000 --- a/TAO/tests/Bug_1476_Regression/Makefile.am +++ /dev/null @@ -1,125 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1476_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_1476_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Sender_i.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Sender_i.h \ - Server_Task.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1476_Regression_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - Server_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1476_Test/Makefile.am b/TAO/tests/Bug_1476_Test/Makefile.am deleted file mode 100644 index 46e058524d2..00000000000 --- a/TAO/tests/Bug_1476_Test/Makefile.am +++ /dev/null @@ -1,81 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_1476_Test_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.h \ - HelloS.inl - -CLEANFILES = \ - Hello-stamp \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.h \ - HelloS.inl - -HelloC.cpp HelloC.h HelloC.inl HelloS.h HelloS.inl: Hello-stamp - -Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Hello.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - HelloC.cpp \ - client.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.h \ - HelloS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1482_Regression/.cvsignore b/TAO/tests/Bug_1482_Regression/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Bug_1482_Regression/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc index aa7e626cec2..26363b5c9bc 100644 --- a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc +++ b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc @@ -1,37 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, amh, ami { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, amh, ami, iortable, portableserver { - after += *idl Source_Files { Hello.cpp Server_Task.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoserver, amh, ami { exename = client - after += *idl after += *Server Source_Files { Client_Task.cpp Reply_Handler.cpp client.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } diff --git a/TAO/tests/Bug_1482_Regression/Makefile.am b/TAO/tests/Bug_1482_Regression/Makefile.am deleted file mode 100644 index b15548828a0..00000000000 --- a/TAO/tests/Bug_1482_Regression/Makefile.am +++ /dev/null @@ -1,138 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1482_Regression_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GH -GC $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_1482_Regression_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - Server_Task.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_1482_Regression_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - Reply_Handler.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - Reply_Handler.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1495_Regression/.cvsignore b/TAO/tests/Bug_1495_Regression/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Bug_1495_Regression/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc index 15cb99367e1..7e7cfd67199 100644 --- a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc +++ b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc @@ -1,30 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, pi_server, interceptors { - after += *idl Source_Files { test_i.cpp - testC.cpp - testS.cpp Server_ORBInitializer.cpp server_interceptor.cpp Threaded_Server.cpp } - IDL_Files { - } } project(*Client): taoserver, pi, interceptors { exename = client - after += *idl after += *Server Source_Files { test_i.cpp @@ -36,7 +23,5 @@ project(*Client): taoserver, pi, interceptors { Server_Task.cpp Client_Task.cpp } - IDL_Files { - } } diff --git a/TAO/tests/Bug_1495_Regression/Makefile.am b/TAO/tests/Bug_1495_Regression/Makefile.am deleted file mode 100644 index 5afb4e57f93..00000000000 --- a/TAO/tests/Bug_1495_Regression/Makefile.am +++ /dev/null @@ -1,128 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1495_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Bug_1495_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - Threaded_Server.cpp \ - server_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Bug_1495_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - Server_Task.cpp \ - Threaded_Client.cpp \ - client_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Client_Task.h \ - Server_Task.h \ - client_interceptor.h \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1535_Regression/.cvsignore b/TAO/tests/Bug_1535_Regression/.cvsignore new file mode 100644 index 00000000000..4f843084647 --- /dev/null +++ b/TAO/tests/Bug_1535_Regression/.cvsignore @@ -0,0 +1 @@ +bug_1535_regression diff --git a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc index 354a6efdb94..7d7eaacb597 100644 --- a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc +++ b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(bug_1535_regression) : taoserver, utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(bug_1535_regression) : taoserver, utils, minimum_corba { exename = bug_1535_regression Source_Files { bug_1535_regression.cpp diff --git a/TAO/tests/Bug_1535_Regression/Makefile.am b/TAO/tests/Bug_1535_Regression/Makefile.am deleted file mode 100644 index 3f384346b81..00000000000 --- a/TAO/tests/Bug_1535_Regression/Makefile.am +++ /dev/null @@ -1,81 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.bug_1535_regression.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = bug_1535_regression - -bug_1535_regression_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -bug_1535_regression_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - bug_1535_regression.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -bug_1535_regression_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1551_Regression/.cvsignore b/TAO/tests/Bug_1551_Regression/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Bug_1551_Regression/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc index 676093874cc..96a4dfabd63 100644 --- a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc +++ b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc @@ -1,37 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, ami { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, ami, iortable { - after += *idl Source_Files { Hello.cpp Server_Task.cpp server.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoserver, ami { exename = client - after += *idl after += *Server Source_Files { Client_Task.cpp Reply_Handler.cpp client.cpp - TestC.cpp - TestS.cpp - } - IDL_Files { } } diff --git a/TAO/tests/Bug_1551_Regression/Makefile.am b/TAO/tests/Bug_1551_Regression/Makefile.am deleted file mode 100644 index 68d833bd470..00000000000 --- a/TAO/tests/Bug_1551_Regression/Makefile.am +++ /dev/null @@ -1,138 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1551_Regression_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_1551_Regression_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - Server_Task.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_1551_Regression_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - Reply_Handler.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - Reply_Handler.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1568_Regression/.cvsignore b/TAO/tests/Bug_1568_Regression/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Bug_1568_Regression/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc index 579c46280fa..d6430831e00 100644 --- a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc +++ b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc @@ -1,35 +1,16 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, amh { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, amh { - after += *idl Source_Files { server.cpp - - TestC.cpp - TestS.cpp - } - IDL_Files { } } project(*Client): taoserver, amh { - after += *idl after += *Server exename = client Source_Files { client.cpp - - TestC.cpp - TestS.cpp - } - IDL_Files { } } diff --git a/TAO/tests/Bug_1568_Regression/Makefile.am b/TAO/tests/Bug_1568_Regression/Makefile.am deleted file mode 100644 index 831beb93e46..00000000000 --- a/TAO/tests/Bug_1568_Regression/Makefile.am +++ /dev/null @@ -1,123 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1568_Regression_Idl.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1568_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1568_Regression_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1627_Regression/.cvsignore b/TAO/tests/Bug_1627_Regression/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Bug_1627_Regression/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc index 19a373b79c9..93a6bb0d168 100644 --- a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc +++ b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc @@ -1,32 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, iortable { - after += *idl Source_Files { Test_i.cpp - TestC.cpp - TestS.cpp server.cpp } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { TestC.cpp client.cpp } - IDL_Files { - } } diff --git a/TAO/tests/Bug_1627_Regression/Makefile.am b/TAO/tests/Bug_1627_Regression/Makefile.am deleted file mode 100644 index 4f291e1234b..00000000000 --- a/TAO/tests/Bug_1627_Regression/Makefile.am +++ /dev/null @@ -1,107 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1627_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_1627_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ - Test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_1627_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1635_Regression/.cvsignore b/TAO/tests/Bug_1635_Regression/.cvsignore new file mode 100644 index 00000000000..b051c6c57fa --- /dev/null +++ b/TAO/tests/Bug_1635_Regression/.cvsignore @@ -0,0 +1 @@ +client diff --git a/TAO/tests/Bug_1635_Regression/Makefile.am b/TAO/tests/Bug_1635_Regression/Makefile.am deleted file mode 100644 index 3ba24415721..00000000000 --- a/TAO/tests/Bug_1635_Regression/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_1635_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1636_Regression/.cvsignore b/TAO/tests/Bug_1636_Regression/.cvsignore new file mode 100644 index 00000000000..b051c6c57fa --- /dev/null +++ b/TAO/tests/Bug_1636_Regression/.cvsignore @@ -0,0 +1 @@ +client diff --git a/TAO/tests/Bug_1636_Regression/Makefile.am b/TAO/tests/Bug_1636_Regression/Makefile.am deleted file mode 100644 index c2aaf3eff02..00000000000 --- a/TAO/tests/Bug_1636_Regression/Makefile.am +++ /dev/null @@ -1,86 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.bug_1636_testclient.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1636_Regression/test.mpc b/TAO/tests/Bug_1636_Regression/test.mpc index 79a8483b3d4..ab891487d3f 100644 --- a/TAO/tests/Bug_1636_Regression/test.mpc +++ b/TAO/tests/Bug_1636_Regression/test.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (bug_1636_testclient) : taoclient, dynamicany, dynamicinterface, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project (bug_1636_testclient) : taoclient, dynamicany, dynamicinterface, portableserver, minimum_corba { exename = client IDL_Files { diff --git a/TAO/tests/Bug_1639_Regression/.cvsignore b/TAO/tests/Bug_1639_Regression/.cvsignore new file mode 100644 index 00000000000..b051c6c57fa --- /dev/null +++ b/TAO/tests/Bug_1639_Regression/.cvsignore @@ -0,0 +1 @@ +client diff --git a/TAO/tests/Bug_1639_Regression/Makefile.am b/TAO/tests/Bug_1639_Regression/Makefile.am deleted file mode 100644 index 810ca0bbbce..00000000000 --- a/TAO/tests/Bug_1639_Regression/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_1639_testclient.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - structC.cpp \ - structC.h \ - structC.inl \ - structS.cpp \ - structS.h \ - structS.inl - -CLEANFILES = \ - struct-stamp \ - structC.cpp \ - structC.h \ - structC.inl \ - structS.cpp \ - structS.h \ - structS.inl - -structC.cpp structC.h structC.inl structS.cpp structS.h structS.inl: struct-stamp - -struct-stamp: $(srcdir)/struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/struct.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - structC.cpp \ - structS.cpp \ - struct_client.cpp \ - structC.h \ - structC.inl \ - structS.h \ - structS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1639_Regression/test.mpc b/TAO/tests/Bug_1639_Regression/test.mpc index 883fc1c4bd0..f0d95132c29 100644 --- a/TAO/tests/Bug_1639_Regression/test.mpc +++ b/TAO/tests/Bug_1639_Regression/test.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (Bug_1639_testclient) : taoserver, dynamicany { +project (Bug_1639_testclient) : taoserver, dynamicany, exceptions { exename = client Source_Files { struct_client.cpp diff --git a/TAO/tests/Bug_1670_Regression/.cvsignore b/TAO/tests/Bug_1670_Regression/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Bug_1670_Regression/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc index a7ebd6af44a..5e8364ab993 100644 --- a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc +++ b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc @@ -1,37 +1,16 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, amh { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, amh { - after += *idl Source_Files { server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoserver, amh { exename = client - after += *idl after += *Server Source_Files { client.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Bug_1670_Regression/Makefile.am b/TAO/tests/Bug_1670_Regression/Makefile.am deleted file mode 100644 index ad7e1dd0f3f..00000000000 --- a/TAO/tests/Bug_1670_Regression/Makefile.am +++ /dev/null @@ -1,123 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1670_Regression_Idl.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1670_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1670_Regression_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc index a2357ad295c..9a1892855d9 100644 --- a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc +++ b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc @@ -1,32 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl + idlflags += -Sa -St Source_Files { Hello.cpp - TestC.cpp - TestS.cpp server.cpp } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server Source_Files { TestC.cpp client.cpp } - IDL_Files { - } } + diff --git a/TAO/tests/Bug_1676_Regression/Makefile.am b/TAO/tests/Bug_1676_Regression/Makefile.am deleted file mode 100644 index fb8e4382416..00000000000 --- a/TAO/tests/Bug_1676_Regression/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1676_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_1676_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_1676_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1693_Test/.cvsignore b/TAO/tests/Bug_1693_Test/.cvsignore new file mode 100644 index 00000000000..b051c6c57fa --- /dev/null +++ b/TAO/tests/Bug_1693_Test/.cvsignore @@ -0,0 +1 @@ +client diff --git a/TAO/tests/Bug_1693_Test/Makefile.am b/TAO/tests/Bug_1693_Test/Makefile.am deleted file mode 100644 index d58763326a0..00000000000 --- a/TAO/tests/Bug_1693_Test/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_1693_Test_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc b/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc index 679a47c31c8..679a47c31c8 100644..100755 --- a/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc +++ b/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc diff --git a/TAO/tests/Bug_1812_Regression/Makefile.am b/TAO/tests/Bug_1812_Regression/Makefile.am deleted file mode 100644 index db26b241d43..00000000000 --- a/TAO/tests/Bug_1812_Regression/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_1812_Regession_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - test.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1812_Regression/Test.idl b/TAO/tests/Bug_1812_Regression/Test.idl index 176f713989b..176f713989b 100644..100755 --- a/TAO/tests/Bug_1812_Regression/Test.idl +++ b/TAO/tests/Bug_1812_Regression/Test.idl diff --git a/TAO/tests/Bug_1812_Regression/test.cpp b/TAO/tests/Bug_1812_Regression/test.cpp index d3b463ab1f1..d3b463ab1f1 100644..100755 --- a/TAO/tests/Bug_1812_Regression/test.cpp +++ b/TAO/tests/Bug_1812_Regression/test.cpp diff --git a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc index 679a47c31c8..679a47c31c8 100644..100755 --- a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc +++ b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc diff --git a/TAO/tests/Bug_1813_Regression/Makefile.am b/TAO/tests/Bug_1813_Regression/Makefile.am deleted file mode 100644 index 960681b78e7..00000000000 --- a/TAO/tests/Bug_1813_Regression/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_1813_Regession_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - test.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1813_Regression/Test.idl b/TAO/tests/Bug_1813_Regression/Test.idl index 2b47d41dd97..2b47d41dd97 100644..100755 --- a/TAO/tests/Bug_1813_Regression/Test.idl +++ b/TAO/tests/Bug_1813_Regression/Test.idl diff --git a/TAO/tests/Bug_1813_Regression/test.cpp b/TAO/tests/Bug_1813_Regression/test.cpp index d3b463ab1f1..d3b463ab1f1 100644..100755 --- a/TAO/tests/Bug_1813_Regression/test.cpp +++ b/TAO/tests/Bug_1813_Regression/test.cpp diff --git a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc index 7bb66c7b450..15f79878b23 100644 --- a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc +++ b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc @@ -1,32 +1,14 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, ami { - IDL_Files { - AMI.idl - } - custom_only = 1 -} - -project(*Server): taoserver, iortable, ami { - after += *idl +project(*Server): taoserver, iortable, ami, exceptions { Source_Files { server.cpp - AMIC.cpp - AMIS.cpp - } - IDL_Files { } } -project(*Client): taoclient, ami { - after += *idl - after += *Server +project(*Client): taoclient, ami, exceptions { Source_Files { client.cpp - AMIC.cpp - AMIS.cpp - } - IDL_Files { } } diff --git a/TAO/tests/Bug_1869_Regression/Makefile.am b/TAO/tests/Bug_1869_Regression/Makefile.am deleted file mode 100644 index 2002f708ab0..00000000000 --- a/TAO/tests/Bug_1869_Regression/Makefile.am +++ /dev/null @@ -1,130 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1869_Regression_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - AMIC.cpp \ - AMIC.h \ - AMIC.inl \ - AMIS.cpp \ - AMIS.h \ - AMIS.inl - -CLEANFILES = \ - AMI-stamp \ - AMIC.cpp \ - AMIC.h \ - AMIC.inl \ - AMIS.cpp \ - AMIS.h \ - AMIS.inl - -AMIC.cpp AMIC.h AMIC.inl AMIS.cpp AMIS.h AMIS.inl: AMI-stamp - -AMI-stamp: $(srcdir)/AMI.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/AMI.idl - @touch $@ - -noinst_HEADERS = \ - AMI.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_1869_Regression_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - AMIC.cpp \ - AMIS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_1869_Regression_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - AMIC.cpp \ - AMIS.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_1904_Regression/.cvsignore b/TAO/tests/Bug_1904_Regression/.cvsignore new file mode 100644 index 00000000000..9daeafb9864 --- /dev/null +++ b/TAO/tests/Bug_1904_Regression/.cvsignore @@ -0,0 +1 @@ +test diff --git a/TAO/tests/Bug_1904_Regression/Makefile.am b/TAO/tests/Bug_1904_Regression/Makefile.am deleted file mode 100644 index efa696c355c..00000000000 --- a/TAO/tests/Bug_1904_Regression/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - test.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2084_Regression/Makefile.am b/TAO/tests/Bug_2084_Regression/Makefile.am deleted file mode 100644 index f7a5270b4e2..00000000000 --- a/TAO/tests/Bug_2084_Regression/Makefile.am +++ /dev/null @@ -1,86 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2084_Regression_Server.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - EventNode.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - EventNode.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2119_Regression/Makefile.am b/TAO/tests/Bug_2119_Regression/Makefile.am deleted file mode 100644 index 19e4384ed45..00000000000 --- a/TAO/tests/Bug_2119_Regression/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.tao67_test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_LTLIBRARIES = libtao67_test.la - -libtao67_test_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -libtao67_test_la_SOURCES = \ - testC.cpp \ - testS.cpp - -noinst_HEADERS = \ - test.idl \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2122_Regression/Makefile.am b/TAO/tests/Bug_2122_Regression/Makefile.am deleted file mode 100644 index adc3f2c0a3f..00000000000 --- a/TAO/tests/Bug_2122_Regression/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2122_Regression_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - test.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2124_Regression/Makefile.am b/TAO/tests/Bug_2124_Regression/Makefile.am deleted file mode 100644 index b532b96a6f9..00000000000 --- a/TAO/tests/Bug_2124_Regression/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2124_Regression_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - test.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2126_Regression/Makefile.am b/TAO/tests/Bug_2126_Regression/Makefile.am deleted file mode 100644 index 49f4b18b5fd..00000000000 --- a/TAO/tests/Bug_2126_Regression/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2126_Regression_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - test.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc index 7ade436bd07..2a3a953d97a 100644 --- a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc +++ b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (*Test) : taoserver, iortable, avoids_minimum_corba, messaging { +project (*Test) : taoserver, iortable, minimum_corba { Source_Files { Hello.cpp } diff --git a/TAO/tests/Bug_2134_Regression/Hello.cpp b/TAO/tests/Bug_2134_Regression/Hello.cpp index e5979299664..53eb63216e5 100644 --- a/TAO/tests/Bug_2134_Regression/Hello.cpp +++ b/TAO/tests/Bug_2134_Regression/Hello.cpp @@ -2,8 +2,6 @@ #include "tao/corba.h" #include "tao/IORTable/IORTable.h" -#include "tao/Messaging/Messaging.h" -#include "tao/AnyTypeCode/Any.h" #include "ace/OS_NS_string.h" #include "ace/SString.h" @@ -21,7 +19,6 @@ public: int main(int argc, char* argv[]) { - int status = 0; CORBA::ORB_var orb = CORBA::ORB::_nil(); ACE_TRY_NEW_ENV @@ -85,41 +82,13 @@ int main(int argc, char* argv[]) CORBA::Object_var obj = orb->string_to_object (friendly_corbaloc.c_str ()); ACE_TRY_CHECK; - TimeBase::TimeT timeout = 10000000; - - CORBA::Any timeout_any; - timeout_any <<= timeout; - - CORBA::PolicyList policy_list (1); - policy_list.length (1); - - policy_list[0] = orb->create_policy ( - Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - timeout_any); - - CORBA::Object_var rtt_obj = obj->_set_policy_overrides ( - policy_list, - CORBA::SET_OVERRIDE); - - policy_list[0]->destroy(); + Test::Hello_var hello2 = Test::Hello::_narrow (obj.in ()); + ACE_TRY_CHECK; - Test::Hello_var hello2 = Test::Hello::_narrow (rtt_obj.in ()); + hello2->say_hello (); ACE_TRY_CHECK; - if (CORBA::is_nil (hello2.in ())) - { - ACE_ERROR ((LM_ERROR, - "Unable to narrow from " - "corbaloc with policy override\n")); - status = 1; - } - else - { - hello2->say_hello (); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, "Test succeeded !!!\n")); - } + ACE_DEBUG ((LM_DEBUG, "Test succeeded !!!\n")); orb->destroy(); ACE_TRY_CHECK; @@ -128,9 +97,9 @@ int main(int argc, char* argv[]) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error - test failed - exception caught:"); - status = 1; + return 1; } ACE_ENDTRY; - return status; + return 0; } diff --git a/TAO/tests/Bug_2134_Regression/Makefile.am b/TAO/tests/Bug_2134_Regression/Makefile.am deleted file mode 100644 index 0b62e9f7bd9..00000000000 --- a/TAO/tests/Bug_2134_Regression/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2134_Regression_Test.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -CLEANFILES = \ - Hello-stamp \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp - -Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Hello.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - HelloC.cpp \ - HelloS.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.h \ - HelloS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc b/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc index 3fcbdd9dee2..3fcbdd9dee2 100644..100755 --- a/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc +++ b/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc diff --git a/TAO/tests/Bug_2144_Regression/Makefile.am b/TAO/tests/Bug_2144_Regression/Makefile.am deleted file mode 100644 index e93928a2855..00000000000 --- a/TAO/tests/Bug_2144_Regression/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2144_Regression_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - test.cpp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2144_Regression/README b/TAO/tests/Bug_2144_Regression/README index 78e177a24c7..78e177a24c7 100644..100755 --- a/TAO/tests/Bug_2144_Regression/README +++ b/TAO/tests/Bug_2144_Regression/README diff --git a/TAO/tests/Bug_2144_Regression/test.cpp b/TAO/tests/Bug_2144_Regression/test.cpp index c7b795b0d04..c7b795b0d04 100644..100755 --- a/TAO/tests/Bug_2144_Regression/test.cpp +++ b/TAO/tests/Bug_2144_Regression/test.cpp diff --git a/TAO/tests/Bug_2144_Regression/test.idl b/TAO/tests/Bug_2144_Regression/test.idl index 28335e7e932..28335e7e932 100644..100755 --- a/TAO/tests/Bug_2144_Regression/test.idl +++ b/TAO/tests/Bug_2144_Regression/test.idl diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc index fed64e9b29a..c01584c3559 100644 --- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc +++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc @@ -1,33 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { test_i.cpp - testC.cpp - testS.cpp server.cpp } - IDL_Files { - } } -project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): taoclient, anytypecode, minimum_corba { after += *Server Source_Files { testC.cpp client.cpp } - IDL_Files { - } } diff --git a/TAO/tests/Bug_2174_Regression/Makefile.am b/TAO/tests/Bug_2174_Regression/Makefile.am deleted file mode 100644 index 9943bfcdddc..00000000000 --- a/TAO/tests/Bug_2174_Regression/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2174_Regression_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Bug_2174_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2174_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2174_Regression/run_test.pl b/TAO/tests/Bug_2174_Regression/run_test.pl index e321d0a888c..5c1415515e4 100755 --- a/TAO/tests/Bug_2174_Regression/run_test.pl +++ b/TAO/tests/Bug_2174_Regression/run_test.pl @@ -70,9 +70,6 @@ if ($client != 3) { # Test C: server does not run (_non_existent() throws TRANSIENT) -# This test was failing on win32 without this sleep. -sleep 1; - $client = $CL->SpawnWaitKill (10); unlink $iorfile; if ($client != 5) { diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc index d4c612baee2..ff28e59983f 100644..100755 --- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc +++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc @@ -1,33 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, strategies { - after += *idl Source_Files { Hello.cpp - TestC.cpp - TestS.cpp server.cpp } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { TestC.cpp client.cpp } - IDL_Files { - } } diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp index 65df3934e3a..65df3934e3a 100644..100755 --- a/TAO/tests/Bug_2183_Regression/Hello.cpp +++ b/TAO/tests/Bug_2183_Regression/Hello.cpp diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h index 7e1c3042968..7e1c3042968 100644..100755 --- a/TAO/tests/Bug_2183_Regression/Hello.h +++ b/TAO/tests/Bug_2183_Regression/Hello.h diff --git a/TAO/tests/Bug_2183_Regression/Makefile.am b/TAO/tests/Bug_2183_Regression/Makefile.am deleted file mode 100644 index ce1fddacc1d..00000000000 --- a/TAO/tests/Bug_2183_Regression/Makefile.am +++ /dev/null @@ -1,107 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2183_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_2183_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2183_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2183_Regression/README b/TAO/tests/Bug_2183_Regression/README index 4e54c27822b..4e54c27822b 100644..100755 --- a/TAO/tests/Bug_2183_Regression/README +++ b/TAO/tests/Bug_2183_Regression/README diff --git a/TAO/tests/Bug_2183_Regression/Test.idl b/TAO/tests/Bug_2183_Regression/Test.idl index 3c0976e106d..3c0976e106d 100644..100755 --- a/TAO/tests/Bug_2183_Regression/Test.idl +++ b/TAO/tests/Bug_2183_Regression/Test.idl diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp index 913d3153ae9..913d3153ae9 100644..100755 --- a/TAO/tests/Bug_2183_Regression/client.cpp +++ b/TAO/tests/Bug_2183_Regression/client.cpp diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp index 4853611a134..4853611a134 100644..100755 --- a/TAO/tests/Bug_2183_Regression/server.cpp +++ b/TAO/tests/Bug_2183_Regression/server.cpp diff --git a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc index 874a0bb77df..0f6d8164108 100644 --- a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc +++ b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc @@ -1,40 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, strategies { - after += *idl Source_Files { Hello.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoserver, strategies { - after += *idl - after += *Server exename = client Source_Files { Hello.cpp client.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Bug_2186_Regression/Makefile.am b/TAO/tests/Bug_2186_Regression/Makefile.am deleted file mode 100644 index 82f5d21c814..00000000000 --- a/TAO/tests/Bug_2186_Regression/Makefile.am +++ /dev/null @@ -1,111 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2186_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_2186_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2186_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2188_Regression/Makefile.am b/TAO/tests/Bug_2188_Regression/Makefile.am deleted file mode 100644 index 3afd84b2118..00000000000 --- a/TAO/tests/Bug_2188_Regression/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.broken_idl.am - -BUILT_SOURCES = \ - brokenC.cpp \ - brokenC.h \ - brokenC.inl \ - brokenS.cpp \ - brokenS.h \ - brokenS.inl - -CLEANFILES = \ - broken-stamp \ - brokenC.cpp \ - brokenC.h \ - brokenC.inl \ - brokenS.cpp \ - brokenS.h \ - brokenS.inl - -brokenC.cpp brokenC.h brokenC.inl brokenS.cpp brokenS.h brokenS.inl: broken-stamp - -broken-stamp: $(srcdir)/broken.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/broken.idl - @touch $@ - -noinst_HEADERS = \ - broken.idl - -## Makefile.Broken_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - brokenC.cpp \ - brokenS.cpp \ - broken_i.cpp \ - server.cpp \ - broken_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Broken_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - brokenC.cpp \ - client.cpp \ - broken_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2188_Regression/broken.idl b/TAO/tests/Bug_2188_Regression/broken.idl index bc1eaa77e75..3337478fa51 100644 --- a/TAO/tests/Bug_2188_Regression/broken.idl +++ b/TAO/tests/Bug_2188_Regression/broken.idl @@ -1,7 +1,7 @@ // -// broken.idl -- Test IDL for array type CCA regressions +// arrayTest.idl -- Test IDL for array type CCA regressions // -// $Id$ +// $Revision$ $Date$ // enum enum1 diff --git a/TAO/tests/Bug_2188_Regression/broken.mpc b/TAO/tests/Bug_2188_Regression/broken.mpc index dbcd24841bb..184d57d6c73 100644 --- a/TAO/tests/Bug_2188_Regression/broken.mpc +++ b/TAO/tests/Bug_2188_Regression/broken.mpc @@ -1,32 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - broken.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl + idlflags += -Sa -St + Source_Files { broken_i.cpp - brokenC.cpp - brokenS.cpp server.cpp } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server + Source_Files { brokenC.cpp client.cpp } - IDL_Files { - } } diff --git a/TAO/tests/Bug_2201_Regression/Makefile.am b/TAO/tests/Bug_2201_Regression/Makefile.am deleted file mode 100644 index eadcaef70b1..00000000000 --- a/TAO/tests/Bug_2201_Regression/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2201_Regression_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestDataC.cpp \ - TestDataC.h \ - TestDataC.inl \ - TestDataS.cpp \ - TestDataS.h \ - TestDataS.inl - -CLEANFILES = \ - TestData-stamp \ - TestDataC.cpp \ - TestDataC.h \ - TestDataC.inl \ - TestDataS.cpp \ - TestDataS.h \ - TestDataS.inl - -TestDataC.cpp TestDataC.h TestDataC.inl TestDataS.cpp TestDataS.h TestDataS.inl: TestData-stamp - -TestData-stamp: $(srcdir)/TestData.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestData.idl - @touch $@ - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - TestDataC.cpp \ - TestDataS.cpp \ - test.cpp \ - TestDataC.h \ - TestDataC.inl \ - TestDataS.h \ - TestDataS.inl - -test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc b/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc index cff84ebf492..cff84ebf492 100644..100755 --- a/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc +++ b/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc diff --git a/TAO/tests/Bug_2222_Regression/Makefile.am b/TAO/tests/Bug_2222_Regression/Makefile.am deleted file mode 100644 index f0f01af2578..00000000000 --- a/TAO/tests/Bug_2222_Regression/Makefile.am +++ /dev/null @@ -1,101 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Bug_2222_Regression_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TestCaseC.cpp \ - TestCaseC.h \ - TestCaseC.inl \ - TestCaseS.h \ - TestCaseS.inl - -CLEANFILES += \ - TestCase-stamp \ - TestCaseC.cpp \ - TestCaseC.h \ - TestCaseC.inl \ - TestCaseS.h \ - TestCaseS.inl - -TestCaseC.cpp TestCaseC.h TestCaseC.inl TestCaseS.h TestCaseS.inl: TestCase-stamp - -TestCase-stamp: $(srcdir)/TestCase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestCase.idl - @touch $@ - -BUILT_SOURCES += \ - TestTypeC.cpp \ - TestTypeC.h \ - TestTypeC.inl \ - TestTypeS.h \ - TestTypeS.inl - -CLEANFILES += \ - TestType-stamp \ - TestTypeC.cpp \ - TestTypeC.h \ - TestTypeC.inl \ - TestTypeS.h \ - TestTypeS.inl - -TestTypeC.cpp TestTypeC.h TestTypeC.inl TestTypeS.h TestTypeS.inl: TestType-stamp - -TestType-stamp: $(srcdir)/TestType.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestType.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestCaseC.cpp \ - TestTypeC.cpp \ - test.cpp \ - TestCaseC.h \ - TestCaseC.inl \ - TestCaseS.h \ - TestCaseS.inl \ - TestTypeC.h \ - TestTypeC.inl \ - TestTypeS.h \ - TestTypeS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2222_Regression/TestCase.idl b/TAO/tests/Bug_2222_Regression/TestCase.idl index 119634fdc21..119634fdc21 100644..100755 --- a/TAO/tests/Bug_2222_Regression/TestCase.idl +++ b/TAO/tests/Bug_2222_Regression/TestCase.idl diff --git a/TAO/tests/Bug_2222_Regression/TestType.idl b/TAO/tests/Bug_2222_Regression/TestType.idl index 408e5cf6d97..408e5cf6d97 100644..100755 --- a/TAO/tests/Bug_2222_Regression/TestType.idl +++ b/TAO/tests/Bug_2222_Regression/TestType.idl diff --git a/TAO/tests/Bug_2222_Regression/test.cpp b/TAO/tests/Bug_2222_Regression/test.cpp index 8e6a7bec7ff..8e6a7bec7ff 100644..100755 --- a/TAO/tests/Bug_2222_Regression/test.cpp +++ b/TAO/tests/Bug_2222_Regression/test.cpp diff --git a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc index 447b7f6dd43..26c4972e1db 100644 --- a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc +++ b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc @@ -1,33 +1,25 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults,anytypecode { - IDL_Files { - Test.idl - } - custom_only = 1 -} project (*client) : taoclient,anytypecode { - after += *idl - - Source_Files { - TestC.cpp - client.cpp - } - IDL_Files { - } + IDL_Files { + Test.idl + } + + Source_Files { + TestC.cpp + client.cpp + } } project (*server) : taoserver,pi_server { - after += *idl after += *client + IDL_Files { + Test.idl + } - Source_Files { - TestC.cpp - TestS.cpp - server.cpp - } - IDL_Files { - } + Source_Files { + server.cpp + } } diff --git a/TAO/tests/Bug_2234_Regression/Makefile.am b/TAO/tests/Bug_2234_Regression/Makefile.am deleted file mode 100644 index c6c4fe0c5e0..00000000000 --- a/TAO/tests/Bug_2234_Regression/Makefile.am +++ /dev/null @@ -1,110 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2234_Regression_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2234_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2234_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc index e2d0b8a08cc..bf8946a0384 100644 --- a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc +++ b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc @@ -1,37 +1,21 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - idlflags += -Gp -Gd -Sa -St - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, iortable { exename = server - after += *idl + idlflags += -Gp -Gd -Sa -St Source_Files { server.cpp - TestC.cpp - TestS.cpp MyInterfaceImpl.cpp } - IDL_Files { - } } project(*Client): taoserver, iortable { exename = client - after += *idl + idlflags += -Gp -Gd -Sa -St after += *Server Source_Files { client.cpp - TestC.cpp - TestS.cpp MyInterfaceImpl.cpp } - IDL_Files { - } } diff --git a/TAO/tests/Bug_2289_Regression/Makefile.am b/TAO/tests/Bug_2289_Regression/Makefile.am deleted file mode 100644 index a92bfd1ebe9..00000000000 --- a/TAO/tests/Bug_2289_Regression/Makefile.am +++ /dev/null @@ -1,111 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2289_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gp -Gd -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_2289_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - MyInterfaceImpl.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - MyInterfaceImpl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2289_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - MyInterfaceImpl.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - MyInterfaceImpl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2319_Regression/Makefile.am b/TAO/tests/Bug_2319_Regression/Makefile.am deleted file mode 100644 index d9a6b38d532..00000000000 --- a/TAO/tests/Bug_2319_Regression/Makefile.am +++ /dev/null @@ -1,84 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2319_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc index 9fdbd894b7d..5fce9b69306 100644 --- a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc +++ b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc @@ -1,32 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, codeset { - after += *idl + idlflags += -Sa -St Source_Files { Hello.cpp - TestC.cpp - TestS.cpp server.cpp } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server Source_Files { TestC.cpp client.cpp } - IDL_Files { - } } + diff --git a/TAO/tests/Bug_2328_Regression/Makefile.am b/TAO/tests/Bug_2328_Regression/Makefile.am deleted file mode 100644 index d0bdb432204..00000000000 --- a/TAO/tests/Bug_2328_Regression/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2328_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_2328_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2328_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc b/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc index 1f4dbfe25ff..7223fb9069c 100644 --- a/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc +++ b/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server) : taoserver, imr_client, avoids_corba_e_micro { +project(*Server) : taoserver, imr_client, exceptions { Source_Files { server.cpp } diff --git a/TAO/tests/Bug_2345_Regression/Makefile.am b/TAO/tests/Bug_2345_Regression/Makefile.am deleted file mode 100644 index 0d7fa56e753..00000000000 --- a/TAO/tests/Bug_2345_Regression/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2345_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc index c01afd5aedd..3d5cf5b5deb 100644 --- a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc +++ b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc @@ -1,31 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - foo.idl - } - custom_only = 1 -} - -project(*server): taoserver { - after += *idl +project(*server): taoserver, exceptions { + idlflags += -Sa -St Source_Files { - fooC.cpp - fooS.cpp server.cpp } - IDL_Files { - } } -project(*client): taoclient { - after += *idl +project(*client): taoclient, exceptions { after += *Server Source_Files { fooC.cpp client.cpp } - IDL_Files { - } } diff --git a/TAO/tests/Bug_2349_Regression/Makefile.am b/TAO/tests/Bug_2349_Regression/Makefile.am deleted file mode 100644 index e2de872410d..00000000000 --- a/TAO/tests/Bug_2349_Regression/Makefile.am +++ /dev/null @@ -1,102 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2349_Regression_Idl.am - -BUILT_SOURCES = \ - fooC.cpp \ - fooC.h \ - fooC.inl \ - fooS.cpp \ - fooS.h \ - fooS.inl - -CLEANFILES = \ - foo-stamp \ - fooC.cpp \ - fooC.h \ - fooC.inl \ - fooS.cpp \ - fooS.h \ - fooS.inl - -fooC.cpp fooC.h fooC.inl fooS.cpp fooS.h fooS.inl: foo-stamp - -foo-stamp: $(srcdir)/foo.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/foo.idl - @touch $@ - -noinst_HEADERS = \ - foo.idl - -## Makefile.Bug_2349_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - fooC.cpp \ - fooS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2349_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - fooC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc index d428b0fce50..d428b0fce50 100644..100755 --- a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc +++ b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc diff --git a/TAO/tests/Bug_2375_Regression/Makefile.am b/TAO/tests/Bug_2375_Regression/Makefile.am deleted file mode 100644 index d42df4ae267..00000000000 --- a/TAO/tests/Bug_2375_Regression/Makefile.am +++ /dev/null @@ -1,79 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2375_Regression_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - test.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2375_Regression/README b/TAO/tests/Bug_2375_Regression/README index 97b642530a1..97b642530a1 100644..100755 --- a/TAO/tests/Bug_2375_Regression/README +++ b/TAO/tests/Bug_2375_Regression/README diff --git a/TAO/tests/Bug_2375_Regression/test.cpp b/TAO/tests/Bug_2375_Regression/test.cpp index 2a2d57db0e7..2a2d57db0e7 100644..100755 --- a/TAO/tests/Bug_2375_Regression/test.cpp +++ b/TAO/tests/Bug_2375_Regression/test.cpp diff --git a/TAO/tests/Bug_2375_Regression/test.idl b/TAO/tests/Bug_2375_Regression/test.idl index a6ee7413825..a6ee7413825 100644..100755 --- a/TAO/tests/Bug_2375_Regression/test.idl +++ b/TAO/tests/Bug_2375_Regression/test.idl diff --git a/TAO/tests/Bug_2399_Regression/Makefile.am b/TAO/tests/Bug_2399_Regression/Makefile.am deleted file mode 100644 index 32003a5ed50..00000000000 --- a/TAO/tests/Bug_2399_Regression/Makefile.am +++ /dev/null @@ -1,109 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Bug_2399_Regression_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - includedC.cpp \ - includedC.h \ - includedC.inl \ - includedS.cpp \ - includedS.h \ - includedS.inl - -CLEANFILES += \ - included-stamp \ - includedC.cpp \ - includedC.h \ - includedC.inl \ - includedS.cpp \ - includedS.h \ - includedS.inl - -includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl: included-stamp - -included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -t ./mytmp $(srcdir)/included.idl - @touch $@ - -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -t ./mytmp $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - includedC.cpp \ - includedS.cpp \ - test.cpp \ - testC.cpp \ - testS.cpp \ - includedC.h \ - includedC.inl \ - includedS.h \ - includedS.inl \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc index e2bd6d206cd..27d1cc5fd95 100644 --- a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc +++ b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc @@ -1,37 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, anytypecode { - IDL_Files { - publisher.idl - subscriber.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging, threads { - after += *idl Source_Files { publisher_impl.cpp - publisherS.cpp - publisherC.cpp - subscriberC.cpp server.cpp } - IDL_Files { - } } project(*Client): taoserver, threads { exename = client - after += *idl + after += *Server Source_Files { subscriber_impl.cpp - subscriberS.cpp - subscriberC.cpp - publisherC.cpp client.cpp } - IDL_Files { - } } + diff --git a/TAO/tests/Bug_2417_Regression/Makefile.am b/TAO/tests/Bug_2417_Regression/Makefile.am deleted file mode 100644 index de92d5ab5b5..00000000000 --- a/TAO/tests/Bug_2417_Regression/Makefile.am +++ /dev/null @@ -1,151 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Bug_2417_Regression_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - publisherC.cpp \ - publisherC.h \ - publisherC.inl \ - publisherS.cpp \ - publisherS.h \ - publisherS.inl - -CLEANFILES += \ - publisher-stamp \ - publisherC.cpp \ - publisherC.h \ - publisherC.inl \ - publisherS.cpp \ - publisherS.h \ - publisherS.inl - -publisherC.cpp publisherC.h publisherC.inl publisherS.cpp publisherS.h publisherS.inl: publisher-stamp - -publisher-stamp: $(srcdir)/publisher.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/publisher.idl - @touch $@ - -BUILT_SOURCES += \ - subscriberC.cpp \ - subscriberC.h \ - subscriberC.inl \ - subscriberS.cpp \ - subscriberS.h \ - subscriberS.inl - -CLEANFILES += \ - subscriber-stamp \ - subscriberC.cpp \ - subscriberC.h \ - subscriberC.inl \ - subscriberS.cpp \ - subscriberS.h \ - subscriberS.inl - -subscriberC.cpp subscriberC.h subscriberC.inl subscriberS.cpp subscriberS.h subscriberS.inl: subscriber-stamp - -subscriber-stamp: $(srcdir)/subscriber.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/subscriber.idl - @touch $@ - -noinst_HEADERS = \ - publisher.idl \ - subscriber.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2417_Regression_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - publisherC.cpp \ - subscriberC.cpp \ - subscriberS.cpp \ - subscriber_impl.cpp \ - subscriber_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2417_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - publisherC.cpp \ - publisherS.cpp \ - publisher_impl.cpp \ - server.cpp \ - subscriberC.cpp \ - publisher_impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2419_Regression/Makefile.am b/TAO/tests/Bug_2419_Regression/Makefile.am deleted file mode 100644 index 03c28405bdb..00000000000 --- a/TAO/tests/Bug_2419_Regression/Makefile.am +++ /dev/null @@ -1,115 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Bug_2419_Regression_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - local_childC.cpp \ - local_childC.h \ - local_childC.inl \ - local_childS.cpp \ - local_childS.h \ - local_childS.inl - -CLEANFILES += \ - local_child-stamp \ - local_childC.cpp \ - local_childC.h \ - local_childC.inl \ - local_childS.cpp \ - local_childS.h \ - local_childS.inl - -local_childC.cpp local_childC.h local_childC.inl local_childS.cpp local_childS.h local_childS.inl: local_child-stamp - -local_child-stamp: $(srcdir)/local_child.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/local_child.idl - @touch $@ - -BUILT_SOURCES += \ - abstract_parentC.cpp \ - abstract_parentC.h \ - abstract_parentC.inl \ - abstract_parentS.cpp \ - abstract_parentS.h \ - abstract_parentS.inl - -CLEANFILES += \ - abstract_parent-stamp \ - abstract_parentC.cpp \ - abstract_parentC.h \ - abstract_parentC.inl \ - abstract_parentS.cpp \ - abstract_parentS.h \ - abstract_parentS.inl - -abstract_parentC.cpp abstract_parentC.h abstract_parentC.inl abstract_parentS.cpp abstract_parentS.h abstract_parentS.inl: abstract_parent-stamp - -abstract_parent-stamp: $(srcdir)/abstract_parent.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/abstract_parent.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - abstract_parentC.cpp \ - abstract_parentS.cpp \ - client.cpp \ - local_childC.cpp \ - local_childS.cpp \ - abstract_parentC.h \ - abstract_parentC.inl \ - abstract_parentS.h \ - abstract_parentS.inl \ - local_childC.h \ - local_childC.inl \ - local_childS.h \ - local_childS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2424_Regression/Makefile.am b/TAO/tests/Bug_2424_Regression/Makefile.am deleted file mode 100644 index 396d95ffc09..00000000000 --- a/TAO/tests/Bug_2424_Regression/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2424_Regression_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - OneLineCosNamingC.cpp \ - OneLineCosNamingC.h \ - OneLineCosNamingC.inl \ - OneLineCosNamingS.cpp \ - OneLineCosNamingS.h \ - OneLineCosNamingS.inl - -CLEANFILES = \ - OneLineCosNaming-stamp \ - OneLineCosNamingC.cpp \ - OneLineCosNamingC.h \ - OneLineCosNamingC.inl \ - OneLineCosNamingS.cpp \ - OneLineCosNamingS.h \ - OneLineCosNamingS.inl - -OneLineCosNamingC.cpp OneLineCosNamingC.h OneLineCosNamingC.inl OneLineCosNamingS.cpp OneLineCosNamingS.h OneLineCosNamingS.inl: OneLineCosNaming-stamp - -OneLineCosNaming-stamp: $(srcdir)/OneLineCosNaming.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/OneLineCosNaming.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - OneLineCosNamingC.cpp \ - OneLineCosNamingS.cpp \ - client.cpp \ - OneLineCosNamingC.h \ - OneLineCosNamingC.inl \ - OneLineCosNamingS.h \ - OneLineCosNamingS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc index 71c3f8a21bb..27af500c3e6 100644 --- a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc +++ b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc @@ -1,46 +1,21 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - idlflags += -GC - - IDL_Files { - Child.idl - Parent.idl - } - custom_only = 1 -} - project(*Server) : taoserver, messaging { exename = server - after += *idl + idlflags += -Ge 1 -GC + Source_Files { server.cpp ChildServant.cpp } - Source_Files { - ChildC.cpp - ChildS.cpp - ParentC.cpp - ParentS.cpp - } - IDL_Files { - } } project(*Client) : taoclient, messaging { exename = client - after += *idl - after += *Server + idlflags += -Ge 1 -GC + Source_Files { client.cpp } - Source_Files { - ChildC.cpp - ChildS.cpp - ParentC.cpp - ParentS.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Bug_2429_Regression/Makefile.am b/TAO/tests/Bug_2429_Regression/Makefile.am deleted file mode 100644 index 35cb48ba541..00000000000 --- a/TAO/tests/Bug_2429_Regression/Makefile.am +++ /dev/null @@ -1,148 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2429_Regression_Idl.am - -BUILT_SOURCES = \ - ChildC.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.cpp \ - ChildS.h \ - ChildS.inl - -CLEANFILES = \ - Child-stamp \ - ChildC.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.cpp \ - ChildS.h \ - ChildS.inl - -ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp - -Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GC $(srcdir)/Child.idl - @touch $@ - -BUILT_SOURCES += \ - ParentC.cpp \ - ParentC.h \ - ParentC.inl \ - ParentS.cpp \ - ParentS.h \ - ParentS.inl - -CLEANFILES += \ - Parent-stamp \ - ParentC.cpp \ - ParentC.h \ - ParentC.inl \ - ParentS.cpp \ - ParentS.h \ - ParentS.inl - -ParentC.cpp ParentC.h ParentC.inl ParentS.cpp ParentS.h ParentS.inl: Parent-stamp - -Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GC $(srcdir)/Parent.idl - @touch $@ - -noinst_HEADERS = \ - Child.idl \ - Parent.idl - -## Makefile.Bug_2429_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ChildC.cpp \ - ChildS.cpp \ - ChildServant.cpp \ - ParentC.cpp \ - ParentS.cpp \ - server.cpp \ - ChildServant.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_2429_Regression_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ChildC.cpp \ - ChildS.cpp \ - ParentC.cpp \ - ParentS.cpp \ - client.cpp \ - ChildServant.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc index 1214006b391..0049fc035e7 100644 --- a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc +++ b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc @@ -1,37 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - idlflags += -St - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl + idlflags += -St Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient { - after += *idl + idlflags += -St after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/Bug_2494_Regression/Makefile.am b/TAO/tests/Bug_2494_Regression/Makefile.am deleted file mode 100644 index c1e1f21f1bb..00000000000 --- a/TAO/tests/Bug_2494_Regression/Makefile.am +++ /dev/null @@ -1,107 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2494_Regression_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Bug_2494_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2494_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc index 538d116a20e..8541c4b3c74 100644 --- a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc +++ b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc @@ -1,41 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, ami { - IDL_Files { - Test.idl - } - custom_only = 1 -} - -project(*Server): messaging, taoserver, ami { - after += *idl +project(*Server): messaging, taoserver, exceptions, ami { Source_Files { test_i.cpp common.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } -project(*Client): messaging, taoexe, portableserver, ami { - after += *idl +project(*Client): messaging, taoexe, portableserver, exceptions, ami { after += *Server Source_Files { test_i.cpp common.cpp client.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Bug_2503_Regression/Makefile.am b/TAO/tests/Bug_2503_Regression/Makefile.am deleted file mode 100644 index 6a9a0245ebe..00000000000 --- a/TAO/tests/Bug_2503_Regression/Makefile.am +++ /dev/null @@ -1,137 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2503_Regression_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_2503_Regression_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - common.cpp \ - server.cpp \ - test_i.cpp \ - common.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_2503_Regression_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - common.cpp \ - test_i.cpp \ - common.h \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2542_Regression/Makefile.am b/TAO/tests/Bug_2542_Regression/Makefile.am deleted file mode 100644 index ca096232806..00000000000 --- a/TAO/tests/Bug_2542_Regression/Makefile.am +++ /dev/null @@ -1,79 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2542_Regression.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - bug_2542_regression.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2543_Regression/Makefile.am b/TAO/tests/Bug_2543_Regression/Makefile.am deleted file mode 100644 index e0e209d54bd..00000000000 --- a/TAO/tests/Bug_2543_Regression/Makefile.am +++ /dev/null @@ -1,79 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2543_Regression.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - bug_2543_regression.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp index c023d511de6..e5a057e822b 100644 --- a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp +++ b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp @@ -31,6 +31,7 @@ int main (int argc, char* argv[]) IOP::Codec_var codec = codec_factory->create_codec(e); + CORBA::Any any_o; BaseSeq values; values.length(1); @@ -54,7 +55,7 @@ int main (int argc, char* argv[]) ACE_ERROR_RETURN ((LM_ERROR, "Error: wrong type!\n"), 1); } - orb->destroy(); + orb->destroy(); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_2549_Regression/Makefile.am b/TAO/tests/Bug_2549_Regression/Makefile.am deleted file mode 100644 index 6d3cceca5f0..00000000000 --- a/TAO/tests/Bug_2549_Regression/Makefile.am +++ /dev/null @@ -1,91 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2549_Regression_Test.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - test.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc b/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc index 31a88d65d5e..401f837e1d6 100644 --- a/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc +++ b/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc @@ -1,37 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Quoter.idl - } - custom_only = 1 -} - project(*client) : taoclient { - after += *idl + after += *Server exename = client source_files { - client.cpp - } - source_files { QuoterC.cpp - } - IDL_Files { + client.cpp } } -project(*server) : taoserver, avoids_corba_e_micro { - after += *idl +project(*server) : taoserver { + idlflags += -Sa -St source_files { server.cpp Stock_Factory_i.cpp Stock_i.cpp } - source_files { - QuoterC.cpp - QuoterS.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Bug_2560_Regression/Makefile.am b/TAO/tests/Bug_2560_Regression/Makefile.am deleted file mode 100644 index 71b77a9aa54..00000000000 --- a/TAO/tests/Bug_2560_Regression/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2560_Regression_Idl.am - -BUILT_SOURCES = \ - QuoterC.cpp \ - QuoterC.h \ - QuoterC.inl \ - QuoterS.cpp \ - QuoterS.h \ - QuoterS.inl - -CLEANFILES = \ - Quoter-stamp \ - QuoterC.cpp \ - QuoterC.h \ - QuoterC.inl \ - QuoterS.cpp \ - QuoterS.h \ - QuoterS.inl - -QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp - -Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Quoter.idl - @touch $@ - -noinst_HEADERS = \ - Quoter.idl - -## Makefile.Bug_2560_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - QuoterC.cpp \ - client.cpp \ - Stock_Factory_i.h \ - Stock_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2560_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - QuoterC.cpp \ - QuoterS.cpp \ - Stock_Factory_i.cpp \ - Stock_i.cpp \ - server.cpp \ - Stock_Factory_i.h \ - Stock_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc index 209f14c1f17..cd7cfb7f305 100644 --- a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc +++ b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc @@ -1,36 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, strategies { - after += *idl + idlflags += -Sa -St Source_Files { Hello.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Bug_2593_Regression/Makefile.am b/TAO/tests/Bug_2593_Regression/Makefile.am deleted file mode 100644 index a305106633f..00000000000 --- a/TAO/tests/Bug_2593_Regression/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2593_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_2593_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2593_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc index 02e2ddc1120..9a1892855d9 100644 --- a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc +++ b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc @@ -1,36 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl + idlflags += -Sa -St Source_Files { Hello.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Bug_2595_Regression/Makefile.am b/TAO/tests/Bug_2595_Regression/Makefile.am deleted file mode 100644 index 1ed398d6f50..00000000000 --- a/TAO/tests/Bug_2595_Regression/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2595_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_2595_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2595_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc b/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc deleted file mode 100644 index 5350e88e5a1..00000000000 --- a/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc +++ /dev/null @@ -1,38 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(*idl): taoidldefaults { - idlflags += -Sa -St - - IDL_Files { - Hello.idl - } - - custom_only = 1 -} - -project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, bidir_giop { - after += *idl - - Source_Files { - Hello.cpp - HelloS.cpp - HelloC.cpp - server.cpp - } - IDL_Files { - } -} - - -project(*Client): taoclient, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, messaging, bidir_giop { - after += *idl - - Source_Files { - HelloS.cpp - HelloC.cpp - client.cpp - } - IDL_Files { - } -} diff --git a/TAO/tests/Bug_2654_Regression/Hello.cpp b/TAO/tests/Bug_2654_Regression/Hello.cpp deleted file mode 100644 index da7f32dd4df..00000000000 --- a/TAO/tests/Bug_2654_Regression/Hello.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// -// $Id$ -// -#include "Hello.h" -#include "ace/Task.h" - -class Killer : public ACE_Task_Base -{ -public: - Killer (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) - { - } - - int svc (void) - { - ACE_DEBUG ((LM_DEBUG,"(%P|%t) server exiting\n")); - this->orb_->shutdown (1); - return 0; - } - -private: - CORBA::ORB_var orb_; -}; - -Hello::Hello (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)), - count_(0) - -{ -} - -void -Hello::set_callback (Test::CallBack_ptr cb - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_DEBUG ((LM_DEBUG,"(%P|%t) got callback \n")); - this->callback_ = Test::CallBack::_duplicate(cb); - this->callback_->method2(); -} - -void -Hello::method (CORBA::Short count ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (++this->count_ > 10) - { - ACE_DEBUG ((LM_DEBUG, "{%P| %t) supplied count = %d\n", count)); - PortableServer::POA_var poa = this->_default_POA(); - PortableServer::POAManager_var mgr = poa->the_POAManager(); - mgr->hold_requests(false); - Killer *k = new Killer (orb_.in ()); - k->activate(); - } -} diff --git a/TAO/tests/Bug_2654_Regression/Hello.h b/TAO/tests/Bug_2654_Regression/Hello.h deleted file mode 100644 index e6ab2e6e949..00000000000 --- a/TAO/tests/Bug_2654_Regression/Hello.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// $Id$ -// - -#ifndef HELLO_H -#define HELLO_H -#include /**/ "ace/pre.h" - -#include "HelloS.h" - -/// Implement the Test::Hello interface -class Hello - : public virtual POA_Test::Hello -{ -public: - /// Constructor - Hello (CORBA::ORB_ptr orb); - - // = The skeleton methods - virtual void method (CORBA::Short count ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void set_callback (Test::CallBack_ptr cb - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - -private: - /// Use an ORB reference to conver strings to objects and shutdown - /// the application. - CORBA::ORB_var orb_; - Test::CallBack_var callback_; - int count_; -}; - -#include /**/ "ace/post.h" -#endif /* HELLO_H */ diff --git a/TAO/tests/Bug_2654_Regression/Hello.idl b/TAO/tests/Bug_2654_Regression/Hello.idl deleted file mode 100644 index 1cd21f1773e..00000000000 --- a/TAO/tests/Bug_2654_Regression/Hello.idl +++ /dev/null @@ -1,22 +0,0 @@ -// -// $Id$ -// - -/// Put the interfaces in a module, to avoid global namespace pollution -module Test -{ - - interface CallBack - { - oneway void method2 (); - }; - - /// A very simple interface - interface Hello - { - void set_callback (in CallBack cb); - - oneway void method (in short count); - - }; -}; diff --git a/TAO/tests/Bug_2654_Regression/Makefile.am b/TAO/tests/Bug_2654_Regression/Makefile.am deleted file mode 100644 index d34e605aa8f..00000000000 --- a/TAO/tests/Bug_2654_Regression/Makefile.am +++ /dev/null @@ -1,118 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2654_Regression_Idl.am - -BUILT_SOURCES = \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -CLEANFILES = \ - Hello-stamp \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp - -Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Hello.idl - @touch $@ - -noinst_HEADERS = \ - Hello.idl - -## Makefile.Bug_2654_Regression_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - HelloC.cpp \ - HelloS.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_2654_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - HelloC.cpp \ - HelloS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2654_Regression/README b/TAO/tests/Bug_2654_Regression/README deleted file mode 100644 index dbda07fd6a9..00000000000 --- a/TAO/tests/Bug_2654_Regression/README +++ /dev/null @@ -1,73 +0,0 @@ -/** - -@page Bug_2654_Regression README File - -This test is for Bug 2654. Since bug 2654 is very difficult to -reproduce with an ordinary TAO build, hooks have been added to -tao/IIOP_Connector.cpp to enable slight delays durring the connection -process. See the bugzilla entry for more details. Enable the -INDUCE_BUG_2654_A flag and disable the fix (find "Fix for bug 2654") -in IIOP_Connector.cpp to see a pure virtual call. Otherwise the test -should always run to completion. - -The essense of this test is the relationship between reference counted -ACE_Event_Handlers and the entities that refer to them. During the -development of the fix for bug 2654, the -ACE_Event_Handler::[add|remove]_reference methods were modified to -take the name of a calling function as a string and to print out the -current count as well as the identity of the caller. The following -code shows how this was done. Obviously all code that called add or -remove ref had to be modified to pass the caller name. - -ACE_Event_Handler::Reference_Count -ACE_Event_Handler::add_reference (const char * caller) -{ - int reference_counting_required = - this->reference_counting_policy ().value () == - ACE_Event_Handler::Reference_Counting_Policy::ENABLED; - - if (reference_counting_required) - { - Reference_Count result = - ++this->reference_count_; - ACE_DEBUG ((LM_DEBUG,"(%P|%t)EH[0x%x]::add_ref called by %s, now %d\n", - this,caller, result)); - return result; - } - else - return 1; -} - -ACE_Event_Handler::Reference_Count -ACE_Event_Handler::remove_reference (const char * caller) -{ - int reference_counting_required = - this->reference_counting_policy ().value () == - ACE_Event_Handler::Reference_Counting_Policy::ENABLED; - - if (reference_counting_required) - { - Reference_Count result = - --this->reference_count_; - ACE_DEBUG ((LM_DEBUG, - "(%P|%t)EH[0x%x]::remove_ref called by %s, now %d\n", - this, caller, result)); - - if (result == 0) - delete this; - - return result; - } - else - { - return 1; - } -} - -To run the test use the run_test.pl script: - -$ ./run_test.pl - - the script returns 0 if the test was successful. - -*/ diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp deleted file mode 100644 index b7ce8ac336a..00000000000 --- a/TAO/tests/Bug_2654_Regression/client.cpp +++ /dev/null @@ -1,303 +0,0 @@ -// $Id$ - -#include "HelloS.h" - -#include "ace/OS_NS_time.h" - -#include "tao/Messaging/Messaging.h" - -#include "tao/Transport_Cache_Manager.h" -#include "tao/ORB_Core.h" -#include "tao/Thread_Lane_Resources.h" -#include "tao/Base_Transport_Property.h" -#include "tao/Stub.h" -#include "tao/Profile.h" -#include "tao/Transport.h" -#include "tao/BiDir_GIOP/BiDirGIOP.h" - -#include "ace/Task.h" -#include "ace/Synch.h" - -#include "ace/Get_Opt.h" - -ACE_RCSID(Hello, client, "$Id$") - -const char *ior = "file://test.ior"; - -class Callback_i : public POA_Test::CallBack -{ -public: - void method2(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) - { - ACE_DEBUG ((LM_DEBUG,"(%t) Callback_i::method2 called\n")); - } -}; - -class Worker : public ACE_Task_Base -{ -public: - CORBA::ORB_var orb_; - Test::Hello_var hello_; - Test::Hello_var asynch_hello_; - Test::CallBack_var callback_; - -private: - ACE_Mutex lock_; - int orb_threads_; - int busy_threads_; - int message_counter_; - - int run_test (void); -public: - Worker( int ot); - ~Worker(); - - int svc (void); -}; - -Worker::Worker(int ot) - :orb_threads_ (ot), - busy_threads_ (0), - message_counter_ (0) -{ -} - -Worker::~Worker() -{ - this->orb_->destroy(); -} - -int -Worker::svc() -{ - { - ACE_Guard<ACE_Mutex> g(this->lock_); - if (this->orb_threads_ > 0) - { - --this->orb_threads_; - hello_->set_callback(this->callback_.in()); - g.release(); - this->orb_->run(); - return 0; - } - else - ++this->busy_threads_; - } - bool excep = false; - ACE_DEBUG ((LM_DEBUG, "(%t) starting loop\n")); - for (int i = 0; i < 40; i++) - { - try - { - CORBA::Short n = 0; - { - ACE_Guard<ACE_Mutex> g(this->lock_); - n = ++this->message_counter_; - } - this->asynch_hello_->method (n); - - ACE_Time_Value udelay(0,400); - struct timespec ts = udelay; - ACE_OS::nanosleep (&ts); - - } - catch (CORBA::Exception &ex) - { - excep = true; - ACE_ERROR ((LM_ERROR, - "(%t) Exception caught: %s after %d invocations \n", - ex._name(), i)); - i = 39; - } - } - if (!excep) - ACE_DEBUG ((LM_DEBUG, "(%t) Did all iterations\n")); - - { - ACE_Guard<ACE_Mutex> g(this->lock_); - --this->busy_threads_; - if (this->busy_threads_) - return 0; - } - - try - { - this->orb_->shutdown(); - } - catch (CORBA::Exception &) - { - } - - return 0; -} - -int -init_callback (Worker &w) -{ - CORBA::Object_var obj = - w.orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - 1); - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - // Policies for the childPOA to be created. - CORBA::PolicyList policies (1); - policies.length (1); - - CORBA::Any pol; - pol <<= BiDirPolicy::BOTH; - policies[0] = - w.orb_->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // Create POA as child of RootPOA with the above policies. This POA - // will receive request in the same connection in which it sent - // the request - PortableServer::POA_var child_poa = - root_poa->create_POA ("childPOA", - poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - - Callback_i *servant = new Callback_i; - PortableServer::ServantBase_var owner = servant; - - PortableServer::ObjectId_var id = child_poa->activate_object (servant); - obj = child_poa->id_to_reference (id.in()); - w.callback_ = Test::CallBack::_narrow(obj.in()); - - // Creation of childPOA is over. Destroy the Policy objects. - for (CORBA::ULong i = 0; - i < policies.length (); - ++i) - { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - return 0; -} - - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "k:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'k': - ior = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k <ior> " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - Worker worker (5); - try - { - worker.orb_ = - CORBA::ORB_init (argc, argv, "test"); - - if (parse_args (argc, argv) != 0) - return 1; - - ACE_DEBUG ((LM_DEBUG,"using ior = %s\n",ior)); - - CORBA::Object_var tmp = worker.orb_->string_to_object(ior); - - if (CORBA::is_nil (tmp.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, "Invalid IOR.\n") - ,1); - } - worker.hello_ = Test::Hello::_narrow(tmp.in ()); - - if (CORBA::is_nil (worker.hello_.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Nil Test::Hello reference <%s>\n", - ior), - 1); - } - -// bool x = worker.hello_->_non_existent(); -// ACE_DEBUG ((LM_DEBUG, "_non_existent returned %d\n",x)); - - { - // Set the Synch Scopes - - CORBA::Any scope_as_any; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying SYNC_NONE.\n")); - scope_as_any <<= Messaging::SYNC_NONE; - CORBA::PolicyList policies (1); - policies.length (1); - policies[0] = - worker.orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any); - - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) - Applying Synch Scope at Object level.\n")); - tmp = tmp->_set_policy_overrides (policies, CORBA::SET_OVERRIDE); - policies[0]->destroy (); - } - - worker.asynch_hello_ = Test::Hello::_narrow(tmp.in ()); - - if (CORBA::is_nil (worker.asynch_hello_.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, - "Nil Test::Hello reference <%s>\n", - ior), - 1); - } - - init_callback(worker); - - } - catch (CORBA::Exception &ex) - { - ACE_ERROR ((LM_ERROR, "Exception caught: %s\"%s\"\n" - , ex._name(), ex._rep_id ())); - return 1; - } - - worker.activate (THR_NEW_LWP | THR_JOINABLE,15); - worker.wait(); - - return 0; -} diff --git a/TAO/tests/Bug_2654_Regression/run_test.pl b/TAO/tests/Bug_2654_Regression/run_test.pl deleted file mode 100755 index d4110fcaef3..00000000000 --- a/TAO/tests/Bug_2654_Regression/run_test.pl +++ /dev/null @@ -1,61 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; - -$status = 0; -$debug_level = '0'; - -foreach $i (@ARGV) { - if ($i eq '-debug') { - $debug_level = '10'; - } -} - -$iorfile = PerlACE::LocalFile ("server.ior"); -unlink $iorfile; - -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-ORBDebuglevel $debug_level -o server.ior"); -} -else { - $SV = new PerlACE::Process ("server", "-ORBdebuglevel $debug_level -o $iorfile"); -} -$CL = new PerlACE::Process ("client", " -k file://$iorfile"); - -$server = $SV->Spawn (); - -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; - exit 1; -} - -if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} - -$client = $CL->SpawnWaitKill (300); - -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; - $status = 1; -} - -$server = $SV->WaitKill (10); - -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; - $status = 1; -} - -unlink $iorfile; - -exit $status; diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp deleted file mode 100644 index 3b0c7e4528a..00000000000 --- a/TAO/tests/Bug_2654_Regression/server.cpp +++ /dev/null @@ -1,154 +0,0 @@ -// $Id$ - -#include "Hello.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_stdio.h" -#include "tao/BiDir_GIOP/BiDirGIOP.h" - -ACE_RCSID (Hello, - server, - "$Id$") - -const char *ior_output_file = "test.ior"; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "o:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'o': - ior_output_file = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-o <iorfile>" - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var obj = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (root_poa.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Panic: nil RootPOA\n"), - 1); - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - // Policies for the childPOA to be created. - CORBA::PolicyList policies (1); - policies.length (1); - - CORBA::Any pol; - pol <<= BiDirPolicy::BOTH; - policies[0] = - orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // Create POA as child of RootPOA with the above policies. This POA - // will receive request in the same connection in which it sent - // the request - PortableServer::POA_var child_poa = - root_poa->create_POA ("childPOA", - poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // Creation of childPOA is over. Destroy the Policy objects. - for (CORBA::ULong i = 0; - i < policies.length (); - ++i) - { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - - if (parse_args (argc, argv) != 0) - return 1; - - Hello *hello_impl; - ACE_NEW_RETURN (hello_impl, - Hello (orb.in ()), - 1); - PortableServer::ServantBase_var owner(hello_impl); - - PortableServer::ObjectId_var id = - child_poa->activate_object(hello_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - obj = child_poa->id_to_reference (id.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Hello_var hello = - Test::Hello::_narrow(obj.in() ACE_ENV_ARG_PARAMETER) - ACE_TRY_CHECK; - - CORBA::String_var ior = - orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // Output the IOR to the <ior_output_file> - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s\n", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc b/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc deleted file mode 100644 index 0cafec5b7d4..00000000000 --- a/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc +++ /dev/null @@ -1,10 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(*Test) : taoserver, messaging, ami { - exename = client - - Source_Files { - client.cpp - } -} diff --git a/TAO/tests/Bug_2669_Regression/Child.idl b/TAO/tests/Bug_2669_Regression/Child.idl deleted file mode 100644 index fd35fee57e6..00000000000 --- a/TAO/tests/Bug_2669_Regression/Child.idl +++ /dev/null @@ -1,17 +0,0 @@ - -//============================================================================= -/** - * $Id$ - */ -//============================================================================= - -#pragma prefix "child.pragma.prefix" - -#include "Parent.idl" - -interface ChildInterface : ParentInterface {}; - -module ChildModule - { - interface ChildInterface : ParentModule::ParentInterface {}; - }; diff --git a/TAO/tests/Bug_2669_Regression/Makefile.am b/TAO/tests/Bug_2669_Regression/Makefile.am deleted file mode 100644 index d2e38b33d23..00000000000 --- a/TAO/tests/Bug_2669_Regression/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Bug_2669_Regression_Test.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - ParentC.cpp \ - ParentC.h \ - ParentC.inl \ - ParentS.cpp \ - ParentS.h \ - ParentS.inl - -CLEANFILES += \ - Parent-stamp \ - ParentC.cpp \ - ParentC.h \ - ParentC.inl \ - ParentS.cpp \ - ParentS.h \ - ParentS.inl - -ParentC.cpp ParentC.h ParentC.inl ParentS.cpp ParentS.h ParentS.inl: Parent-stamp - -Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Parent.idl - @touch $@ - -BUILT_SOURCES += \ - ChildC.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.cpp \ - ChildS.h \ - ChildS.inl - -CLEANFILES += \ - Child-stamp \ - ChildC.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.cpp \ - ChildS.h \ - ChildS.inl - -ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp - -Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Child.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ChildC.cpp \ - ChildS.cpp \ - ParentC.cpp \ - ParentS.cpp \ - client.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.h \ - ChildS.inl \ - ParentC.h \ - ParentC.inl \ - ParentS.h \ - ParentS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2669_Regression/Parent.idl b/TAO/tests/Bug_2669_Regression/Parent.idl deleted file mode 100644 index e16e96124ec..00000000000 --- a/TAO/tests/Bug_2669_Regression/Parent.idl +++ /dev/null @@ -1,15 +0,0 @@ - -//============================================================================= -/** - * $Id$ - */ -//============================================================================= - -#pragma prefix "parent.pragma.prefix" - -interface ParentInterface {}; - -module ParentModule - { - interface ParentInterface {}; - }; diff --git a/TAO/tests/Bug_2669_Regression/README b/TAO/tests/Bug_2669_Regression/README deleted file mode 100644 index 5e2c1e0cf9e..00000000000 --- a/TAO/tests/Bug_2669_Regression/README +++ /dev/null @@ -1,23 +0,0 @@ -// $Id$ - -This test checks that the repository ID is correct for generated AMI reply handler servant classes when different pragma prefixes are used. - -It does this by checking that handlers for interfaces in an IDL inheritance relationship can be narrowed to their parents handler types. - -_Expected Success Output_ - -E:\sm\worcvs\tao14\prism\tests\tao439_regression>run_test.pl -Test Passed. - -_Expected Regression Output_ - -E:\sm\worcvs\tao14\prism\tests\tao439_regression>run_test.pl -Error: REGRESSION - Cannot narrow ChildModule::ChildInterface reply handler to i -ts parent handler type. -Error: REGRESSION - Cannot narrow ChildInterface reply handler to its parent han -dler type. -ERROR: client returned 1 - -(or anything else with the word REGRESSION in) - -All other output is an unexpected problem.
\ No newline at end of file diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp deleted file mode 100644 index f840ef82b8b..00000000000 --- a/TAO/tests/Bug_2669_Regression/client.cpp +++ /dev/null @@ -1,160 +0,0 @@ - -//============================================================================= -/** - * $Id$ - */ -//============================================================================= - - -#include "ace/Get_Opt.h" -#include "ace/Task.h" -#include "ace/OS_NS_string.h" - -#include "ChildS.h" - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ""); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -class ChildHandler : public POA_ChildModule::AMI_ChildInterfaceHandler -{ -public: - ChildHandler (void) {}; - ~ChildHandler (void) {}; -}; - -class NonRelatedChildHandler : public POA_AMI_ChildInterfaceHandler -{ -public: - NonRelatedChildHandler (void) {}; - ~NonRelatedChildHandler (void) {}; -}; - -int -main (int argc, char *argv[]) -{ - int result = 0; - - ACE_DECLARE_NEW_CORBA_ENV; - - ACE_TRY - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, ""); - ACE_TRY_CHECK; - - CORBA::Object_var object_var = - orb->resolve_initial_references ("RootPOA"); - ACE_TRY_CHECK; - - PortableServer::POA_var poa_var = - PortableServer::POA::_narrow (object_var.in ()); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager_var = - poa_var->the_POAManager (); - ACE_TRY_CHECK; - - poa_manager_var->activate (); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - // Create two handlers - ChildHandler child_handler; - NonRelatedChildHandler non_related_child_handler; - - ChildModule::AMI_ChildInterfaceHandler_var the_child_handler_var = - child_handler._this (); - - const char * expectedid = "IDL:child.pragma.prefix/ChildModule/AMI_ChildInterfaceHandler:1.0"; - if (ACE_OS::strcmp (the_child_handler_var->_interface_repository_id (), expectedid) != 0) - { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - ChildModule::repository id is " - "incorrectly generated, received %s\n", - the_child_handler_var->_interface_repository_id ())); - result = 1; - } - - // This handler has no relationship with the above in IDL. - AMI_ChildInterfaceHandler_var the_non_related_child_handler_var = - non_related_child_handler._this (); - - // Check that both handler objects narrow successfully to their parent - // handler types... - ParentModule::AMI_ParentInterfaceHandler_var the_parent_handler_var = - ParentModule::AMI_ParentInterfaceHandler::_narrow (the_child_handler_var.in ()); - - if (CORBA::is_nil (the_parent_handler_var.in ())) - { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - Cannot narrow ChildModule::ChildInterface " - "reply handler to its parent handler type.\n")); - result = 1; - } - - AMI_ParentInterfaceHandler_var the_non_related_parent_handler_var = - AMI_ParentInterfaceHandler::_narrow (the_non_related_child_handler_var.in ()); - - if (CORBA::is_nil (the_non_related_parent_handler_var.in ())) - { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - Cannot narrow ChildInterface " - "reply handler to its parent handler type.\n")); - result = 1; - } - - // Check that both handler objects *won't* narrow to each other's parent - // handler types... - the_parent_handler_var = - ParentModule::AMI_ParentInterfaceHandler::_narrow (the_non_related_child_handler_var.in ()); - - if (! CORBA::is_nil (the_parent_handler_var.in ())) - { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - ChildModule::ChildInterface reply handler " - "narrows to unrelated type.\n")); - result = 1; - } - - the_non_related_parent_handler_var = - AMI_ParentInterfaceHandler::_narrow (the_child_handler_var.in ()); - - if (! CORBA::is_nil (the_non_related_parent_handler_var.in ())) - { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - ChildModule::ChildInterface reply handler " - "narrows to unrelated type.\n")); - result = 1; - } - - poa_var->destroy (1,0); - - orb->destroy (); - - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); - return 1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); - - return result; -} diff --git a/TAO/tests/Bug_2669_Regression/run_test.pl b/TAO/tests/Bug_2669_Regression/run_test.pl deleted file mode 100755 index fdb7759230c..00000000000 --- a/TAO/tests/Bug_2669_Regression/run_test.pl +++ /dev/null @@ -1,31 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; - -$status = 0; - -if (PerlACE::is_vxworks_test()) { - $CL = new PerlACE::ProcessVX ("client", ""); -} -else { - $CL = new PerlACE::Process ("client", ""); -} - -$client = $CL->SpawnWaitKill (300); - -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; - $status = 1; -} -else -{ - print "Test Passed.\n" -} - -exit $status; diff --git a/TAO/tests/Bug_2683_Regression/IORTable.mpc b/TAO/tests/Bug_2683_Regression/IORTable.mpc index 621b224312e..669363e1eac 100644 --- a/TAO/tests/Bug_2683_Regression/IORTable.mpc +++ b/TAO/tests/Bug_2683_Regression/IORTable.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, iortable { - after += *idl + idlflags += -Sa -St Source_Files { test_i.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/Bug_2683_Regression/Makefile.am b/TAO/tests/Bug_2683_Regression/Makefile.am deleted file mode 100644 index fe325d6b9fb..00000000000 --- a/TAO/tests/Bug_2683_Regression/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.IORTable_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.IORTable_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.IORTable_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp index 4dba7549ff4..31349e3b1b9 100644 --- a/TAO/tests/Bug_2683_Regression/client.cpp +++ b/TAO/tests/Bug_2683_Regression/client.cpp @@ -69,12 +69,11 @@ public: }; int port = 0; -char const * target_host = "localhost"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "p:h:"); + ACE_Get_Opt get_opts (argc, argv, "p:"); int c; while ((c = get_opts ()) != -1) @@ -83,9 +82,7 @@ parse_args (int argc, char *argv[]) case 'p': port = ACE_OS::atoi (get_opts.opt_arg ()); break; - case 'h': - target_host = get_opts.opt_arg (); - break; + case '?': default: ACE_ERROR_RETURN ((LM_ERROR, @@ -112,7 +109,7 @@ main (int argc, char *argv[]) return 1; char ior[100]; - ACE_OS::sprintf (ior,"corbaloc::%s:%d/Racer",target_host,port); + ACE_OS::sprintf (ior,"corbaloc::localhost:%d/Racer",port); Pinger pinger(orb, ior); diff --git a/TAO/tests/Bug_2683_Regression/run_test.pl b/TAO/tests/Bug_2683_Regression/run_test.pl index 2fa15818757..b47caa3c5bd 100755 --- a/TAO/tests/Bug_2683_Regression/run_test.pl +++ b/TAO/tests/Bug_2683_Regression/run_test.pl @@ -18,17 +18,15 @@ foreach $i (@ARGV) { } unlink $iorfile; -$TARGETHOSTNAME = "localhost"; if (PerlACE::is_vxworks_test()) { - $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'}; - $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint iiop://$TARGETHOSTNAME:43210"); + $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint iiop://localhost:43210"); } else { - $SV = new PerlACE::Process ("server", "-ORBEndpoint iiop://$TARGETHOSTNAME:43210"); + $SV = new PerlACE::Process ("server", "-ORBEndpoint iiop://localhost:43210"); } -$CL = new PerlACE::Process ("client", " -p 43210 -h $TARGETHOSTNAME"); +$CL = new PerlACE::Process ("client", " -p 43210"); $server = $SV->Spawn (); diff --git a/TAO/tests/Bug_2702_Regression/CloseConnection.mpc b/TAO/tests/Bug_2702_Regression/CloseConnection.mpc deleted file mode 100644 index 9ec64bd7118..00000000000 --- a/TAO/tests/Bug_2702_Regression/CloseConnection.mpc +++ /dev/null @@ -1,13 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(*Client): taoexe { - exename = client - idlflags += -GA - - Source_Files { - TestC.cpp - client.cpp - } -} - diff --git a/TAO/tests/Bug_2702_Regression/Makefile.am b/TAO/tests/Bug_2702_Regression/Makefile.am deleted file mode 100644 index e373be645ba..00000000000 --- a/TAO/tests/Bug_2702_Regression/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.CloseConnection_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestA.h \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestA.h \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -TestA.h TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GA $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - TestA.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Bug_2702_Regression/README b/TAO/tests/Bug_2702_Regression/README deleted file mode 100644 index 6418f2d4413..00000000000 --- a/TAO/tests/Bug_2702_Regression/README +++ /dev/null @@ -1,18 +0,0 @@ -This test simulates the sending of a GIOP CloseConnection message. -Since TAO does not send this GIOP message, a perl script -(fakeserver2.pl) is used to simulate a CORBA server. Since it isn't -really a CORBA server, it has no way to generate an IOR, and instead -listens on a pre-selected fixed port (1192). Thus, part of this test -includes an IOR for a server listening on endpoint -iiop://127.0.0.1:1192. - -If the port number must be changed at some point in the future, one -will have to generate a new IOR file as well. The original was -generated using the "server" from the "Hello" test -($ACE_ROOT/TAO/tests/Hello) with ORB arguments - - -ORBDottedDecimalAddresses 1 -ORBendpoint iiop://127.0.0.1:1192 - -Something similar could be used to re-generate. - - diff --git a/TAO/tests/Bug_2702_Regression/Test.idl b/TAO/tests/Bug_2702_Regression/Test.idl deleted file mode 100644 index 3c0976e106d..00000000000 --- a/TAO/tests/Bug_2702_Regression/Test.idl +++ /dev/null @@ -1,20 +0,0 @@ -// -// $Id$ -// - -/// Put the interfaces in a module, to avoid global namespace pollution -module Test -{ - /// A very simple interface - interface Hello - { - /// Return a simple string - string get_string (); - - /// A method to shutdown the ORB - /** - * This method is used to simplify the test shutdown process - */ - oneway void shutdown (); - }; -}; diff --git a/TAO/tests/Bug_2702_Regression/client.cpp b/TAO/tests/Bug_2702_Regression/client.cpp deleted file mode 100644 index 3b2d214029c..00000000000 --- a/TAO/tests/Bug_2702_Regression/client.cpp +++ /dev/null @@ -1,81 +0,0 @@ -// $Id$ - -#include "TestC.h" -#include "ace/Get_Opt.h" - -ACE_RCSID(Hello, client, "$Id$") - -const char *ior = "file://test.ior"; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "k:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'k': - ior = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k <ior> " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (hello.in ())) - { - ACE_ERROR_RETURN ((LM_DEBUG, - "Nil Test::Hello reference <%s>\n", - ior), - 1); - } - - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_Time_Value duration(20, 0); - orb->run(duration); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/tests/Bug_2702_Regression/closeconnection.dat b/TAO/tests/Bug_2702_Regression/closeconnection.dat Binary files differdeleted file mode 100644 index 478fbbc2fcd..00000000000 --- a/TAO/tests/Bug_2702_Regression/closeconnection.dat +++ /dev/null diff --git a/TAO/tests/Bug_2702_Regression/fakeserver.pm b/TAO/tests/Bug_2702_Regression/fakeserver.pm deleted file mode 100644 index 87f2a676f81..00000000000 --- a/TAO/tests/Bug_2702_Regression/fakeserver.pm +++ /dev/null @@ -1,151 +0,0 @@ -package fakeserver; - -use Socket; -use IO::Socket; - -sub new { - my $self = { }; - $self->{'filebits'} = ''; - $self->{'connections'} = { }; - $self->{'server'} = ''; - $self->{'server_fileno'} = ''; - $self->{''} = ''; -} - -sub run { - my $self = shift; - my $timeoutafter = shift; # in seconds - my $rout; - while ( 1 ) { - print STDERR "fakeserver: Loop\n"; - - select( undef, undef, undef, 1 ); - - my ($n, $left) = select( $rout = $filebits, undef, undef, $timeoutafter); # Time out after 15 seconds - if ($n == 0) { - print STDERR "fakeserver: Terminating normally\n"; - exit 0; - } - - my $routs = unpack("b*", $rout); - print STDERR "fakeserver: Select $routs\n"; - my $pos = index( $routs,'1'); - while ( $pos >= 0 ) { - $self->HandleFile( $pos ); - $pos = index( $routs,'1', $pos+1); - } - } -} - -sub CloseServer { - my $self = shift; - vec($self->{'filebits'},$self->{'server_fileno'},1) = 0; - $server->close(); - undef $server; -} - -sub OpenServer { - my $self = shift; - my $server = IO::Socket::INET->new(Listen => 5, - LocalPort => 1192, - Reuse => 1, - ReuseAddr => 1, - Timeout => 0, - Proto => 'tcp'); - - die "Could not create socket $!" unless $server; - - $server->blocking(0); - my $server_fileno = fileno($server); - vec($filebits,$server_fileno,1) = 1; - - print STDERR "fakeserver: Starting $server_fileno\n"; - - open (DATA, 'closeconnection.dat') or die "couldn't open closeconnection.dat: $!\n"; - my $n = read(DATA, $closeconnectionmessage, 100); - close(DATA); - - print STDERR "fakeserver: read $n <$closeconnectionmessage> ", length($closeconnectionmessage), "\n"; - $self->{'server'} = $server; - $self->{'server_fileno'} = $server_fileno; -} - -sub SendMessage { - my $self = shift; - my( $message ) = @_; - - print STDERR "fakeserver: SendMessage $message\n"; - $message .= "\r\n"; - - foreach my $fileno (keys %{$self->{'connections'}}) { - if ( ${$self->{'connections'}}{$fileno} ) { - my $client = ${$self->{'connections'}}{$fileno}{client}; - print $client $message; - } - } -} - -sub HandleFile { - my $self = shift; - my ( $fileno ) = @_; - - print STDERR "fakeserver: HandleFile $fileno\n"; - if ( $fileno == $self->{'server_fileno'} ) { - HandleServer(); - } elsif ( ${$self->{'connections'}}{$fileno} ) { - HandleClient( $fileno ); - } else { - print STDERR "fakeserver: Weird fileno $fileno\n"; - } -} - -sub HandleServer { - my $self = shift; - my $client = $server->accept(); - - print STDERR "fakeserver: HandleServer\n"; - - if ( $client ) { - my $fileno = fileno($client); - $client->blocking(0); - ${$self->{'connections'}}{$fileno}{client} = $client; - ${$self->{'connections'}}{$fileno}{loggedin} = 0; - vec($self->{'filebits'},$fileno,1) = 1; - print STDERR "fakeserver: New client on $fileno\n"; - } else { - print STDERR "fakeserver: No accept for server, reopen\n"; - $self->CloseServer(); - $self->OpenServer(); - } -} - -sub HandleClient { - my $self = shift; - my ( $fileno ) = @_; - - print STDERR "fakeserver: HandleClient $fileno\n"; - my $receive; - my $n = recv( ${$self->{'connections'}}{$fileno}{client}, $receive, 200, 0 ); - my $rlen = length($receive); - if ( $receive ) { - if ($receive =~ /^GIOP/) { - print STDERR "fakeserver: Got $rlen byte GIOP message from client $fileno\n"; - } - else { - print STDERR "fakeserver: Got $rlen bytes from client $fileno\n"; - } - ${$self->{'connections'}}{$fileno}{receive} = $receive; - my $slen = length($closeconnectionmessage); - print STDERR "fakeserver: Sending $slen bytes GIOP closeconnection to $fileno\n"; - sleep(3); - $n = send(${$self->{'connections'}}{$fileno}{client}, $closeconnectionmessage, 0); - print STDERR "fakeserver: Sent $n bytes GIOP closeconnection to $fileno\n"; - } else { - print STDERR "fakeserver: Close client $fileno\n"; - vec(${$self->{'filebits'}},$fileno,1) = 0; - ${$self->{'connections'}}{$fileno}{client}->close(); - undef ${$self->{'connections'}}{$fileno}; - $self->SendMessage( "Close Client" ); - } -} - diff --git a/TAO/tests/Bug_2702_Regression/fakeserver2.pl b/TAO/tests/Bug_2702_Regression/fakeserver2.pl deleted file mode 100755 index 4b4a261dbf9..00000000000 --- a/TAO/tests/Bug_2702_Regression/fakeserver2.pl +++ /dev/null @@ -1,140 +0,0 @@ -#!/usr/bin/perl - -# $Id$ - -use Socket; -use IO::Socket; - -$filebits = ''; - -OpenServer(); - -my $rout; -while( 1 ) { - print STDERR "fakeserver: Loop\n"; - - select( undef, undef, undef, 1 ); - - ($n, $left) = select( $rout = $filebits, undef, undef, 15 ); # Time out after 15 seconds - if ($n == 0) { - print STDERR "fakeserver: Terminating normally\n"; - exit 0; - } - - my $routs = unpack("b*", $rout); - print STDERR "fakeserver: Select $routs\n"; - my $pos = index( $routs,'1'); - while ( $pos >= 0 ) { - HandleFile( $pos ); - $pos = index( $routs,'1', $pos+1); - } -} - -sub SendMessage { - local( $message ) = @_; - - print STDERR "fakeserver: SendMessage $message\n"; - $message .= "\r\n"; - - foreach $fileno (keys %connections) { - if ( $connections{$fileno} ) { - my $client = $connections{$fileno}{client}; - print $client $message; - } - } -} - - -sub HandleFile { - local( $fileno ) = @_; - - print STDERR "fakeserver: HandleFile $fileno\n"; - if ( $fileno == $server_fileno ) { - HandleServer(); - } elsif ( $connections{$fileno} ) { - HandleClient( $fileno ); - } else { - print STDERR "fakeserver: Weird fileno $fileno\n"; - } -} - -sub HandleServer { - my $client = $server->accept(); - - print STDERR "fakeserver: HandleServer\n"; - - if ( $client ) { - my $fileno = fileno($client); - $client->blocking(0); - $connections{$fileno}{client} = $client; - $connections{$fileno}{loggedin} = 0; - vec($filebits,$fileno,1) = 1; -# print $client "Welcome $fileno\r\n"; -# my $n = send($client, $closeconnectionmessage, 0); - print STDERR "fakeserver: New client on $fileno\n"; -# SendMessage( "New Client" ); - } else { - print STDERR "fakeserver: No accept for server, reopen\n"; - CloseServer(); - OpenServer(); - } -} - -sub HandleClient { - local( $fileno ) = @_; - - print STDERR "fakeserver: HandleClient $fileno\n"; - $n = recv( $connections{$fileno}{client}, $receive, 200, 0 ); - $rlen = length($receive); - if ( $receive ) { - if ($receive =~ /^GIOP/) { - print STDERR "fakeserver: Got $rlen byte GIOP message from client $fileno\n"; - } - else { - print STDERR "fakeserver: Got $rlen bytes from client $fileno\n"; - } - $connections{$fileno}{receive} = $receive; - $slen = length($closeconnectionmessage); - print STDERR "fakeserver: Sending $slen bytes GIOP closeconnection to $fileno\n"; - sleep(3); - $n = send($connections{$fileno}{client}, $closeconnectionmessage, 0); - print STDERR "fakeserver: Sent $n bytes GIOP closeconnection to $fileno\n"; - } else { - print STDERR "fakeserver: Close client $fileno\n"; - vec($filebits,$fileno,1) = 0; - $connections{$fileno}{client}->close(); - undef $connections{$fileno}; - SendMessage( "Close Client" ); - } - -} - -sub CloseServer { - vec($filebits,$server_fileno,1) = 0; - $server->close(); - undef $server; -} - -sub OpenServer { - - $server = IO::Socket::INET->new(Listen => 5, - LocalPort => 1192, - Reuse => 1, - ReuseAddr => 1, - Timeout => 0, - Proto => 'tcp'); - - die "Could not create socket $!" unless $server; - - $server->blocking(0); - $server_fileno = fileno($server); - vec($filebits,$server_fileno,1) = 1; - - print STDERR "fakeserver: Starting $server_fileno\n"; - - open (DATA, 'closeconnection.dat') or die "couldn't open closeconnection.dat: $!\n"; - my $n = read(DATA, $closeconnectionmessage, 100); - close(DATA); - - print STDERR "fakeserver: read $n <$closeconnectionmessage> ", length($closeconnectionmessage), "\n"; -} diff --git a/TAO/tests/Bug_2702_Regression/run_test.pl b/TAO/tests/Bug_2702_Regression/run_test.pl deleted file mode 100755 index 883eab373e3..00000000000 --- a/TAO/tests/Bug_2702_Regression/run_test.pl +++ /dev/null @@ -1,60 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; - -$iorfile = PerlACE::LocalFile ("server_on_localhost_1192.ior"); -$status = 0; - -## Get the perl interpreter that invoked us and remove any -## executable extension (if there is one). -my($perl) = $^X; -$perl =~ s/\.exe$//i; - -$SV = new PerlACE::Process ($perl, "fakeserver2.pl"); -$CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBdebuglevel 1 -ORBlogfile client.log"); -unlink "client.log"; - -$SV->IgnoreExeSubDir(1); -$SV->Spawn (); -sleep(1); # give the server a chance to come up - -if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} - -$client = $CL->SpawnWaitKill (60); - -# We expect to have to kill both client and server. - -#if ($client != 0) { -# print STDERR "ERROR: client returned $client\n"; -# $status = 1; -#} - -$server = $SV->WaitKill (10); - -#if ($server != 0) { -# print STDERR "ERROR: server returned $server\n"; -# $status = 1; -#} - -open (LOG, "client.log") or die "Couldn't open client log file client.log: $!\n"; -while (<LOG>) { - $ccmsgfound = 1 if (/process_parsed_messages, received CloseConnection message/); -} -close (LOG); -if (not $ccmsgfound) { - print STDERR "ERROR: didn't find CloseConnection debug message in client log.\n"; - $status = 1; -} - -exit $status; diff --git a/TAO/tests/Bug_2702_Regression/server_on_localhost_1192.ior b/TAO/tests/Bug_2702_Regression/server_on_localhost_1192.ior deleted file mode 100644 index c86e691b251..00000000000 --- a/TAO/tests/Bug_2702_Regression/server_on_localhost_1192.ior +++ /dev/null @@ -1 +0,0 @@ -IOR:012a2a2a1300000049444c3a546573742f48656c6c6f3a312e30002a0100000000000000680000000101022a0a0000003132372e302e302e3100a8041b00000014010f00525354f6fc6444bd600c000000000001000000010000002a020000000000000008000000012a2a2a004f41540100000018000000012a2a2a0100010001000000010001050901010000000000
\ No newline at end of file diff --git a/TAO/tests/CDR/.cvsignore b/TAO/tests/CDR/.cvsignore new file mode 100644 index 00000000000..3ea558ca364 --- /dev/null +++ b/TAO/tests/CDR/.cvsignore @@ -0,0 +1,6 @@ +alignment +allocator +basic_types +growth +octet_sequence +tc diff --git a/TAO/tests/CDR/Makefile.am b/TAO/tests/CDR/Makefile.am deleted file mode 100644 index 35c44b161a1..00000000000 --- a/TAO/tests/CDR/Makefile.am +++ /dev/null @@ -1,152 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.CDR_Alignment.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += alignment - -alignment_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -alignment_SOURCES = \ - alignment.cpp - -alignment_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CDR_Allocator.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += allocator - -allocator_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -allocator_SOURCES = \ - allocator.cpp - -allocator_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CDR_Basic_Types.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += basic_types - -basic_types_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -basic_types_SOURCES = \ - basic_types.cpp - -basic_types_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CDR_Growth.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += growth - -growth_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -growth_SOURCES = \ - growth.cpp - -growth_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CDR_Octet_Sequence.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += octet_sequence - -octet_sequence_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -octet_sequence_SOURCES = \ - octet_sequence.cpp - -octet_sequence_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CDR_Tc.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += tc - -tc_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -tc_SOURCES = \ - tc.cpp - -tc_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/COIOP/Makefile.am b/TAO/tests/COIOP/Makefile.am deleted file mode 100644 index c0a0a106366..00000000000 --- a/TAO/tests/COIOP/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.COIOP_Tests.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = COIOP_Test - -COIOP_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -COIOP_Test_SOURCES = \ - COIOP_Test.cpp \ - Client_Task.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -COIOP_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/COIOP/run_test.pl b/TAO/tests/COIOP/run_test.pl index 98605585458..e888f2cab33 100755 --- a/TAO/tests/COIOP/run_test.pl +++ b/TAO/tests/COIOP/run_test.pl @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -use lib "$ENV{ACE_ROOT}/bin"; +use lib '../../../bin'; use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("test.ior"); diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/Makefile.am b/TAO/tests/CSD_Strategy_Tests/Broken/Makefile.am deleted file mode 100644 index 8ffaa073566..00000000000 --- a/TAO/tests/CSD_Strategy_Tests/Broken/Makefile.am +++ /dev/null @@ -1,100 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.CSD_TP_Broken_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client_main - -client_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B - -client_main_SOURCES = \ - ClientApp.cpp \ - client_main.cpp \ - ClientApp.h - -client_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B - -client_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Broken_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server_main - -server_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B - -server_main_SOURCES = \ - ServerApp.cpp \ - server_main.cpp \ - ServerApp.h - -server_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B - -server_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CSD_Strategy_Tests/Makefile.am b/TAO/tests/CSD_Strategy_Tests/Makefile.am deleted file mode 100644 index a8ba990b33b..00000000000 --- a/TAO/tests/CSD_Strategy_Tests/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - TP_Common \ - TP_Foo_A \ - TP_Foo_B \ - Broken \ - TP_Foo_C \ - TP_Test_1 \ - TP_Test_2 \ - TP_Test_3 \ - TP_Test_4 \ - TP_Test_Dynamic \ - TP_Test_Static - diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc index 0f75c48c394..453ea84a1f0 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib_with_idl, csd_threadpool, avoids_corba_e_micro { +project : taolib_with_idl, csd_threadpool { sharedname = CSD_TP_Test dynamicflags = CSD_TP_TEST_BUILD_DLL idlflags += -Wb,export_macro=CSD_TP_Test_Export \ @@ -9,8 +9,8 @@ project : taolib_with_idl, csd_threadpool, avoids_corba_e_micro { IDL_Files { FooException.idl TestAppException.idl - CancelledException.idl - CustomException.idl + CancelledException.idl + CustomException.idl } Source_Files { @@ -29,8 +29,8 @@ project : taolib_with_idl, csd_threadpool, avoids_corba_e_micro { TestAppExceptionS.cpp CancelledExceptionC.cpp CancelledExceptionS.cpp - CustomExceptionC.cpp - CustomExceptionS.cpp + CustomExceptionC.cpp + CustomExceptionS.cpp } Template_Files { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Common/Makefile.am deleted file mode 100644 index b9225dcd7c9..00000000000 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/Makefile.am +++ /dev/null @@ -1,190 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.CSD_TP_Test_Lib.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -BUILT_SOURCES += \ - FooExceptionC.cpp \ - FooExceptionC.h \ - FooExceptionC.inl \ - FooExceptionS.cpp \ - FooExceptionS.h \ - FooExceptionS.inl - -CLEANFILES += \ - FooException-stamp \ - FooExceptionC.cpp \ - FooExceptionC.h \ - FooExceptionC.inl \ - FooExceptionS.cpp \ - FooExceptionS.h \ - FooExceptionS.inl - -FooExceptionC.cpp FooExceptionC.h FooExceptionC.inl FooExceptionS.cpp FooExceptionS.h FooExceptionS.inl: FooException-stamp - -FooException-stamp: $(srcdir)/FooException.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/FooException.idl - @touch $@ - -BUILT_SOURCES += \ - TestAppExceptionC.cpp \ - TestAppExceptionC.h \ - TestAppExceptionC.inl \ - TestAppExceptionS.cpp \ - TestAppExceptionS.h \ - TestAppExceptionS.inl - -CLEANFILES += \ - TestAppException-stamp \ - TestAppExceptionC.cpp \ - TestAppExceptionC.h \ - TestAppExceptionC.inl \ - TestAppExceptionS.cpp \ - TestAppExceptionS.h \ - TestAppExceptionS.inl - -TestAppExceptionC.cpp TestAppExceptionC.h TestAppExceptionC.inl TestAppExceptionS.cpp TestAppExceptionS.h TestAppExceptionS.inl: TestAppException-stamp - -TestAppException-stamp: $(srcdir)/TestAppException.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/TestAppException.idl - @touch $@ - -BUILT_SOURCES += \ - CancelledExceptionC.cpp \ - CancelledExceptionC.h \ - CancelledExceptionC.inl \ - CancelledExceptionS.cpp \ - CancelledExceptionS.h \ - CancelledExceptionS.inl - -CLEANFILES += \ - CancelledException-stamp \ - CancelledExceptionC.cpp \ - CancelledExceptionC.h \ - CancelledExceptionC.inl \ - CancelledExceptionS.cpp \ - CancelledExceptionS.h \ - CancelledExceptionS.inl - -CancelledExceptionC.cpp CancelledExceptionC.h CancelledExceptionC.inl CancelledExceptionS.cpp CancelledExceptionS.h CancelledExceptionS.inl: CancelledException-stamp - -CancelledException-stamp: $(srcdir)/CancelledException.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/CancelledException.idl - @touch $@ - -BUILT_SOURCES += \ - CustomExceptionC.cpp \ - CustomExceptionC.h \ - CustomExceptionC.inl \ - CustomExceptionS.cpp \ - CustomExceptionS.h \ - CustomExceptionS.inl - -CLEANFILES += \ - CustomException-stamp \ - CustomExceptionC.cpp \ - CustomExceptionC.h \ - CustomExceptionC.inl \ - CustomExceptionS.cpp \ - CustomExceptionS.h \ - CustomExceptionS.inl - -CustomExceptionC.cpp CustomExceptionC.h CustomExceptionC.inl CustomExceptionS.cpp CustomExceptionS.h CustomExceptionS.inl: CustomException-stamp - -CustomException-stamp: $(srcdir)/CustomException.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/CustomException.idl - @touch $@ - -noinst_LTLIBRARIES = libCSD_TP_Test.la - -libCSD_TP_Test_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tao \ - -DCSD_TP_TEST_BUILD_DLL - -libCSD_TP_Test_la_SOURCES = \ - AppHelper.cpp \ - AppShutdown.cpp \ - CancelledExceptionC.cpp \ - CancelledExceptionS.cpp \ - ClientEngine.cpp \ - ClientTask.cpp \ - CustomExceptionC.cpp \ - CustomExceptionS.cpp \ - FooExceptionC.cpp \ - FooExceptionS.cpp \ - OrbRunner.cpp \ - OrbShutdownTask.cpp \ - OrbTask.cpp \ - StatisticsHelper.cpp \ - TestAppBase.cpp \ - TestAppExceptionC.cpp \ - TestAppExceptionS.cpp - -noinst_HEADERS = \ - AppHelper.h \ - AppShutdown.h \ - CancelledException.idl \ - CancelledExceptionC.h \ - CancelledExceptionC.inl \ - CancelledExceptionS.h \ - CancelledExceptionS.inl \ - ClientEngine.h \ - ClientTask.h \ - CustomException.idl \ - CustomExceptionC.h \ - CustomExceptionC.inl \ - CustomExceptionS.h \ - CustomExceptionS.inl \ - FooException.idl \ - FooExceptionC.h \ - FooExceptionC.inl \ - FooExceptionS.h \ - FooExceptionS.inl \ - OrbRunner.h \ - OrbShutdownTask.h \ - OrbTask.h \ - ServantList_T.cpp \ - ServantList_T.h \ - StatisticsHelper.h \ - TestAppBase.h \ - TestAppException.idl \ - TestAppExceptionC.h \ - TestAppExceptionC.inl \ - TestAppExceptionS.h \ - TestAppExceptionS.inl - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am deleted file mode 100644 index 5a848bb8c5e..00000000000 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.csd_tp_foo_a_lib.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -BUILT_SOURCES = \ - Foo_AC.cpp \ - Foo_AC.h \ - Foo_AC.inl \ - Foo_AS.cpp \ - Foo_AS.h \ - Foo_AS.inl - -CLEANFILES = \ - Foo_A-stamp \ - Foo_AC.cpp \ - Foo_AC.h \ - Foo_AC.inl \ - Foo_AS.cpp \ - Foo_AS.h \ - Foo_AS.inl - -Foo_AC.cpp Foo_AC.h Foo_AC.inl Foo_AS.cpp Foo_AS.h Foo_AS.inl: Foo_A-stamp - -Foo_A-stamp: $(srcdir)/Foo_A.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -Wb,export_macro=CSD_TP_Foo_A_Export -Wb,export_include=CSD_TP_Foo_A_Export.h $(srcdir)/Foo_A.idl - @touch $@ - -noinst_LTLIBRARIES = libCSD_TP_Foo_A.la - -libCSD_TP_Foo_A_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tao \ - -DCSD_TP_FOO_A_BUILD_DLL - -libCSD_TP_Foo_A_la_SOURCES = \ - Foo_AC.cpp \ - Foo_AS.cpp \ - Foo_A_ClientEngine.cpp \ - Foo_A_Statistics.cpp \ - Foo_A_i.cpp - -libCSD_TP_Foo_A_la_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common - -noinst_HEADERS = \ - Foo_A.idl \ - Foo_AC.h \ - Foo_AC.inl \ - Foo_AS.h \ - Foo_AS.inl \ - Foo_A_ClientEngine.h \ - Foo_A_Statistics.h \ - Foo_A_i.h - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc index 6c796285d72..7f2027a9f5d 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc @@ -1,9 +1,9 @@ //$Id$ -project : csd_tp_test_lib, avoids_corba_e_micro { +project : csd_tp_test_lib { sharedname = CSD_TP_Foo_A dynamicflags = CSD_TP_FOO_A_BUILD_DLL idlflags += -Wb,export_macro=CSD_TP_Foo_A_Export -Wb,export_include=CSD_TP_Foo_A_Export.h - includes += $(TAO_ROOT)/tao + includes += $(TAO_ROOT)/tao IDL_Files { Foo_A.idl diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am deleted file mode 100644 index 4446b965cde..00000000000 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am +++ /dev/null @@ -1,124 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.csd_tp_foo_b_lib.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -BUILT_SOURCES += \ - Foo_BC.cpp \ - Foo_BC.h \ - Foo_BC.inl \ - Foo_BS.cpp \ - Foo_BS.h \ - Foo_BS.inl - -CLEANFILES += \ - Foo_B-stamp \ - Foo_BC.cpp \ - Foo_BC.h \ - Foo_BC.inl \ - Foo_BS.cpp \ - Foo_BS.h \ - Foo_BS.inl - -Foo_BC.cpp Foo_BC.h Foo_BC.inl Foo_BS.cpp Foo_BS.h Foo_BS.inl: Foo_B-stamp - -Foo_B-stamp: $(srcdir)/Foo_B.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -b -Wb,export_macro=CSD_TP_Foo_B_Export -Wb,export_include=CSD_TP_Foo_B_Export.h $(srcdir)/Foo_B.idl - @touch $@ - -BUILT_SOURCES += \ - CallbackC.cpp \ - CallbackC.h \ - CallbackC.inl \ - CallbackS.cpp \ - CallbackS.h \ - CallbackS.inl - -CLEANFILES += \ - Callback-stamp \ - CallbackC.cpp \ - CallbackC.h \ - CallbackC.inl \ - CallbackS.cpp \ - CallbackS.h \ - CallbackS.inl - -CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp - -Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -b -Wb,export_macro=CSD_TP_Foo_B_Export -Wb,export_include=CSD_TP_Foo_B_Export.h $(srcdir)/Callback.idl - @touch $@ - -noinst_LTLIBRARIES = libCSD_TP_Foo_B.la - -libCSD_TP_Foo_B_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tao \ - -DCSD_TP_FOO_B_BUILD_DLL - -libCSD_TP_Foo_B_la_SOURCES = \ - CallbackC.cpp \ - CallbackS.cpp \ - Callback_i.cpp \ - Foo_BC.cpp \ - Foo_BS.cpp \ - Foo_B_ClientEngine.cpp \ - Foo_B_SimpleClientEngine.cpp \ - Foo_B_Statistics.cpp \ - Foo_B_i.cpp - -libCSD_TP_Foo_B_la_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common - -noinst_HEADERS = \ - Callback.idl \ - CallbackC.h \ - CallbackC.inl \ - CallbackS.h \ - CallbackS.inl \ - Callback_i.h \ - Foo_B.idl \ - Foo_BC.h \ - Foo_BC.inl \ - Foo_BS.h \ - Foo_BS.inl \ - Foo_B_ClientEngine.h \ - Foo_B_SimpleClientEngine.h \ - Foo_B_Statistics.h \ - Foo_B_i.h - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc index 61ccdd335f1..f89d2b0db78 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc @@ -1,9 +1,9 @@ //$Id$ -project : csd_tp_test_lib, avoids_corba_e_micro { +project : csd_tp_test_lib { sharedname = CSD_TP_Foo_B dynamicflags = CSD_TP_FOO_B_BUILD_DLL idlflags += -b -Wb,export_macro=CSD_TP_Foo_B_Export -Wb,export_include=CSD_TP_Foo_B_Export.h - includes += $(TAO_ROOT)/tao + includes += $(TAO_ROOT)/tao IDL_Files { Foo_B.idl diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am deleted file mode 100644 index 4b967142bcc..00000000000 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am +++ /dev/null @@ -1,102 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.csd_tp_foo_c_lib.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -BUILT_SOURCES = \ - Foo_CC.cpp \ - Foo_CC.h \ - Foo_CC.inl \ - Foo_CS.cpp \ - Foo_CS.h \ - Foo_CS.inl - -CLEANFILES = \ - Foo_C-stamp \ - Foo_CC.cpp \ - Foo_CC.h \ - Foo_CC.inl \ - Foo_CS.cpp \ - Foo_CS.h \ - Foo_CS.inl - -Foo_CC.cpp Foo_CC.h Foo_CC.inl Foo_CS.cpp Foo_CS.h Foo_CS.inl: Foo_C-stamp - -Foo_C-stamp: $(srcdir)/Foo_C.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -b -Wb,export_macro=CSD_TP_Foo_C_Export -Wb,export_include=CSD_TP_Foo_C_Export.h $(srcdir)/Foo_C.idl - @touch $@ - -noinst_LTLIBRARIES = libCSD_TP_Foo_C.la - -libCSD_TP_Foo_C_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tao \ - -DCSD_TP_FOO_C_BUILD_DLL - -libCSD_TP_Foo_C_la_SOURCES = \ - Foo_CC.cpp \ - Foo_CS.cpp \ - Foo_C_ClientEngine.cpp \ - Foo_C_Custom_ClientEngine.cpp \ - Foo_C_Custom_Proxy.cpp \ - Foo_C_Statistics.cpp \ - Foo_C_cust_op1.cpp \ - Foo_C_cust_op2.cpp \ - Foo_C_cust_op3.cpp \ - Foo_C_cust_op4.cpp \ - Foo_C_cust_op5.cpp \ - Foo_C_i.cpp - -libCSD_TP_Foo_C_la_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common - -noinst_HEADERS = \ - Foo_C.idl \ - Foo_CC.h \ - Foo_CC.inl \ - Foo_CS.h \ - Foo_CS.inl \ - Foo_C_ClientEngine.h \ - Foo_C_Custom_ClientEngine.h \ - Foo_C_Custom_Proxy.h \ - Foo_C_Statistics.h \ - Foo_C_cust_op1.h \ - Foo_C_cust_op2.h \ - Foo_C_cust_op3.h \ - Foo_C_cust_op4.h \ - Foo_C_cust_op5.h \ - Foo_C_i.h - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc index 5c9a666e847..3cdd74fbb1f 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc @@ -1,5 +1,5 @@ //$Id$ -project : csd_tp_test_lib, avoids_corba_e_micro { +project : csd_tp_test_lib { sharedname = CSD_TP_Foo_C dynamicflags = CSD_TP_FOO_C_BUILD_DLL idlflags += -b -Wb,export_macro=CSD_TP_Foo_C_Export -Wb,export_include=CSD_TP_Foo_C_Export.h diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am deleted file mode 100644 index 4c5b0c144ab..00000000000 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am +++ /dev/null @@ -1,100 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.CSD_TP_Test_1_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client_main - -client_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -client_main_SOURCES = \ - ClientApp.cpp \ - client_main.cpp \ - ClientApp.h - -client_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -client_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Test_1_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server_main - -server_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -server_main_SOURCES = \ - ServerApp.cpp \ - server_main.cpp \ - ServerApp.h - -server_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -server_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am deleted file mode 100644 index cbff6e8ac08..00000000000 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am +++ /dev/null @@ -1,100 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.CSD_TP_Test_2_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client_main - -client_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -client_main_SOURCES = \ - ClientApp.cpp \ - client_main.cpp \ - ClientApp.h - -client_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -client_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Test_2_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server_main - -server_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -server_main_SOURCES = \ - ServerApp.cpp \ - server_main.cpp \ - ServerApp.h - -server_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -server_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am deleted file mode 100644 index 36717d2d1f3..00000000000 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am +++ /dev/null @@ -1,100 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.CSD_TP_Test_3_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client_main - -client_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B - -client_main_SOURCES = \ - ClientApp.cpp \ - client_main.cpp \ - ClientApp.h - -client_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B - -client_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Test_3_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server_main - -server_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B - -server_main_SOURCES = \ - ServerApp.cpp \ - server_main.cpp \ - ServerApp.h - -server_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B - -server_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am deleted file mode 100644 index b83caed15d3..00000000000 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am +++ /dev/null @@ -1,100 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.CSD_TP_Test_4_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client_main - -client_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C - -client_main_SOURCES = \ - ClientApp.cpp \ - client_main.cpp \ - ClientApp.h - -client_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C - -client_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_C/libCSD_TP_Foo_C.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Test_4_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server_main - -server_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C - -server_main_SOURCES = \ - ServerApp.cpp \ - server_main.cpp \ - ServerApp.h - -server_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C - -server_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_C/libCSD_TP_Foo_C.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am deleted file mode 100644 index fdd11b182a6..00000000000 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am +++ /dev/null @@ -1,130 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.CSD_TP_Test_Dynamic_Server.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Test_Dynamic_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am deleted file mode 100644 index 2d6c7c8e170..00000000000 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am +++ /dev/null @@ -1,100 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.CSD_TP_Test_Static_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server_main - -server_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -server_main_SOURCES = \ - ServerApp.cpp \ - server_main.cpp \ - ServerApp.h - -server_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -server_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Test_Static_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client_main - -client_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -client_main_SOURCES = \ - ClientApp.cpp \ - client_main.cpp \ - ClientApp.h - -client_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -client_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Cache_Growth_Test/.cvsignore b/TAO/tests/Cache_Growth_Test/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Cache_Growth_Test/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc index 9e3a806413a..e64ad8d08a8 100644 --- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc +++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc @@ -1,37 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { Hello.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/Cache_Growth_Test/Makefile.am b/TAO/tests/Cache_Growth_Test/Makefile.am deleted file mode 100644 index eb274fe7465..00000000000 --- a/TAO/tests/Cache_Growth_Test/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Cache_Growth_Test_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Cache_Growth_Test_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Cache_Growth_Test_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CallbackTest/CallbackTest.mpc b/TAO/tests/CallbackTest/CallbackTest.mpc index 186510c1f55..9bf640dd2b3 100644 --- a/TAO/tests/CallbackTest/CallbackTest.mpc +++ b/TAO/tests/CallbackTest/CallbackTest.mpc @@ -1,38 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging { - after += *idl Source_Files { Service.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient, portableserver, messaging { - after += *idl after += *Server Source_Files { Callback.cpp client.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/CallbackTest/Makefile.am b/TAO/tests/CallbackTest/Makefile.am deleted file mode 100644 index 6712a3408cc..00000000000 --- a/TAO/tests/CallbackTest/Makefile.am +++ /dev/null @@ -1,121 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.CallbackTest_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.CallbackTest_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Service.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Service.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.CallbackTest_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Callback.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Callback.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Client_Leaks/.cvsignore b/TAO/tests/Client_Leaks/.cvsignore new file mode 100644 index 00000000000..7fc225a9334 --- /dev/null +++ b/TAO/tests/Client_Leaks/.cvsignore @@ -0,0 +1,3 @@ +child +client +server diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc index 87611da09ef..a83a41950f3 100644 --- a/TAO/tests/Client_Leaks/Client_Leaks.mpc +++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc @@ -1,55 +1,30 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { Process_Factory.cpp Startup_Callback.cpp Server_Task.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { + TestC.cpp Client_Task.cpp client.cpp } - Source_Files { - TestC.cpp - } - IDL_Files { - } } project(*Child): taoserver { exename = child - after += *idl after += *Client Source_Files { Process.cpp child.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Client_Leaks/Makefile.am b/TAO/tests/Client_Leaks/Makefile.am deleted file mode 100644 index 05a2b8c0a6d..00000000000 --- a/TAO/tests/Client_Leaks/Makefile.am +++ /dev/null @@ -1,138 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Client_Leaks_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Client_Leaks_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Process_Factory.cpp \ - Server_Task.cpp \ - Startup_Callback.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Process_Factory.h \ - Server_Task.h \ - Startup_Callback.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Client_Leaks_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Client_Leaks_Child.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += child - -child_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -child_SOURCES = \ - Process.cpp \ - TestC.cpp \ - TestS.cpp \ - child.cpp \ - Process.h - -child_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CodeSets/Makefile.am b/TAO/tests/CodeSets/Makefile.am deleted file mode 100644 index 2ba3df85b6f..00000000000 --- a/TAO/tests/CodeSets/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - libs \ - simple - diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am deleted file mode 100644 index 8ad94bd2def..00000000000 --- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.CodeSets_libs_IMB1047_ISO8859.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES = libIBM1047_ISO8859.la - -libIBM1047_ISO8859_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DIBM1047_ISO8859_BUILD_DLL - -libIBM1047_ISO8859_la_SOURCES = \ - Char_IBM1047_ISO8859_Factory.cpp \ - Char_IBM1047_ISO8859_Translator.cpp \ - Wchar_IBM1047_ISO8859_Factory.cpp \ - Wchar_IBM1047_ISO8859_Translator.cpp - -noinst_HEADERS = \ - Char_IBM1047_ISO8859_Factory.h \ - Char_IBM1047_ISO8859_Translator.h \ - IBM1047_ISO8859_export.h \ - Wchar_IBM1047_ISO8859_Factory.h \ - Wchar_IBM1047_ISO8859_Translator.h - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CodeSets/libs/Makefile.am b/TAO/tests/CodeSets/libs/Makefile.am deleted file mode 100644 index e1a65ab4510..00000000000 --- a/TAO/tests/CodeSets/libs/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - IBM1047_ISO8859 \ - UCS4_UTF16 - diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/Makefile.am b/TAO/tests/CodeSets/libs/UCS4_UTF16/Makefile.am deleted file mode 100644 index 5875d3dd899..00000000000 --- a/TAO/tests/CodeSets/libs/UCS4_UTF16/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.CodeSets_Libs_UCS4_UTF16.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES = libUCS4_UTF16.la - -libUCS4_UTF16_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DUCS4_UTF16_BUILD_DLL - -libUCS4_UTF16_la_SOURCES = \ - WUCS4_UTF16.cpp \ - WUCS4_UTF16_Factory.cpp - -noinst_HEADERS = \ - WUCS4_UTF16.h \ - WUCS4_UTF16_Factory.h \ - WUCS4_UTF16_export.h - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CodeSets/simple/.cvsignore b/TAO/tests/CodeSets/simple/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/CodeSets/simple/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc index 6dac99613f4..a0a9ca666ce 100644 --- a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc +++ b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc @@ -1,42 +1,38 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { +project(*client) : taoclient, anytypecode { + after += *server IDL_Files { simple.idl } - custom_only = 1 -} - -project(*client) : taoclient, anytypecode { - after += *idl - after += *server Source_Files { client.cpp - } - - Source_Files { simpleC.cpp } - IDL_Files { + Header_Files { + simpleC.h } -} -project(*server) : taoserver { - after += *idl +} - Source_Files { - server.cpp +project(*server) : taoserver { + IDL_Files { + simple.idl } - Source_Files { + source_files { + server.cpp simpleC.cpp simpleS.cpp } - IDL_Files { + Header_Files { + simpleC.h + simpleS.h } + } diff --git a/TAO/tests/CodeSets/simple/Makefile.am b/TAO/tests/CodeSets/simple/Makefile.am deleted file mode 100644 index b9d0540cb9a..00000000000 --- a/TAO/tests/CodeSets/simple/Makefile.am +++ /dev/null @@ -1,103 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.CodeSets_Simple_Idl.am - -BUILT_SOURCES = \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.cpp \ - simpleS.h \ - simpleS.inl - -CLEANFILES = \ - simple-stamp \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.cpp \ - simpleS.h \ - simpleS.inl - -simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp - -simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple.idl - @touch $@ - -noinst_HEADERS = \ - simple.idl - -## Makefile.CodeSets_Simple_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - simpleC.cpp \ - simpleS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CodeSets_Simple_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - simpleC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp index bc016b1755d..edf6a3ab091 100644 --- a/TAO/tests/CodeSets/simple/client.cpp +++ b/TAO/tests/CodeSets/simple/client.cpp @@ -127,8 +127,6 @@ int main (int argc, char *argv[]) ACE_OS::free (wide_string); CORBA::wstring_free (wide_reply); #endif /* ACE_HAS_WCHAR */ - - server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/CodeSets/simple/run_test.pl b/TAO/tests/CodeSets/simple/run_test.pl index 3988d59ed3a..4f100136ad2 100755 --- a/TAO/tests/CodeSets/simple/run_test.pl +++ b/TAO/tests/CodeSets/simple/run_test.pl @@ -33,7 +33,7 @@ if ($client != 0) { $status = 1; } -$server = $SV->WaitKill (10); +$server = $SV->TerminateWaitKill (5); if ($server != 0) { print STDERR "ERROR: server returned $server\n"; @@ -63,7 +63,7 @@ if ($client2 != 0) { $status = 1; } -$server2 = $SV2->WaitKill (10); +$server2 = $SV2->TerminateWaitKill (5); if ($server2 != 0) { print STDERR "ERROR: server returned $server2\n"; diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp index 1f8cb2c10c2..d8a23526773 100644 --- a/TAO/tests/CodeSets/simple/server.cpp +++ b/TAO/tests/CodeSets/simple/server.cpp @@ -31,9 +31,6 @@ class SimpleImpl : public POA_simple { public: - SimpleImpl (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) - {} // implementation of corba interface char * op1 (const char * name, @@ -65,17 +62,6 @@ public: { return CORBA::wstring_dup (s1); }; - - void shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) - { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - }; - -private: - /// Use an ORB reference to shutdown - /// the application. - CORBA::ORB_var orb_; }; // ------------------------------------------------------------ @@ -121,7 +107,7 @@ int main(int argc, char *argv[]) // Create a C++ implementation of CORBA object SimpleImpl* my_impl = 0; ACE_NEW_RETURN (my_impl, - SimpleImpl (orb.in ()), + SimpleImpl, -1); // Create CORBA object for servant and REGISTER with POA diff --git a/TAO/tests/CodeSets/simple/simple.idl b/TAO/tests/CodeSets/simple/simple.idl index 9f58cc8869f..0f44ed62cce 100644 --- a/TAO/tests/CodeSets/simple/simple.idl +++ b/TAO/tests/CodeSets/simple/simple.idl @@ -7,10 +7,4 @@ interface simple out any outany); wstring op2 (in wstring s1); - - /// A method to shutdown the ORB - /** - * This method is used to simplify the test shutdown process - */ - oneway void shutdown (); }; diff --git a/TAO/tests/Codec/.cvsignore b/TAO/tests/Codec/.cvsignore new file mode 100644 index 00000000000..b051c6c57fa --- /dev/null +++ b/TAO/tests/Codec/.cvsignore @@ -0,0 +1 @@ +client diff --git a/TAO/tests/Codec/Makefile.am b/TAO/tests/Codec/Makefile.am deleted file mode 100644 index 8d2743e0a03..00000000000 --- a/TAO/tests/Codec/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Codec_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Collocation/.cvsignore b/TAO/tests/Collocation/.cvsignore new file mode 100644 index 00000000000..bee89094a99 --- /dev/null +++ b/TAO/tests/Collocation/.cvsignore @@ -0,0 +1 @@ +Collocation diff --git a/TAO/tests/Collocation/Collocation.mpc b/TAO/tests/Collocation/Collocation.mpc index b2c60b8b1b8..2bb76c43a80 100644 --- a/TAO/tests/Collocation/Collocation.mpc +++ b/TAO/tests/Collocation/Collocation.mpc @@ -1,50 +1,39 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { +project(*Test Stub): taolib_with_idl { + sharedname = Collocation_Test_Stub idlflags += -Wb,skel_export_macro=Diamond_Export \ -Wb,stub_export_macro=MY_Stub_Export \ -Wb,skel_export_include=diamond_export.h \ -Wb,stub_export_include=stub_export.h \ -Gd -St -Sa - IDL_Files { - Diamond.idl - } - custom_only = 1 -} - -project(*Test_Stub): taolib_with_idl { - after += *idl - - sharedname = Collocation_Test_Stub dynamicflags = MY_STUB_BUILD_DLL Source_Files { DiamondC.cpp } - IDL_Files { - } } project(*Diamond) : taolib_with_idl, portableserver { - after += *idl *Test_Stub after += Collocation_Test_Stub - sharedname = Collocation_Diamond - dynamicflags = DIAMOND_BUILD_DLL - libs += Collocation_Test_Stub + idlflags += -Wb,skel_export_macro=Diamond_Export \ + -Wb,stub_export_macro=MY_Stub_Export \ + -Wb,skel_export_include=diamond_export.h \ + -Wb,stub_export_include=stub_export.h \ + -Gd -St -Sa + dynamicflags = DIAMOND_BUILD_DLL Source_Files { Diamond_i.cpp DiamondS.cpp } - IDL_Files { - } } project(*Server) : taoserver, strategies { - after += *Test_Stub *Diamond + after += Collocation_Test_Stub Collocation_Diamond libs += Collocation_Test_Stub Collocation_Diamond exename = Collocation IDL_Files { diff --git a/TAO/tests/Collocation/Makefile.am b/TAO/tests/Collocation/Makefile.am deleted file mode 100644 index 1c43131fcab..00000000000 --- a/TAO/tests/Collocation/Makefile.am +++ /dev/null @@ -1,129 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_LTLIBRARIES = - -## Makefile.Collocation_Idl.am - -BUILT_SOURCES = \ - DiamondC.cpp \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.cpp \ - DiamondS.h \ - DiamondS.inl - -CLEANFILES = \ - Diamond-stamp \ - DiamondC.cpp \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.cpp \ - DiamondS.h \ - DiamondS.inl - -DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp - -Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd -St -Sa $(srcdir)/Diamond.idl - @touch $@ - -noinst_HEADERS = \ - Diamond.idl - -## Makefile.Collocation_Test_Stub.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libCollocation_Test_Stub.la - -libCollocation_Test_Stub_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DMY_STUB_BUILD_DLL - -libCollocation_Test_Stub_la_SOURCES = \ - DiamondC.cpp - -noinst_HEADERS += \ - Collocation_Tester.h \ - Diamond_i.h \ - diamond_export.h \ - stub_export.h - -endif BUILD_EXCEPTIONS - -## Makefile.Collocation_Diamond.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libCollocation_Diamond.la - -libCollocation_Diamond_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DDIAMOND_BUILD_DLL - -libCollocation_Diamond_la_SOURCES = \ - DiamondS.cpp \ - Diamond_i.cpp - -noinst_HEADERS += \ - Diamond_i.h - -endif BUILD_EXCEPTIONS - -## Makefile.Collocation_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Collocation - -Collocation_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocation_SOURCES = \ - Collocation.cpp \ - Collocation_Tester.cpp \ - Collocation_Tester.h - -Collocation_LDADD = \ - libCollocation_Test_Stub.la \ - libCollocation_Diamond.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/CollocationLockup/AB.idl b/TAO/tests/CollocationLockup/AB.idl index fe65905edb6..92b2822b872 100644 --- a/TAO/tests/CollocationLockup/AB.idl +++ b/TAO/tests/CollocationLockup/AB.idl @@ -3,6 +3,6 @@ interface A { }; -interface C { +interface B { A makeA (); }; diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp index f943951cefa..6f4e11ec90a 100644 --- a/TAO/tests/CollocationLockup/CollocationLockup.cpp +++ b/TAO/tests/CollocationLockup/CollocationLockup.cpp @@ -39,7 +39,7 @@ class A_i : public virtual POA_A { }; -class B_i : public virtual POA_C +class B_i : public virtual POA_B { public: virtual A_ptr @@ -134,7 +134,7 @@ TestThread (void*) for (size_t i (0); i < N_ITERATIONS; ++i) { CORBA::Object_var obj = g_pNameService->resolve (); - C_var b = C::_narrow (obj.in ()); + B_var b = B::_narrow (obj.in ()); b->makeA (); if (i % 50 == 0) ACE_DEBUG ((LM_INFO, "(%t) collocated call returned\n")); diff --git a/TAO/tests/CollocationLockup/CollocationLockup.mpc b/TAO/tests/CollocationLockup/CollocationLockup.mpc index 84844be2a3d..517321c3d53 100644 --- a/TAO/tests/CollocationLockup/CollocationLockup.mpc +++ b/TAO/tests/CollocationLockup/CollocationLockup.mpc @@ -1,48 +1,27 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - AB.idl - SimpleNamingService.idl - } - custom_only = 1 -} - project: taoserver { + idlflags += -St exename = CollocationLockup - after += *idl - after += *SimpleNamingService - - Source_Files { - CollocationLockup.cpp - } Source_Files { ABC.cpp ABS.cpp - } - Source_Files { SimpleNamingServiceC.cpp - } - - IDL_Files { + CollocationLockup.cpp } } project(*SimpleNamingService): taoserver { + idlflags += -St exename = SimpleNamingService - after += *idl + IDL_Files { + SimpleNamingService.idl + } Source_Files { SimpleNamingService.cpp } - Source_Files { - SimpleNamingServiceC.cpp - SimpleNamingServiceS.cpp - } - - IDL_Files { - } } diff --git a/TAO/tests/CollocationLockup/Makefile.am b/TAO/tests/CollocationLockup/Makefile.am deleted file mode 100644 index e9f847fb214..00000000000 --- a/TAO/tests/CollocationLockup/Makefile.am +++ /dev/null @@ -1,130 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.CollocationLockup_Idl.am - -BUILT_SOURCES = \ - ABC.cpp \ - ABC.h \ - ABC.inl \ - ABS.cpp \ - ABS.h \ - ABS.inl - -CLEANFILES = \ - AB-stamp \ - ABC.cpp \ - ABC.h \ - ABC.inl \ - ABS.cpp \ - ABS.h \ - ABS.inl - -ABC.cpp ABC.h ABC.inl ABS.cpp ABS.h ABS.inl: AB-stamp - -AB-stamp: $(srcdir)/AB.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/AB.idl - @touch $@ - -BUILT_SOURCES += \ - SimpleNamingServiceC.cpp \ - SimpleNamingServiceC.h \ - SimpleNamingServiceC.inl \ - SimpleNamingServiceS.cpp \ - SimpleNamingServiceS.h \ - SimpleNamingServiceS.inl - -CLEANFILES += \ - SimpleNamingService-stamp \ - SimpleNamingServiceC.cpp \ - SimpleNamingServiceC.h \ - SimpleNamingServiceC.inl \ - SimpleNamingServiceS.cpp \ - SimpleNamingServiceS.h \ - SimpleNamingServiceS.inl - -SimpleNamingServiceC.cpp SimpleNamingServiceC.h SimpleNamingServiceC.inl SimpleNamingServiceS.cpp SimpleNamingServiceS.h SimpleNamingServiceS.inl: SimpleNamingService-stamp - -SimpleNamingService-stamp: $(srcdir)/SimpleNamingService.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/SimpleNamingService.idl - @touch $@ - -noinst_HEADERS = \ - AB.idl \ - SimpleNamingService.idl - -## Makefile.CollocationLockup_SimpleNamingService.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += SimpleNamingService - -SimpleNamingService_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -SimpleNamingService_SOURCES = \ - SimpleNamingService.cpp \ - SimpleNamingServiceC.cpp \ - SimpleNamingServiceS.cpp - -SimpleNamingService_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CollocationLockup.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += CollocationLockup - -CollocationLockup_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -CollocationLockup_SOURCES = \ - ABC.cpp \ - ABS.cpp \ - CollocationLockup.cpp \ - SimpleNamingServiceC.cpp - -CollocationLockup_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Collocation_Exception_Test/Makefile.am b/TAO/tests/Collocation_Exception_Test/Makefile.am deleted file mode 100644 index d82ad291953..00000000000 --- a/TAO/tests/Collocation_Exception_Test/Makefile.am +++ /dev/null @@ -1,84 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Collocation_Excep_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = Collocated_Test - -Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -Collocated_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Collocation_Oneway_Tests/Makefile.am b/TAO/tests/Collocation_Oneway_Tests/Makefile.am deleted file mode 100644 index 0d4a3039a4f..00000000000 --- a/TAO/tests/Collocation_Oneway_Tests/Makefile.am +++ /dev/null @@ -1,90 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Collocation_Oneway_Tests.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = Collocated_Test - -Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -Collocated_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Collocation_Opportunities/.cvsignore b/TAO/tests/Collocation_Opportunities/.cvsignore new file mode 100644 index 00000000000..3189327922a --- /dev/null +++ b/TAO/tests/Collocation_Opportunities/.cvsignore @@ -0,0 +1 @@ +Collocation_Opportunities diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc index 244a8cc2c48..6abbe5ef004 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(Collocation Opportunities): taoserver, avoids_corba_e_micro { +project(Collocation Opportunities): taoserver { exename = Collocation_Opportunities } diff --git a/TAO/tests/Collocation_Opportunities/Makefile.am b/TAO/tests/Collocation_Opportunities/Makefile.am deleted file mode 100644 index ad55d8464c2..00000000000 --- a/TAO/tests/Collocation_Opportunities/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Collocation_Opportunities.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Collocation_Opportunities - -Collocation_Opportunities_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocation_Opportunities_SOURCES = \ - Collocation_Opportunities.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Collocation_Opportunities_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Collocation_Tests/.cvsignore b/TAO/tests/Collocation_Tests/.cvsignore new file mode 100644 index 00000000000..307259b4b57 --- /dev/null +++ b/TAO/tests/Collocation_Tests/.cvsignore @@ -0,0 +1 @@ +Collocated_Test diff --git a/TAO/tests/Collocation_Tests/Makefile.am b/TAO/tests/Collocation_Tests/Makefile.am deleted file mode 100644 index 71500818c25..00000000000 --- a/TAO/tests/Collocation_Tests/Makefile.am +++ /dev/null @@ -1,84 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Collocation_Tests.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = Collocated_Test - -Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -Collocated_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Compression/Compression_Test.mpc b/TAO/tests/Compression/Compression_Test.mpc deleted file mode 100644 index ce461817d7c..00000000000 --- a/TAO/tests/Compression/Compression_Test.mpc +++ /dev/null @@ -1,9 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(*Server): taoserver, compression, zlibcompressor { - Source_Files { - server.cpp - } -} - diff --git a/TAO/tests/Compression/Makefile.am b/TAO/tests/Compression/Makefile.am deleted file mode 100644 index fe3b9c6381f..00000000000 --- a/TAO/tests/Compression/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Compression_Test_Server.am - -if BUILD_EXCEPTIONS -if BUILD_ZLIB - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_ZLIB_CPPFLAGS) - -server_SOURCES = \ - server.cpp - -server_LDFLAGS = \ - $(ACE_ZLIB_LDFLAGS) - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_ZlibCompressor.la \ - $(TAO_BUILDDIR)/tao/libTAO_Compression.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_ZLIB_LIBS) - -endif BUILD_ZLIB -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Compression/run_test.pl b/TAO/tests/Compression/run_test.pl deleted file mode 100755 index 13b74229e7b..00000000000 --- a/TAO/tests/Compression/run_test.pl +++ /dev/null @@ -1,29 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; - -$status = 0; - -print STDOUT "Collocation\n\n"; - -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server"); -} -else { - $SV = new PerlACE::Process ("server"); -} - -$server = $SV->SpawnWaitKill (60); - -if ($server != 0) { - print STDERR "ERROR: Collocation returned $server \n"; - $status = 1; -} - -exit $status; diff --git a/TAO/tests/Compression/server.cpp b/TAO/tests/Compression/server.cpp deleted file mode 100644 index ee820eeca2d..00000000000 --- a/TAO/tests/Compression/server.cpp +++ /dev/null @@ -1,111 +0,0 @@ -// $Id$ - -#include "ace/Get_Opt.h" -#include "ace/OS_NS_stdio.h" -#include "tao/ORB.h" -#include "tao/Compression/Compression.h" -#include "tao/Compression/zlib/ZlibCompressor_Factory.h" - -ACE_RCSID (Hello, - server, - "$Id$") - -bool -test_invalid_compression_factory (Compression::CompressionManager_ptr cm) -{ - bool succeed = false; - ACE_TRY_NEW_ENV - { - // Get an invalid compression factory - Compression::CompressorFactory_var factory = - cm->get_factory (100); - ACE_TRY_CHECK; - } - ACE_CATCH (Compression::UnknownCompressorId, ex) - { - ACE_UNUSED_ARG (ex); - succeed = true; - } - ACE_CATCHANY - { - } - ACE_ENDTRY; - - if (!succeed) - { - ACE_ERROR ((LM_ERROR, - "(%t) ERROR, get invalid compression factory failed\n")); - } - - return succeed; -} - - -int -main (int argc, char *argv[]) -{ - int retval = 0; - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var compression_manager = - orb->resolve_initial_references("CompressionManager"); - - Compression::CompressionManager_var manager = - Compression::CompressionManager::_narrow (compression_manager.in ()); - - if (CORBA::is_nil(manager.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Panic: nil compression manager\n"), - 1); - - manager->register_factory(new TAO::Zlib_CompressorFactory ()); - - CORBA::ULong const nelements = 1024; - CORBA::OctetSeq mytest; - mytest.length (1024); - for (CORBA::ULong j = 0; j != nelements; ++j) - { - mytest[j] = 'a'; - } - - Compression::Compressor_var compressor = manager->get_compressor (4, 6); - - CORBA::OctetSeq myout; - myout.length (1300); - - compressor->compress (mytest, myout); - - CORBA::OctetSeq decompress; - decompress.length (1024); - - compressor->decompress (myout, decompress); - - if (decompress != mytest) - { - ACE_ERROR ((LM_ERROR, "Error, decompress not working\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Compression worked, original size %d, compressed size %d\n", mytest.length(), myout.length ())); - } - - if (!test_invalid_compression_factory (manager.in ())) - retval = 1; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); - retval = 1; - } - ACE_ENDTRY; - - return retval; -} diff --git a/TAO/tests/Connect_Strategy_Test/.cvsignore b/TAO/tests/Connect_Strategy_Test/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Connect_Strategy_Test/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc index 9e3a806413a..e64ad8d08a8 100644 --- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc +++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc @@ -1,37 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { Hello.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/Connect_Strategy_Test/Makefile.am b/TAO/tests/Connect_Strategy_Test/Makefile.am deleted file mode 100644 index 9d787d5980b..00000000000 --- a/TAO/tests/Connect_Strategy_Test/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Connect_Strategy_Test_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Connect_Strategy_Test_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Connect_Strategy_Test_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Connection_Failure/.cvsignore b/TAO/tests/Connection_Failure/.cvsignore new file mode 100644 index 00000000000..b051c6c57fa --- /dev/null +++ b/TAO/tests/Connection_Failure/.cvsignore @@ -0,0 +1 @@ +client diff --git a/TAO/tests/Connection_Failure/Makefile.am b/TAO/tests/Connection_Failure/Makefile.am deleted file mode 100644 index 6892e3edcb7..00000000000 --- a/TAO/tests/Connection_Failure/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Connection_Failure_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Connection_Purging/.cvsignore b/TAO/tests/Connection_Purging/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Connection_Purging/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc index c0bd6da0fde..321e97dff47 100644 --- a/TAO/tests/Connection_Purging/Connection_Purging.mpc +++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): strategies, taoserver { - after += *idl Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): strategies, taoclient { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Connection_Purging/Makefile.am b/TAO/tests/Connection_Purging/Makefile.am deleted file mode 100644 index da869a9f816..00000000000 --- a/TAO/tests/Connection_Purging/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Connection_Purging_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Connection_Purging_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Connection_Purging_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Connection_Timeout/.cvsignore b/TAO/tests/Connection_Timeout/.cvsignore new file mode 100644 index 00000000000..b051c6c57fa --- /dev/null +++ b/TAO/tests/Connection_Timeout/.cvsignore @@ -0,0 +1 @@ +client diff --git a/TAO/tests/Connection_Timeout/Makefile.am b/TAO/tests/Connection_Timeout/Makefile.am deleted file mode 100644 index 0f3128c9bfd..00000000000 --- a/TAO/tests/Connection_Timeout/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Connection_Timeout_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Crash_On_Write/.cvsignore b/TAO/tests/Crash_On_Write/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Crash_On_Write/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc index ce52c6776dc..2398d1eac4c 100644 --- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc +++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc @@ -1,37 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl + idlflags += -Sa -St Source_Files { Oneway_Receiver.cpp Crash_Task.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Crash_On_Write/Makefile.am b/TAO/tests/Crash_On_Write/Makefile.am deleted file mode 100644 index f62ca91d3a7..00000000000 --- a/TAO/tests/Crash_On_Write/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Crash_On_Write_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Crash_On_Write_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Crash_Task.cpp \ - Oneway_Receiver.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Crash_Task.h \ - Oneway_Receiver.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Crash_On_Write_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Crash_Task.h \ - Oneway_Receiver.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Crashed_Callback/.cvsignore b/TAO/tests/Crashed_Callback/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Crashed_Callback/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc index fb46b04e3df..34711dbef67 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc @@ -1,39 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging { - after += *idl Source_Files { Service.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient, portableserver, messaging { - after += *idl after += *Server Source_Files { Crashed_Callback.cpp client.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Crashed_Callback/Makefile.am b/TAO/tests/Crashed_Callback/Makefile.am deleted file mode 100644 index 46a2479da67..00000000000 --- a/TAO/tests/Crashed_Callback/Makefile.am +++ /dev/null @@ -1,121 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Crashed_Callback_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Crashed_Callback_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Service.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Service.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Crashed_Callback_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Crashed_Callback.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Crashed_Callback.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/DII_Collocation_Tests/Makefile.am b/TAO/tests/DII_Collocation_Tests/Makefile.am deleted file mode 100644 index 2ceb2638651..00000000000 --- a/TAO/tests/DII_Collocation_Tests/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - oneway \ - twoway - diff --git a/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc b/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc index 18ac4d8cc04..afa9884eed8 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc +++ b/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(*oneway) : taoserver, dynamicinterface, avoids_minimum_corba{ +project(*oneway) : taoserver, dynamicinterface, minimum_corba{ exename = Collocated_Test } diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Makefile.am b/TAO/tests/DII_Collocation_Tests/oneway/Makefile.am deleted file mode 100644 index 06743355dad..00000000000 --- a/TAO/tests/DII_Collocation_Tests/oneway/Makefile.am +++ /dev/null @@ -1,91 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.DII_Collocation_Tests_Oneway.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = Collocated_Test - -Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -Collocated_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc b/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc index 931635159a9..c77ecfa435b 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc +++ b/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(*twoway) : taoserver, dynamicinterface, avoids_minimum_corba{ +project(*twoway) : taoserver, dynamicinterface, minimum_corba{ exename = Collocated_Test } diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Makefile.am b/TAO/tests/DII_Collocation_Tests/twoway/Makefile.am deleted file mode 100644 index 01b381486b4..00000000000 --- a/TAO/tests/DII_Collocation_Tests/twoway/Makefile.am +++ /dev/null @@ -1,91 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.DII_Collocation_Tests_Twoway.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = Collocated_Test - -Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -Collocated_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/DLL_ORB/.cvsignore b/TAO/tests/DLL_ORB/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/DLL_ORB/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/DLL_ORB/Makefile.am b/TAO/tests/DLL_ORB/Makefile.am deleted file mode 100644 index d45e111db2b..00000000000 --- a/TAO/tests/DLL_ORB/Makefile.am +++ /dev/null @@ -1,184 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_LTLIBRARIES = -noinst_PROGRAMS = -noinst_HEADERS = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.DLL_ORB_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - Test_Client_Module.h \ - Test_Client_Module_Export.h \ - Test_Server_Module.h \ - Test_Server_Module_Export.h \ - Test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.DLL_ORB_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - Test_Client_Module.h \ - Test_Client_Module_Export.h \ - Test_Server_Module.h \ - Test_Server_Module_Export.h \ - Test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.DLL_ORB_Test_Client_Module.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_LTLIBRARIES += libTest_Client_Module.la - -libTest_Client_Module_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DTEST_CLIENT_MODULE_BUILD_DLL - -libTest_Client_Module_la_SOURCES = \ - TestC.cpp \ - Test_Client_Module.cpp - -noinst_HEADERS += \ - Test.idl \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ - Test_Client_Module.h - -endif BUILD_EXCEPTIONS - -## Makefile.DLL_ORB_Test_Server_Module.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_LTLIBRARIES += libTest_Server_Module.la - -libTest_Server_Module_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DTEST_SERVER_MODULE_BUILD_DLL - -libTest_Server_Module_la_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - Test_Server_Module.cpp \ - Test_i.cpp - -noinst_HEADERS += \ - Test.idl \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ - Test_Server_Module.h \ - Test_i.h - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/DLL_ORB/run_test.pl b/TAO/tests/DLL_ORB/run_test.pl index 6509c641b43..e3b6539985a 100755 --- a/TAO/tests/DLL_ORB/run_test.pl +++ b/TAO/tests/DLL_ORB/run_test.pl @@ -6,7 +6,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # # $Id$ -use lib "$ENV{ACE_ROOT}/bin"; +use lib '../../../bin'; use PerlACE::Run_Test; $status = 0; diff --git a/TAO/tests/DSI_Gateway/.cvsignore b/TAO/tests/DSI_Gateway/.cvsignore new file mode 100644 index 00000000000..173dd5296f5 --- /dev/null +++ b/TAO/tests/DSI_Gateway/.cvsignore @@ -0,0 +1,3 @@ +client +gateway +server diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc index 7703b170041..c5deacad25b 100644 --- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc +++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc @@ -1,51 +1,25 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): taoserver, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface { - after += *idl +project(*Server): taoserver, messaging, minimum_corba, dynamicinterface { Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface { - after += *idl +project(*Client): taoclient, messaging, minimum_corba, dynamicinterface { after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } -project(*Gateway): taoexe, portableserver, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface { - after += *idl +project(*Gateway): taoexe, portableserver, messaging, minimum_corba, dynamicinterface { after += *Client Source_Files { test_dsi.cpp gateway.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/DSI_Gateway/Makefile.am b/TAO/tests/DSI_Gateway/Makefile.am deleted file mode 100644 index a1bdefdaada..00000000000 --- a/TAO/tests/DSI_Gateway/Makefile.am +++ /dev/null @@ -1,160 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.DSI_Gateway_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.DSI_Gateway_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.DSI_Gateway_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_dsi.h \ - test_dsi.inl \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.DSI_Gateway_Gateway.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += gateway - -gateway_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -gateway_SOURCES = \ - gateway.cpp \ - testC.cpp \ - testS.cpp \ - test_dsi.cpp \ - test_dsi.h \ - test_dsi.inl - -gateway_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp index 8d1d133fb22..4919809f944 100644 --- a/TAO/tests/DSI_Gateway/client.cpp +++ b/TAO/tests/DSI_Gateway/client.cpp @@ -107,30 +107,12 @@ main (int argc, char *argv[]) { for (int i = 0; i != niterations; ++i) { - CORBA::Long const tv = i + 100; - server->test_val(tv); - CORBA::Long const rtv = server->test_val (); + the_in_structure.i = i; + CORBA::String_var name = CORBA::string_dup ("the name"); - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - "DSI_Simpler_Server ==== Expected result = %d for %d\n", - rtv, tv)); - } - - if (rtv != tv) - { - ACE_ERROR ((LM_ERROR, - "(%P|%t) ERROR: unexpected result = %d for %d\n", - rtv, tv)); - } - - the_in_structure.i = i; - CORBA::String_var name = CORBA::string_dup ("the name"); + Structure_var the_out_structure; - Structure_var the_out_structure; - - CORBA::Long const r = + CORBA::Long r = server->test_method (i, the_in_structure, the_out_structure.out (), @@ -154,8 +136,8 @@ main (int argc, char *argv[]) if (r != i) { - ACE_ERROR ((LM_ERROR, - "(%P|%t) ERROR: unexpected result = %d for %d", + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) unexpected result = %d for %d", r, i)); } } diff --git a/TAO/tests/DSI_Gateway/test.idl b/TAO/tests/DSI_Gateway/test.idl index 29cdc6f4d15..d35c073b70d 100644 --- a/TAO/tests/DSI_Gateway/test.idl +++ b/TAO/tests/DSI_Gateway/test.idl @@ -19,8 +19,6 @@ exception test_exception interface Simple_Server { - attribute long test_val; - long test_method (in long x, in Structure the_in_structure, out Structure the_out_structure, diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp index 759578e6f6a..68759674acf 100644 --- a/TAO/tests/DSI_Gateway/test_i.cpp +++ b/TAO/tests/DSI_Gateway/test_i.cpp @@ -61,24 +61,3 @@ Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } - -CORBA::Long -Simple_Server_i::test_val (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return vlong_; -} - -void -Simple_Server_i::test_val (CORBA::Long tv ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - "Simpler_Server_i ====test_val: %d\n", tv - )); - } - vlong_ = tv; -} - diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h index 776a385b9e1..499ee8f0dc4 100644 --- a/TAO/tests/DSI_Gateway/test_i.h +++ b/TAO/tests/DSI_Gateway/test_i.h @@ -38,12 +38,6 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long test_val (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC (( CORBA::SystemException)); - - void test_val (CORBA::Long test_val ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - void raise_user_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, test_exception)); @@ -55,9 +49,8 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); private: - // The ORB CORBA::ORB_var orb_; - CORBA::Long vlong_; + // The ORB }; #if defined(__ACE_INLINE__) diff --git a/TAO/tests/DSI_Gateway/test_i.inl b/TAO/tests/DSI_Gateway/test_i.inl index bd51e3a42bd..97524552ff4 100644 --- a/TAO/tests/DSI_Gateway/test_i.inl +++ b/TAO/tests/DSI_Gateway/test_i.inl @@ -2,7 +2,6 @@ ACE_INLINE Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)), - vlong_ (0) + : orb_ (CORBA::ORB::_duplicate (orb)) { } diff --git a/TAO/tests/DynAny_Test/.cvsignore b/TAO/tests/DynAny_Test/.cvsignore new file mode 100644 index 00000000000..bc7530a9314 --- /dev/null +++ b/TAO/tests/DynAny_Test/.cvsignore @@ -0,0 +1 @@ +basic_test diff --git a/TAO/tests/DynAny_Test/Makefile.am b/TAO/tests/DynAny_Test/Makefile.am deleted file mode 100644 index fe7a27f390d..00000000000 --- a/TAO/tests/DynAny_Test/Makefile.am +++ /dev/null @@ -1,99 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.DynAny_Test_Basic.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - da_testsC.cpp \ - da_testsC.h \ - da_testsC.inl \ - da_testsS.cpp \ - da_testsS.h \ - da_testsS.inl - -CLEANFILES = \ - da_tests-stamp \ - da_testsC.cpp \ - da_testsC.h \ - da_testsC.inl \ - da_testsS.cpp \ - da_testsS.h \ - da_testsS.inl - -da_testsC.cpp da_testsC.h da_testsC.inl da_testsS.cpp da_testsS.h da_testsS.inl: da_tests-stamp - -da_tests-stamp: $(srcdir)/da_tests.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/da_tests.idl - @touch $@ - -noinst_PROGRAMS = basic_test - -basic_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -basic_test_SOURCES = \ - analyzer.cpp \ - da_testsC.cpp \ - da_testsS.cpp \ - data.cpp \ - driver.cpp \ - test_dynany.cpp \ - test_dynarray.cpp \ - test_dynenum.cpp \ - test_dynsequence.cpp \ - test_dynstruct.cpp \ - test_dynunion.cpp \ - test_wrapper.cpp \ - analyzer.h \ - da_testsC.h \ - da_testsC.inl \ - da_testsS.h \ - da_testsS.inl \ - data.h \ - driver.h \ - test_dynany.h \ - test_dynarray.h \ - test_dynenum.h \ - test_dynsequence.h \ - test_dynstruct.h \ - test_dynunion.h \ - test_wrapper.h - -basic_test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/DynAny_Test/analyzer.cpp b/TAO/tests/DynAny_Test/analyzer.cpp index 55bad99ed41..08c1c9e4fd3 100644 --- a/TAO/tests/DynAny_Test/analyzer.cpp +++ b/TAO/tests/DynAny_Test/analyzer.cpp @@ -15,45 +15,18 @@ #include "analyzer.h" -#include "tao/DynamicAny/DynCommon.h" -#include "tao/DynamicAny/DynAnyFactory.h" - #define CASEE(type,CT,str) case CORBA::tk_##type: {\ CORBA::CT b = da->get_##type() ; \ - tab (level_); \ + tab(level_);\ if (debug_) \ ACE_DEBUG ((LM_DEBUG, str , b)); \ } break; -#define CASEBS(type,CT,str) case CORBA::tk_##type: \ - {\ - CORBA::CT##Seq_var seq = da->get_##type##_seq (); \ - ++level_; \ - CORBA::ULong len = seq->length (); \ - tab (level_); \ - if (debug_) \ - { \ - ACE_DEBUG ((LM_DEBUG, "length = %u\n", len)); \ - } \ - for (CORBA::ULong i = 0; i < len; ++i) \ - { \ - CORBA::CT b = seq[i]; \ - tab (level_); \ - if (debug_) \ - { \ - ACE_DEBUG ((LM_DEBUG, "[%d]\n", i)); \ - ACE_DEBUG ((LM_DEBUG, str, b)); \ - } \ - } \ - --level_; \ - } \ - break; - DynAnyAnalyzer::DynAnyAnalyzer (CORBA::ORB_ptr orb, DynamicAny::DynAnyFactory_ptr dynany_factory, int debug) - : orb_ (CORBA::ORB::_duplicate (orb)), - dynany_factory_ (DynamicAny::DynAnyFactory::_duplicate (dynany_factory)), + : orb_ (CORBA::ORB::_duplicate(orb)), + dynany_factory_ (DynamicAny::DynAnyFactory::_duplicate(dynany_factory)), level_ (0), debug_ (debug) { @@ -63,38 +36,35 @@ void DynAnyAnalyzer::tab (int t) { if (debug_) { - for (int i = 0 ; i < t ; ++i) - { - ACE_DEBUG ((LM_DEBUG, "\t")); - } + for( int i = 0 ; i < t ; i++ ) + ACE_DEBUG ((LM_DEBUG, + "\t")); } } -DynAnyAnalyzer::~DynAnyAnalyzer (void) +DynAnyAnalyzer::~DynAnyAnalyzer() { } -void DynAnyAnalyzer::resetTab (void) +void DynAnyAnalyzer::resetTab() { level_ = 0; } void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) { - CORBA::TypeCode_var tc = da->type (); + CORBA::TypeCode_var tc = da->type(); CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::TypeCode_var dup = CORBA::TypeCode::_duplicate (tc.in ()); - // strip aliases while (kind == CORBA::tk_alias) { - dup = dup->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); + tc = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - kind = dup->kind (ACE_ENV_SINGLE_ARG_PARAMETER); + kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -103,302 +73,230 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL) case CORBA::tk_struct: { DynamicAny::DynStruct_var ds - = DynamicAny::DynStruct::_narrow (da ACE_ENV_ARG_PARAMETER); + = DynamicAny::DynStruct::_narrow(da ACE_ENV_ARG_PARAMETER); ACE_CHECK; - tab (level_); + tab(level_); if (debug_) - { - ACE_DEBUG ((LM_DEBUG, - "STRUCT\n")); - } + ACE_DEBUG ((LM_DEBUG, + "STRUCT\n")); - if (da->seek (0) ) + if( da->seek(0) ) { level_++; - do { - DynamicAny::DynAny_var cc = - ds->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = ds->current_component(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - DynamicAny::FieldName_var fn = - ds->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::FieldName_var fn = ds->current_member_name(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; tab(level_); if (debug_) - { - ACE_DEBUG ((LM_DEBUG, - "Member = %s\n", fn.in ())); - } + ACE_DEBUG ((LM_DEBUG, + "Member = %s\n", fn.in())); if (!CORBA::is_nil (cc.in ())) { - this->analyze (cc.in () ACE_ENV_ARG_PARAMETER); + this->analyze (cc.in() ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - } while (da->next ()); - + } while( da->next() ); level_--; } } break; // end tk_struct - case CORBA::tk_sequence: - { - if (TAO_DynCommon::is_basic_type_seq (tc.in ())) - { - this->analyze_basic_seq (dup.in (), da); - } - else - { - DynamicAny::DynSequence_var ds = - DynamicAny::DynSequence::_narrow (da ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - int i = 0; - tab(level_); - - if (debug_) - { - ACE_DEBUG ((LM_DEBUG, - "SEQUENCE\n")); - } - - if (ds->seek (0UL)) - { - level_++; - - do - { - tab(level_); - - if (debug_) - ACE_DEBUG ((LM_DEBUG, - "[%d]\n", i)); - - DynamicAny::DynAny_var cc (ds->current_component ()); - ACE_CHECK; - - if (!CORBA::is_nil (cc.in ())) - { - analyze (cc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - - i++; - } while (da->next ()); + case CORBA::tk_sequence: + { + DynamicAny::DynSequence_var ds + = DynamicAny::DynSequence::_narrow(da ACE_ENV_ARG_PARAMETER); + ACE_CHECK; - level_--; - } - } - } - break; // end tk_sequence + int i = 0; - case CORBA::tk_array: - { - tab (level_); + tab(level_); if (debug_) - { - ACE_DEBUG ((LM_DEBUG, - "ARRAY\n")); - } - - level_++; - - CORBA::ULong const len = - dup->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_DEBUG ((LM_DEBUG, + "SEQUENCE\n")); - for (CORBA::ULong i = 0 ; i < len; ++i) + if( ds->seek(0) ) { - tab (level_); - - if (debug_) - { - ACE_DEBUG ((LM_DEBUG, "[%d]\n", i)); - } - - DynamicAny::DynAny_var cc = da->current_component(); - - if (!CORBA::is_nil (cc.in ())) + level_++; + do { - analyze (cc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - - da->next (); - } - level_--; - } - break; - - case CORBA::tk_union: - { - DynamicAny::DynUnion_var value = - DynamicAny::DynUnion::_narrow (da ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + tab(level_); - if (!value->has_no_active_member ()) - { - DynamicAny::DynAny_var disc = value->member (); + if (debug_) + ACE_DEBUG ((LM_DEBUG, + "[%d]\n", i)); - if (!CORBA::is_nil (disc.in ())) - { - this->analyze (disc.in () ACE_ENV_ARG_PARAMETER); + DynamicAny::DynAny_var cc( ds->current_component() ); ACE_CHECK; - } - } - } - break; - - case CORBA::tk_any: - { - DynamicAny::DynAny_var dynany; - CORBA::Any_var any = da->get_any (); - dynany = - dynany_factory_->create_dyn_any (any.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if (!CORBA::is_nil (dynany.in ())) - { - this->analyze (dynany.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - - dynany->destroy (); - } - break; - - case CORBA::tk_enum: - { - DynamicAny::DynEnum_var value = - DynamicAny::DynEnum::_narrow (da ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - CORBA::String_var s = value->get_as_string (); - tab (level_); - - if (debug_) - { - ACE_DEBUG ((LM_DEBUG, " Value (enum) = %s\n", s.in())); - } - } - break; - - CASEE (boolean, Boolean, " Value (bool) = %d\n"); - CASEE (short, Short, " Value (short) = %d\n"); - CASEE (ushort, UShort, " Value (ushort) = %u\n"); - CASEE (long, Long, " Value (long) = %d\n"); - CASEE (ulong, ULong, " Value (ulong) = %u\n"); - CASEE (longlong, LongLong, " Value (longlong) %Ld\n"); - CASEE (ulonglong, ULongLong, " Value (ulonglong) %Lu\n"); - CASEE (char, Char, " Value (char) = %c\n"); - CASEE (float, Float, " Value (float) = %f\n"); - CASEE (double, Double, " Value (double) = %f\n"); - CASEE (octet, Octet, " Value (octet) = %c\n"); - - case CORBA::tk_string: - { - CORBA::String_var b (da->get_string ()); - tab (level_); - - if (debug_) - { - ACE_DEBUG ((LM_DEBUG, " Value (string) = %s\n", b.in ())); - } - } - break; - - case CORBA::tk_TypeCode: - { - tab (level_); - - if (debug_) - { - CORBA::TCKind const kind = - da->get_typecode ()->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - ACE_DEBUG ((LM_DEBUG, - " Value (TypeCode) = %d\n", - static_cast<int> (kind))); - } - } - break; + if (!CORBA::is_nil (cc.in ())) + { + analyze(cc.in() ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } - default: - { - tab (level_); + i++; + } while( da->next() ); + level_--; + } + } + break; // end tk_sequence - if (debug_) - { - CORBA::TCKind const kind = - tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + case CORBA::tk_array: + { + tab(level_); + if (debug_) ACE_DEBUG ((LM_DEBUG, - " unhandled typecode = %d\n", - static_cast<int> (kind))); - } - } - break; - } - - if (debug_) - { - ACE_DEBUG ((LM_DEBUG, "\n")); - } -} - -void -DynAnyAnalyzer::analyze_basic_seq (CORBA::TypeCode_ptr tc, - DynamicAny::DynAny_ptr da) -{ - CORBA::TypeCode_var ct = tc->content_type (); - CORBA::TCKind tk = ct->kind (); + "ARRAY\n")); - tab (level_); + level_++; - if (debug_) - { - ACE_DEBUG ((LM_DEBUG, - "BASIC TYPE SEQUENCE\n")); - } + CORBA::ULong const len = + tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; - switch (tk) - { - CASEBS (boolean, Boolean, " Value (bool) = %d\n"); - CASEBS (octet, Octet, " Value (octet) = %c\n"); - CASEBS (char, Char, " Value (char) = %c\n"); - CASEBS (wchar, WChar, " Value (wchar) = %u\n"); - CASEBS (short, Short, " Value (short) = %d\n"); - CASEBS (ushort, UShort, " Value (ushort) = %u\n"); - CASEBS (long, Long, " Value (long) = %d\n"); - CASEBS (ulong, ULong, " Value (ulong) = %u\n"); - CASEBS (longlong, LongLong, " Value (longlong) = %Ld\n"); - CASEBS (ulonglong, ULongLong, " Value (ulonglong) = %Lu\n"); - CASEBS (float, Float, " Value (float) = %f\n"); - CASEBS (double, Double, " Value (double) = %f\n"); - case CORBA::tk_longdouble: - default: - tab (level_); + for( unsigned int i = 0 ; i < len; ++i) + { + tab(level_); - if (debug_) - { + if (debug_) + ACE_DEBUG ((LM_DEBUG, + "[%d]\n", i)); + + DynamicAny::DynAny_var cc = da->current_component(); + + if (!CORBA::is_nil (cc.in ())) + { + analyze(cc.in() ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + + da->next(); + } + level_--; + } + break; + + case CORBA::tk_union: + { + DynamicAny::DynUnion_var value + = DynamicAny::DynUnion::_narrow(da ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + + if( !value->has_no_active_member() ) + { + DynamicAny::DynAny_var disc = value->member(); + + if (!CORBA::is_nil (disc.in ())) + { + this->analyze(disc.in() ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + } + } + break; + + case CORBA::tk_any: + { + DynamicAny::DynAny_var dynany; + CORBA::Any_var any = da->get_any(); + + dynany = dynany_factory_->create_dyn_any(any.in() ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + + if (!CORBA::is_nil (dynany.in ())) + { + this->analyze(dynany.in() ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + + dynany->destroy(); + } + break; + + case CORBA::tk_enum: + { + DynamicAny::DynEnum_var value + = DynamicAny::DynEnum::_narrow(da ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + + CORBA::String_var s = value->get_as_string(); + tab(level_); + + if (debug_) ACE_DEBUG ((LM_DEBUG, - " unhandled typecode = %d\n", - static_cast<int> (tk))); - } - - break; - } + " Value (enum) = %s\n", s.in())); + } + break; + + CASEE(boolean,Boolean," Value (bool) = %d\n"); + CASEE(short,Short," Value (short) = %d\n"); + CASEE(ushort,UShort," Value (ushort) = %u\n"); + CASEE(long,Long," Value (long) = %d\n"); + CASEE(ulong,ULong," Value (ulong) = %u\n"); + CASEE(longlong,LongLong," Value (longlong) %Ld\n"); + CASEE(ulonglong,ULongLong," Value (ulonglong) %Lu\n"); + CASEE(char,Char," Value (char) = %c\n"); + CASEE(float,Float," Value (float) = %f\n"); + CASEE(double,Double," Value (double) = %f\n"); + CASEE(octet,Octet," Value (octet) = %c\n"); + + case CORBA::tk_string: + { + CORBA::String_var b( da->get_string() ); + + tab(level_); + if (debug_) + ACE_DEBUG ((LM_DEBUG, + " Value (string) = %s\n", b.in())); + } + break; + + case CORBA::tk_TypeCode: + { + tab(level_); + if (debug_) + { + CORBA::TCKind const kind = + da->get_typecode ()->kind (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + + ACE_DEBUG ((LM_DEBUG, + " Value (TypeCode) = %d\n", + static_cast<int> (kind))); + } + } + break; + + default: + { + tab(level_); + if (debug_) + { + CORBA::TCKind const kind = + tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + + ACE_DEBUG ((LM_DEBUG, + " unhandled typecode = %d\n", + static_cast<int> (kind))); + } + } + break; + } + + if (debug_) + ACE_DEBUG ((LM_DEBUG, + "\n")); } diff --git a/TAO/tests/DynAny_Test/analyzer.h b/TAO/tests/DynAny_Test/analyzer.h index 776c24ee9e6..da1d08b1476 100644 --- a/TAO/tests/DynAny_Test/analyzer.h +++ b/TAO/tests/DynAny_Test/analyzer.h @@ -23,18 +23,15 @@ class DynAnyAnalyzer { public: - DynAnyAnalyzer (CORBA::ORB_ptr orb, DynamicAny::DynAnyFactory_ptr dynany_factory, int debug); + DynAnyAnalyzer(CORBA::ORB_ptr orb, DynamicAny::DynAnyFactory_ptr dynany_factory, int debug); - void tab (int t); + void tab(int t); - ~DynAnyAnalyzer (void); + ~DynAnyAnalyzer(); - void resetTab (void); + void resetTab(); - void analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL); - - void analyze_basic_seq (CORBA::TypeCode_ptr tc, - DynamicAny::DynAny_ptr da); + void analyze(DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/DynAny_Test/da_tests.idl b/TAO/tests/DynAny_Test/da_tests.idl index cc271b5778b..4d0e5d4747f 100644 --- a/TAO/tests/DynAny_Test/da_tests.idl +++ b/TAO/tests/DynAny_Test/da_tests.idl @@ -15,7 +15,7 @@ module DynAnyTests struct test_struct { char c; - CORBA::ShortSeq ss; + long l; enclosed_struct es; }; diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp index 55422d128f6..f58e6d39d77 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -40,11 +40,6 @@ Data::Data (CORBA::ORB_var orb) ACE_TRY { - m_shortseq1.length (3UL); - m_shortseq1[0UL] = 0; - m_shortseq1[1UL] = 1; - m_shortseq1[2UL] = 2; - labels[0] = "type boolean"; labels[1] = "type octet"; labels[2] = "type char"; @@ -61,8 +56,6 @@ Data::Data (CORBA::ORB_var orb) labels[13] = "type wchar"; labels[14] = "type any"; labels[15] = "type objref"; - labels[16] = "type short sequence"; - // Getting the RootPOA so we can generate object references. CORBA::Object_var obj = diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h index 07f58b19794..4cd12f257e3 100644 --- a/TAO/tests/DynAny_Test/data.h +++ b/TAO/tests/DynAny_Test/data.h @@ -15,7 +15,6 @@ #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/ORB.h" #include "tao/Object.h" -#include "tao/ShortSeqC.h" class Data { @@ -38,10 +37,8 @@ public: CORBA::TypeCode_ptr m_typecode1, m_typecode2; CORBA::WChar m_wchar1, m_wchar2; CORBA::Object_var m_objref1, m_objref2; - CORBA::ShortSeq m_shortseq1; - CORBA::ShortSeq_var m_shortseq2; -const char* labels[17]; +const char* labels[16]; private: CORBA::ORB_var orb_; diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp index b235f0d1872..5eae425f78a 100644 --- a/TAO/tests/DynAny_Test/driver.cpp +++ b/TAO/tests/DynAny_Test/driver.cpp @@ -100,38 +100,31 @@ Driver::parse_args (int argc, char* argv[]) { if (argc == 1) ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s\n" - " -t [dynany|dynarray|dynenum|dynsequence|dynstruct|dynunion]\n" - " -d\n", + "usage: %s" + " -t [dynany|dynarray|dynenum|dynsequence|dynstruct|dynunion]" + "\n", argv [0]), -1); ACE_Get_Opt get_opts (argc, argv, "t:d"); int c; - const char *test_str = 0; while ((c = get_opts ()) != -1) switch (c) { case 't': - test_str = get_opts.opt_arg (); - - if (!ACE_OS::strcmp (test_str, "dynany")) + if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynany")) this->test_type_ = TEST_DYNANY; - else if (!ACE_OS::strcmp (test_str, "dynarray")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynarray")) this->test_type_ = TEST_DYNARRAY; - else if (!ACE_OS::strcmp (test_str, "dynenum")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynenum")) this->test_type_ = TEST_DYNENUM; - else if (!ACE_OS::strcmp (test_str, "dynsequence")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynsequence")) this->test_type_ = TEST_DYNSEQUENCE; - else if (!ACE_OS::strcmp (test_str, "dynstruct")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynstruct")) this->test_type_ = TEST_DYNSTRUCT; - else if (!ACE_OS::strcmp (test_str, "dynunion")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynunion")) this->test_type_ = TEST_DYNUNION; - else - ACE_DEBUG ((LM_DEBUG, - "I don't recognize test type %s\n", - test_str)); break; case 'd': diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp index 35d7e1d1677..43796025447 100644 --- a/TAO/tests/DynAny_Test/test_dynany.cpp +++ b/TAO/tests/DynAny_Test/test_dynany.cpp @@ -11,7 +11,6 @@ //============================================================================= #include "tao/AnyTypeCode/AnyTypeCode_methods.h" -#include "tao/AnyTypeCode/ShortSeqA.h" #include "tao/DynamicAny/DynamicAny.h" #include "test_dynany.h" @@ -69,9 +68,7 @@ Test_DynAny::run_test (void) -1); } - DynAnyAnalyzer analyzer (this->orb_.in (), - dynany_factory.in (), - debug_); + DynAnyAnalyzer analyzer(this->orb_.in(), dynany_factory.in(), debug_); CORBA::Any in1; in1 <<= data.m_double2; @@ -83,8 +80,7 @@ Test_DynAny::run_test (void) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Double d_out = - fa1->get_double (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Double d_out = fa1->get_double (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (d_out == data.m_double1) @@ -110,7 +106,7 @@ Test_DynAny::run_test (void) ftc1->from_any (in_any1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - analyzer.analyze (ftc1.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze(ftc1.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -147,8 +143,7 @@ Test_DynAny::run_test (void) fa2->insert_typecode (data.m_typecode1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TypeCode_var tc_out = - fa2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc_out = fa2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (tc_out->equal (data.m_typecode1 @@ -176,7 +171,7 @@ Test_DynAny::run_test (void) ftc2->from_any (in_any2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - analyzer.analyze (ftc2.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze(ftc2.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any_var out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -203,107 +198,6 @@ Test_DynAny::run_test (void) ACE_TRY_CHECK; ftc2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, - "\t*=*=*=*= %s =*=*=*=*\n", - data.labels[16])); - - ACE_DEBUG ((LM_DEBUG, - "testing: constructor(Any)/insert/get\n")); - - CORBA::Any in3; - CORBA::ShortSeq ss; - ss.length (0UL); - in3 <<= ss; - DynamicAny::DynAny_var fa3 = - dynany_factory->create_dyn_any (in3 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - fa3->insert_short_seq (data.m_shortseq1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - data.m_shortseq2 = - fa3->get_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - bool good = - data.m_shortseq2->length () == data.m_shortseq1.length (); - - if (good) - { - for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i) - { - if (data.m_shortseq2[i] != data.m_shortseq1[i]) - { - good = false; - break; - } - } - } - - if (good) - { - ACE_DEBUG ((LM_DEBUG, - "++ OK ++\n")); - } - else - { - ++this->error_count_; - } - - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, - "testing: constructor(TypeCode)/from_any/to_any\n")); - - DynamicAny::DynAny_var ftc3 = - dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_ShortSeq - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::Any in_any3; - in_any3 <<= data.m_shortseq1; - ftc3->from_any (in_any3 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - analyzer.analyze (ftc3.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::Any_var out_any3 = ftc3->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::ShortSeq *outseq = 0; - out_any3.in () >>= outseq; - - good = - outseq->length () == data.m_shortseq1.length (); - - if (good) - { - for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i) - { - if ((*outseq)[i] != data.m_shortseq1[i]) - { - good = false; - break; - } - } - } - - if (good) - { - ACE_DEBUG ((LM_DEBUG, - "++ OK ++\n")); - } - else - { - ++this->error_count_; - } - - ACE_TRY_CHECK; - - fa3->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - ftc3->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp index 26f792b417c..805a78e61f1 100644 --- a/TAO/tests/DynAny_Test/test_dynarray.cpp +++ b/TAO/tests/DynAny_Test/test_dynarray.cpp @@ -71,9 +71,7 @@ Test_DynArray::run_test (void) -1); } - DynAnyAnalyzer analyzer (this->orb_.in (), - dynany_factory.in (), - debug_); + DynAnyAnalyzer analyzer(this->orb_.in(), dynany_factory.in(), debug_); CORBA::Any in_any1; in_any1 <<= DynAnyTests::test_array_forany (ta); @@ -81,26 +79,21 @@ Test_DynArray::run_test (void) dynany_factory->create_dyn_any (in_any1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - - DynamicAny::DynArray_var fa1 = - DynamicAny::DynArray::_narrow (dp1.in () - ACE_ENV_ARG_PARAMETER); + DynamicAny::DynArray_var fa1 = DynamicAny::DynArray::_narrow (dp1.in () + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - - fa1->seek (1 ACE_ENV_ARG_PARAMETER); + fa1->seek (1 + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fa1->insert_long (data.m_long1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Long l_out1 = data.m_long2; - fa1->seek (1 ACE_ENV_ARG_PARAMETER); + fa1->seek (1 + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - l_out1 = fa1->get_long (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -143,11 +136,10 @@ Test_DynArray::run_test (void) ACE_TRY_CHECK; - analyzer.analyze (ftc1.in () ACE_ENV_ARG_PARAMETER); + analyzer.analyze(ftc1.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var out_any1 = - ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; DynAnyTests::test_array_forany ta_out; @@ -175,9 +167,7 @@ Test_DynArray::run_test (void) ftc1->set_elements (as_in ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - - DynamicAny::AnySeq_var as_out = - ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any out_any2 = as_out[1U]; CORBA::Long l_out2; @@ -195,7 +185,6 @@ Test_DynArray::run_test (void) fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp index 229e1460c24..ddef182f80c 100644 --- a/TAO/tests/DynAny_Test/test_dynenum.cpp +++ b/TAO/tests/DynAny_Test/test_dynenum.cpp @@ -63,9 +63,7 @@ Test_DynEnum::run_test (void) -1); } - DynAnyAnalyzer analyzer (this->orb_.in(), - dynany_factory.in (), - debug_); + DynAnyAnalyzer analyzer(this->orb_.in(), dynany_factory.in(), debug_); DynAnyTests::test_enum te = DynAnyTests::TE_ZEROTH; CORBA::Any in_any1; @@ -74,7 +72,6 @@ Test_DynEnum::run_test (void) dynany_factory->create_dyn_any (in_any1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::DynEnum_var de1 = DynamicAny::DynEnum::_narrow (dp1.in () ACE_ENV_ARG_PARAMETER); @@ -87,15 +84,13 @@ Test_DynEnum::run_test (void) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ULong ul_out1 = - de1->get_as_ulong (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong ul_out1 = de1->get_as_ulong (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; analyzer.analyze(de1.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var out_any2 = - de1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var out_any2 = de1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ul_out1 == 1) @@ -115,8 +110,7 @@ Test_DynEnum::run_test (void) de1->set_as_ulong (3 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::String_var s = - de1->get_as_string (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var s = de1->get_as_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (s.in (), "TE_THIRD") == 0) @@ -159,10 +153,8 @@ Test_DynEnum::run_test (void) analyzer.analyze(de2.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var out_any1 = - de2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var out_any1 = de2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - out_any1.in () >>= te; if (te == DynAnyTests::TE_THIRD) @@ -195,7 +187,6 @@ Test_DynEnum::run_test (void) de1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - de2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index f9b79d7b952..ce68f01c925 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -105,25 +105,21 @@ Test_DynSequence::run_test (void) dynany_factory->create_dyn_any (in_any1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::DynSequence_var fa1 = DynamicAny::DynSequence::_narrow (dp1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - - fa1->seek (1 ACE_ENV_ARG_PARAMETER); + fa1->seek (1 + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fa1->insert_string (data.m_string1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - - fa1->seek (1 ACE_ENV_ARG_PARAMETER); + fa1->seek (1 + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::String_var out_str1 = fa1->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -183,7 +179,7 @@ Test_DynSequence::run_test (void) return -1; } - analyzer.analyze (fa1.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze(fa1.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var out_str; @@ -244,13 +240,11 @@ Test_DynSequence::run_test (void) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - analyzer.analyze (ftc1.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze(ftc1.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var out_any1 = - ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - DynAnyTests::test_seq *ts_out; out_any1.in () >>= ts_out; @@ -289,11 +283,8 @@ Test_DynSequence::run_test (void) ftc1->set_elements (as_in ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - - DynamicAny::AnySeq_var as_out = - ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ULong index = 2; CORBA::Any out_any2 = as_out[index]; char* out_str2; @@ -312,7 +303,6 @@ Test_DynSequence::run_test (void) fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp index 1281471c19e..c5d5d9780e8 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.cpp +++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp @@ -46,7 +46,7 @@ Test_DynStruct::run_test (void) DynAnyTests::test_struct ts; ts.c = data.m_char2; - ts.ss.length (0UL); + ts.l = data.m_long2; ts.es.f = data.m_float2; ts.es.s = data.m_short2; @@ -73,9 +73,7 @@ Test_DynStruct::run_test (void) -1); } - DynAnyAnalyzer analyzer (this->orb_.in (), - dynany_factory.in (), - debug_); + DynAnyAnalyzer analyzer(this->orb_.in(), dynany_factory.in(), debug_); CORBA::Any in_any1; in_any1 <<= ts; @@ -83,37 +81,29 @@ Test_DynStruct::run_test (void) dynany_factory->create_dyn_any (in_any1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::DynStruct_var fa1 = DynamicAny::DynStruct::_narrow (dp1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fa1->insert_char (data.m_char1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - - fa1->insert_short_seq (data.m_shortseq1 - ACE_ENV_ARG_PARAMETER); + fa1->insert_long (data.m_long1 + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAny_var cc = fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - cc->insert_float (data.m_float1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - cc->next (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - cc->insert_short (data.m_short1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -127,7 +117,6 @@ Test_DynStruct::run_test (void) fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Char c = fa1->get_char (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -138,26 +127,10 @@ Test_DynStruct::run_test (void) fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - - data.m_shortseq2 = - fa1->get_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long l = fa1->get_long (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - bool good = - data.m_shortseq2->length () == data.m_shortseq1.length (); - - if (good) - { - for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i) - { - if (data.m_shortseq2[i] != data.m_shortseq1[i]) - { - ++this->error_count_; - break; - } - } - } - else + if (l != data.m_long1) { ++this->error_count_; } @@ -167,8 +140,8 @@ Test_DynStruct::run_test (void) cc = fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - - cc->seek (1 ACE_ENV_ARG_PARAMETER); + cc->seek (1 + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Short s = cc->get_short (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -208,7 +181,7 @@ Test_DynStruct::run_test (void) } ts.c = data.m_char1; - ts.ss.length (0UL); + ts.l = data.m_long1; ts.es.f = data.m_float1; ts.es.s = data.m_short1; CORBA::Any in_any2; @@ -217,11 +190,10 @@ Test_DynStruct::run_test (void) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - analyzer.analyze (ftc1.in () ACE_ENV_ARG_PARAMETER); + analyzer.analyze(ftc1.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var out_any1 = - ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; DynAnyTests::test_struct* ts_out; @@ -266,7 +238,7 @@ Test_DynStruct::run_test (void) } ts.c = data.m_char1; - ts.ss.length (0UL); + ts.l = data.m_long1; ts.es.f = data.m_float1; ts.es.s = data.m_short1; CORBA::Any in_any3; @@ -278,13 +250,13 @@ Test_DynStruct::run_test (void) // char c = ftc2->get_char (); // CORBA::Boolean status = ftc2->next (); // CORBA::Long lo = ftc2->get_long (); -// analyzer.analyze (ftc2.in () ACE_ENV_ARG_PARAMETER); -// ACE_TRY_CHECK; + analyzer.analyze(ftc2.in() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (bad_kind); - if (!(out_any2.in () >>= ts_out2)) // problem + if ((out_any2.in () >>= ts_out2) != 1) // problem { ts_out2 = 0; } @@ -309,9 +281,9 @@ Test_DynStruct::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: current_member_name/current_member_kind\n")); - ftc1->seek (2 ACE_ENV_ARG_PARAMETER); + ftc1->seek (2 + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::FieldName_var fn = ftc1->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp index 269f161e974..21cc5e1ad58 100644 --- a/TAO/tests/DynAny_Test/test_dynunion.cpp +++ b/TAO/tests/DynAny_Test/test_dynunion.cpp @@ -140,7 +140,7 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: constructor(TypeCode)/from_any/to_any\n")); - analyzer.analyze (fa1.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze(fa1.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any_var out_any1 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -152,7 +152,7 @@ Test_DynUnion::run_test (void) DynamicAny::DynUnion_var ftc1 = DynamicAny::DynUnion::_narrow (ftc1_base.in () - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ftc1.in ())) @@ -165,10 +165,9 @@ Test_DynUnion::run_test (void) ftc1->from_any (out_any1.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - - ftc1->seek (1 ACE_ENV_ARG_PARAMETER); + ftc1->seek (1 + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TypeCode_var s_out2 = ftc1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -191,7 +190,7 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: constructor(TypeCode alias)/from_any/to_any\n")); - analyzer.analyze( fa1.in() ACE_ENV_ARG_PARAMETER); + analyzer.analyze(fa1.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any_var out_any2 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -205,7 +204,6 @@ Test_DynUnion::run_test (void) dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union_alias ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bad_kind); - DynamicAny::DynUnion_var ftc2 = DynamicAny::DynUnion::_narrow (ftc2_base.in () ACE_ENV_ARG_PARAMETER); @@ -221,10 +219,9 @@ Test_DynUnion::run_test (void) ftc2->from_any (out_any2.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bad_kind); - - ftc2->seek (1 ACE_ENV_ARG_PARAMETER); + ftc2->seek (1 + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bad_kind); - s_out3 = ftc2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (bad_kind); } @@ -260,18 +257,14 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing:discriminator/discriminator_kind\n")); - DynamicAny::DynAny_var dp2 = - ftc1->get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var dp2 = ftc1->get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TypeCode_var tc2 = - dp2->type (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc2 = dp2->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TCKind tc1kind = - ftc1->discriminator_kind (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind tc1kind = ftc1->discriminator_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TCKind tc2kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -288,20 +281,13 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing:member/member_kind/member_name\n")); - DynamicAny::DynAny_var dp3 = - ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var dp3 = ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - - CORBA::String_var m_nm = - ftc1->member_name (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var m_nm = ftc1->member_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - - CORBA::TCKind tk = - ftc1->member_kind (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind tk = ftc1->member_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - - CORBA::TypeCode_var tc3 = - dp3->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc3 = dp3->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean const equal_tc3 = @@ -327,21 +313,15 @@ Test_DynUnion::run_test (void) ftc1->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ftc1->seek (1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ftc1->insert_short (data.m_short1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - - DynamicAny::DynAny_var mem = - ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var mem = ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - - CORBA::Short out_s = - mem->get_short (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Short out_s = mem->get_short (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (out_s == data.m_short1) @@ -356,7 +336,6 @@ Test_DynUnion::run_test (void) fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -367,7 +346,6 @@ Test_DynUnion::run_test (void) test_implicit_def_union._default(); ACE_TRY_CHECK; - any_union <<= test_implicit_def_union; ACE_TRY_CHECK; diff --git a/TAO/tests/Explicit_Event_Loop/.cvsignore b/TAO/tests/Explicit_Event_Loop/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Explicit_Event_Loop/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc index 3c94b1f5d10..6da42a65f4b 100644 --- a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc +++ b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc @@ -1,36 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - time.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { server.cpp } - Source_Files { - timeC.cpp - timeS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { timeC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/Explicit_Event_Loop/Makefile.am b/TAO/tests/Explicit_Event_Loop/Makefile.am deleted file mode 100644 index 54bb3d18750..00000000000 --- a/TAO/tests/Explicit_Event_Loop/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Explicit_Event_Loop_Idl.am - -BUILT_SOURCES = \ - timeC.cpp \ - timeC.h \ - timeC.inl \ - timeS.cpp \ - timeS.h \ - timeS.inl - -CLEANFILES = \ - time-stamp \ - timeC.cpp \ - timeC.h \ - timeC.inl \ - timeS.cpp \ - timeS.h \ - timeS.inl - -timeC.cpp timeC.h timeC.inl timeS.cpp timeS.h timeS.inl: time-stamp - -time-stamp: $(srcdir)/time.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/time.idl - @touch $@ - -noinst_HEADERS = \ - time.idl - -## Makefile.Explicit_Event_Loop_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - timeC.cpp \ - timeS.cpp \ - server.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Explicit_Event_Loop_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - timeC.cpp \ - server.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Exposed_Policies/.cvsignore b/TAO/tests/Exposed_Policies/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Exposed_Policies/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc index 343ee82c6ce..6e9c5283fe0 100644 --- a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc +++ b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc @@ -1,43 +1,25 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Counter.idl - } - custom_only = 1 -} - project(*Server): strategies, rt_server { - after += *idl Source_Files { Policy_Tester.cpp Policy_Verifier.cpp RT_Properties.cpp server.cpp } - Source_Files { - CounterC.cpp - CounterS.cpp - } - IDL_Files { - } } project(*Client): strategies, rt_server { exename = client - after += *idl after += *Server + Source_Files { + CounterC.cpp Policy_Tester.cpp Policy_Verifier.cpp RT_Properties.cpp client.cpp } - Source_Files { - CounterC.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Exposed_Policies/Makefile.am b/TAO/tests/Exposed_Policies/Makefile.am deleted file mode 100644 index 7086be3f5cb..00000000000 --- a/TAO/tests/Exposed_Policies/Makefile.am +++ /dev/null @@ -1,130 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Exposed_Policies_Idl.am - -BUILT_SOURCES = \ - CounterC.cpp \ - CounterC.h \ - CounterC.inl \ - CounterS.cpp \ - CounterS.h \ - CounterS.inl - -CLEANFILES = \ - Counter-stamp \ - CounterC.cpp \ - CounterC.h \ - CounterC.inl \ - CounterS.cpp \ - CounterS.h \ - CounterS.inl - -CounterC.cpp CounterC.h CounterC.inl CounterS.cpp CounterS.h CounterS.inl: Counter-stamp - -Counter-stamp: $(srcdir)/Counter.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Counter.idl - @touch $@ - -noinst_HEADERS = \ - Counter.idl - -## Makefile.Exposed_Policies_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - CounterC.cpp \ - CounterS.cpp \ - Policy_Tester.cpp \ - Policy_Verifier.cpp \ - RT_Properties.cpp \ - server.cpp \ - Policy_Tester.h \ - Policy_Verifier.h \ - RT_Properties.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.Exposed_Policies_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - CounterC.cpp \ - Policy_Tester.cpp \ - Policy_Verifier.cpp \ - RT_Properties.cpp \ - client.cpp \ - Policy_Tester.h \ - Policy_Verifier.h \ - RT_Properties.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/FL_Cube/.cvsignore b/TAO/tests/FL_Cube/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/FL_Cube/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/FL_Cube/Makefile.am b/TAO/tests/FL_Cube/Makefile.am deleted file mode 100644 index cd15f0bedbb..00000000000 --- a/TAO/tests/FL_Cube/Makefile.am +++ /dev/null @@ -1,169 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.FL_Cube_Client.am - -if BUILD_ACE_FLREACTOR -if BUILD_EXCEPTIONS -if BUILD_FL -if BUILD_GL -if BUILD_TAO_FLRESOURCE -if BUILD_X11 - -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_FLTK_CPPFLAGS) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_LDFLAGS = \ - $(ACE_FLTK_LDFLAGS) - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_FlResource.la \ - $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_FLTK_LIBS) - -endif BUILD_X11 -endif BUILD_TAO_FLRESOURCE -endif BUILD_GL -endif BUILD_FL -endif BUILD_EXCEPTIONS -endif BUILD_ACE_FLREACTOR - -## Makefile.FL_Cube_Server.am - -if BUILD_ACE_FLREACTOR -if BUILD_EXCEPTIONS -if BUILD_FL -if BUILD_GL -if BUILD_TAO_FLRESOURCE -if BUILD_X11 - -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_FLTK_CPPFLAGS) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -server_LDFLAGS = \ - $(ACE_FLTK_LDFLAGS) - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_FlResource.la \ - $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_FLTK_LIBS) - -endif BUILD_X11 -endif BUILD_TAO_FLRESOURCE -endif BUILD_GL -endif BUILD_FL -endif BUILD_EXCEPTIONS -endif BUILD_ACE_FLREACTOR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Faults/.cvsignore b/TAO/tests/Faults/.cvsignore new file mode 100644 index 00000000000..c347b958f8e --- /dev/null +++ b/TAO/tests/Faults/.cvsignore @@ -0,0 +1,5 @@ +client +middle +ping +pong +server diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc index 8c2ae1263cc..0bc0ae29bce 100644 --- a/TAO/tests/Faults/Faults.mpc +++ b/TAO/tests/Faults/Faults.mpc @@ -1,88 +1,71 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { +project(*Server): taoserver, minimum_corba { IDL_Files { test.idl - ping.idl } - custom_only = 1 -} -project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl - - Source_Files { - test_i.cpp - server.cpp - } Source_Files { testC.cpp testS.cpp - } - IDL_Files { + test_i.cpp + server.cpp } } -project(*Middle): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Middle): taoexe, portableserver, minimum_corba { after += *Server - - Source_Files { - test_i.cpp - middle.cpp + IDL_Files { + test.idl } + Source_Files { testC.cpp testS.cpp - } - IDL_Files { + test_i.cpp + middle.cpp } } -project(*Client): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): taoexe, portableserver, minimum_corba { after += *Middle - - Source_Files { - test_i.cpp - client.cpp + IDL_Files { + test.idl } + Source_Files { testC.cpp testS.cpp - } - IDL_Files { + test_i.cpp + client.cpp } } -project(*Ping): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl - - Source_Files { - ping_i.cpp - ping.cpp +project(*Ping): taoexe, portableserver, minimum_corba { + IDL_Files { + ping.idl } + Source_Files { pingC.cpp pingS.cpp - } - IDL_Files { + ping_i.cpp + ping.cpp } } -project(*Pong): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Pong): taoexe, portableserver, minimum_corba { after += *Ping - - Source_Files { - ping_i.cpp - pong.cpp + IDL_Files { + ping.idl } + Source_Files { pingC.cpp pingS.cpp - } - IDL_Files { + ping_i.cpp + pong.cpp } } + diff --git a/TAO/tests/Faults/Makefile.am b/TAO/tests/Faults/Makefile.am deleted file mode 100644 index 10d474796cc..00000000000 --- a/TAO/tests/Faults/Makefile.am +++ /dev/null @@ -1,219 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Faults_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -BUILT_SOURCES += \ - pingC.cpp \ - pingC.h \ - pingC.inl \ - pingS.cpp \ - pingS.h \ - pingS.inl - -CLEANFILES += \ - ping-stamp \ - pingC.cpp \ - pingC.h \ - pingC.inl \ - pingS.cpp \ - pingS.h \ - pingS.inl - -pingC.cpp pingC.h pingC.inl pingS.cpp pingS.h pingS.inl: ping-stamp - -ping-stamp: $(srcdir)/ping.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ping.idl - @touch $@ - -noinst_HEADERS = \ - ping.idl \ - test.idl - -## Makefile.Faults_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Faults_Middle.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += middle - -middle_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -middle_SOURCES = \ - middle.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -middle_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Faults_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Faults_Ping.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += ping - -ping_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ping_SOURCES = \ - ping.cpp \ - pingC.cpp \ - pingS.cpp \ - ping_i.cpp \ - ping_i.h \ - ping_i.inl - -ping_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Faults_Pong.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += pong - -pong_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -pong_SOURCES = \ - pingC.cpp \ - pingS.cpp \ - ping_i.cpp \ - pong.cpp \ - ping_i.h \ - ping_i.inl - -pong_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/File_IO/.cvsignore b/TAO/tests/File_IO/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/File_IO/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc index 194e99a4b04..0f597f3533e 100644 --- a/TAO/tests/File_IO/File_IO.mpc +++ b/TAO/tests/File_IO/File_IO.mpc @@ -1,37 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - File.idl - } - custom_only = 1 -} - -project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): taoserver, minimum_corba { Source_Files { File_i.cpp server.cpp } - Source_Files { - FileC.cpp - FileS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): taoclient, anytypecode, minimum_corba { after += *Server Source_Files { - client.cpp - } - Source_Files { FileC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/File_IO/Makefile.am b/TAO/tests/File_IO/Makefile.am deleted file mode 100644 index 6fafa73de5d..00000000000 --- a/TAO/tests/File_IO/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.File_IO_Idl.am - -BUILT_SOURCES = \ - FileC.cpp \ - FileC.h \ - FileC.inl \ - FileS.cpp \ - FileS.h \ - FileS.inl - -CLEANFILES = \ - File-stamp \ - FileC.cpp \ - FileC.h \ - FileC.inl \ - FileS.cpp \ - FileS.h \ - FileS.inl - -FileC.cpp FileC.h FileC.inl FileS.cpp FileS.h FileS.inl: File-stamp - -File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/File.idl - @touch $@ - -noinst_HEADERS = \ - File.idl - -## Makefile.File_IO_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - FileC.cpp \ - FileS.cpp \ - File_i.cpp \ - server.cpp \ - File_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.File_IO_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - FileC.cpp \ - client.cpp \ - File_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Forwarding/.cvsignore b/TAO/tests/Forwarding/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Forwarding/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc index 869c1d241c4..c0830f61571 100644 --- a/TAO/tests/Forwarding/Forwarding.mpc +++ b/TAO/tests/Forwarding/Forwarding.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, iortable { - after += *idl Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Forwarding/Makefile.am b/TAO/tests/Forwarding/Makefile.am deleted file mode 100644 index a36b5d5761c..00000000000 --- a/TAO/tests/Forwarding/Makefile.am +++ /dev/null @@ -1,109 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Forwarding_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Forwarding_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Forwarding_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am deleted file mode 100644 index 00861fb0155..00000000000 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am +++ /dev/null @@ -1,109 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Java_Big_Reply_IDL.am - -if BUILD_JAVA - -BUILT_SOURCES += \ - Test/ - -CLEANFILES += \ - Test/ - -Test/: $(srcdir)/Test.idl - mkdir -p Test - idlj -fall $(srcdir)/Test.idl - -endif BUILD_JAVA - -## Makefile.Java_Big_Reply.am - -if BUILD_EXCEPTIONS -if BUILD_JAVA - -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -BUILT_SOURCES += \ - server.class - -CLEANFILES += \ - server.class - -server.class: $(srcdir)/server.java - javac -d . $(srcdir)/server.java - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_JAVA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am b/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am deleted file mode 100644 index 9755a7f0030..00000000000 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am +++ /dev/null @@ -1,109 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Java_Big_Request_IDL.am - -if BUILD_JAVA - -BUILT_SOURCES += \ - Test/ - -CLEANFILES += \ - Test/ - -Test/: $(srcdir)/Test.idl - mkdir -p Test - idlj $(srcdir)/Test.idl - -endif BUILD_JAVA - -## Makefile.Java_Big_Request.am - -if BUILD_EXCEPTIONS -if BUILD_JAVA - -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -BUILT_SOURCES += \ - client.class - -CLEANFILES += \ - client.class - -client.class: $(srcdir)/client.java - javac -d . $(srcdir)/client.java - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Payload_Receiver.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Payload_Receiver.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_JAVA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/GIOP_Fragments/Makefile.am b/TAO/tests/GIOP_Fragments/Makefile.am deleted file mode 100644 index a3b8104e475..00000000000 --- a/TAO/tests/GIOP_Fragments/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Java_Big_Reply \ - Java_Big_Request \ - PMB_With_Fragments - diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/.cvsignore b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/.cvsignore new file mode 100644 index 00000000000..254defddb53 --- /dev/null +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/.cvsignore @@ -0,0 +1 @@ +server diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am deleted file mode 100644 index b475617d0ac..00000000000 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.PMB_With_Fragments.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Payload_Receiver.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Payload_Receiver.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc index 567e50ee4f5..85905a99a88 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project: taoserver, avoids_corba_e_micro { +project: taoserver { } diff --git a/TAO/tests/Hang_Shutdown/Hang.mpc b/TAO/tests/Hang_Shutdown/Hang.mpc index bbebd287918..9d58d8df81e 100644 --- a/TAO/tests/Hang_Shutdown/Hang.mpc +++ b/TAO/tests/Hang_Shutdown/Hang.mpc @@ -1,22 +1,12 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { server.cpp TestS.cpp TestC.cpp } - IDL_Files { - } } project(*Client): taoclient, anytypecode { @@ -26,6 +16,5 @@ project(*Client): taoclient, anytypecode { TestC.cpp client.cpp } - IDL_Files { - } } + diff --git a/TAO/tests/Hang_Shutdown/Makefile.am b/TAO/tests/Hang_Shutdown/Makefile.am deleted file mode 100644 index 2d86df5a36f..00000000000 --- a/TAO/tests/Hang_Shutdown/Makefile.am +++ /dev/null @@ -1,107 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Hang_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Hang_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Hang_Client.am - -if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Hello/.cvsignore b/TAO/tests/Hello/.cvsignore new file mode 100644 index 00000000000..83770c96269 --- /dev/null +++ b/TAO/tests/Hello/.cvsignore @@ -0,0 +1,3 @@ +TestA.cpp +client +server diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc index 066f4725953..9a1892855d9 100644 --- a/TAO/tests/Hello/Hello.mpc +++ b/TAO/tests/Hello/Hello.mpc @@ -1,37 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl + idlflags += -Sa -St Source_Files { Hello.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/Hello/Makefile.am b/TAO/tests/Hello/Makefile.am deleted file mode 100644 index 692871fcb95..00000000000 --- a/TAO/tests/Hello/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Hello_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Hello_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Hello_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ICMG_Any_Bug/.cvsignore b/TAO/tests/ICMG_Any_Bug/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/ICMG_Any_Bug/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp index bfa97ea05a1..bfa97ea05a1 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/Hello.cpp +++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h index 429a7e10963..429a7e10963 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/Hello.h +++ b/TAO/tests/ICMG_Any_Bug/Hello.h diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc index d22d23a1041..a41e64733b8 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.mpc +++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc @@ -1,34 +1,19 @@ // -*- MPC -*- // $Id$ -project(ICMG_Any_Bug_Hello_IDL): taoidldefaults { - idlflags -= -St - idlflags -= -Sa - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(ICMG_Any_Bug_Hello_Server): taoserver { - after += ICMG_Any_Bug_Hello_IDL Source_Files { Hello.cpp HelloWorld.cpp server.cpp - TestS.cpp - TestC.cpp - } - IDL_Files { } } -project(ICMG_Any_Bug_Hello_Client): taoclient, ifr_client, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += ICMG_Any_Bug_Hello_IDL +project(ICMG_Any_Bug_Hello_Client): taoclient, ifr_client, dynamicinterface, minimum_corba { + after += ICMG_Any_Bug_Hello_Server Source_Files { TestC.cpp client.cpp } - IDL_Files { - } } + diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h index ad60160af2d..ad60160af2d 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h +++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h diff --git a/TAO/tests/ICMG_Any_Bug/Makefile.am b/TAO/tests/ICMG_Any_Bug/Makefile.am deleted file mode 100644 index 7491e787408..00000000000 --- a/TAO/tests/ICMG_Any_Bug/Makefile.am +++ /dev/null @@ -1,118 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.ICMG_Any_Bug_Hello_IDL.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.ICMG_Any_Bug_Hello_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h \ - HelloWorld.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.ICMG_Any_Bug_Hello_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - HelloWorld.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - HelloWorld.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp index 3457c09156a..3457c09156a 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/client.cpp +++ b/TAO/tests/ICMG_Any_Bug/client.cpp diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp index e32f495349a..e32f495349a 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/server.cpp +++ b/TAO/tests/ICMG_Any_Bug/server.cpp diff --git a/TAO/tests/IDL_Test/.cvsignore b/TAO/tests/IDL_Test/.cvsignore new file mode 100644 index 00000000000..e04cf61fd06 --- /dev/null +++ b/TAO/tests/IDL_Test/.cvsignore @@ -0,0 +1,23 @@ +anonymousA.cpp +arrayA.cpp +constantsA.cpp +enum_in_structA.cpp +fullA.cpp +fwdA.cpp +generic_objectA.cpp +gperfA.cpp +includedA.cpp +includingA.cpp +interfaceA.cpp +keywordsA.cpp +main +nested_scopeA.cpp +paramsA.cpp +pragmaA.cpp +reopen_include1A.cpp +reopen_include2A.cpp +reopened_modulesA.cpp +repo_id_modA.cpp +sequenceA.cpp +typedefA.cpp +unionA.cpp diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc index 3e58b5b00c5..f3aaf8572ef 100644 --- a/TAO/tests/IDL_Test/IDL_Test.mpc +++ b/TAO/tests/IDL_Test/IDL_Test.mpc @@ -5,7 +5,7 @@ project(*Main): taoserver, messaging { exename = main IDL_Files { - idlflags += -GC -GH -Gd -GT + idlflags += -GC -GH -Gd array.idl Bug_2577_Regression.idl Bug_2582_Regression.idl @@ -30,7 +30,7 @@ project(*Main): taoserver, messaging { } IDL_Files { - idlflags += -GC -GH -Gd -GA -GT + idlflags += -GC -GH -Gd -GA anonymous.idl constants.idl generic_object.idl @@ -44,12 +44,5 @@ project(*Main): taoserver, messaging { Source_Files { main.cpp - *C.cpp - *S.cpp - *A.cpp - } - - Template_Files { - *S_T.cpp } } diff --git a/TAO/tests/IDL_Test/Makefile.am b/TAO/tests/IDL_Test/Makefile.am deleted file mode 100644 index 303aad830f8..00000000000 --- a/TAO/tests/IDL_Test/Makefile.am +++ /dev/null @@ -1,1131 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.IDL_Test_Main.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - arrayC.cpp \ - arrayC.h \ - arrayC.inl \ - arrayS.cpp \ - arrayS.h \ - arrayS.inl \ - arrayS_T.cpp \ - arrayS_T.h - -CLEANFILES += \ - array-stamp \ - arrayC.cpp \ - arrayC.h \ - arrayC.inl \ - arrayS.cpp \ - arrayS.h \ - arrayS.inl \ - arrayS_T.cpp \ - arrayS_T.h - -arrayC.cpp arrayC.h arrayC.inl arrayS.cpp arrayS.h arrayS.inl arrayS_T.cpp arrayS_T.h: array-stamp - -array-stamp: $(srcdir)/array.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/array.idl - @touch $@ - -BUILT_SOURCES += \ - Bug_2577_RegressionC.cpp \ - Bug_2577_RegressionC.h \ - Bug_2577_RegressionC.inl \ - Bug_2577_RegressionS.cpp \ - Bug_2577_RegressionS.h \ - Bug_2577_RegressionS.inl \ - Bug_2577_RegressionS_T.cpp \ - Bug_2577_RegressionS_T.h - -CLEANFILES += \ - Bug_2577_Regression-stamp \ - Bug_2577_RegressionC.cpp \ - Bug_2577_RegressionC.h \ - Bug_2577_RegressionC.inl \ - Bug_2577_RegressionS.cpp \ - Bug_2577_RegressionS.h \ - Bug_2577_RegressionS.inl \ - Bug_2577_RegressionS_T.cpp \ - Bug_2577_RegressionS_T.h - -Bug_2577_RegressionC.cpp Bug_2577_RegressionC.h Bug_2577_RegressionC.inl Bug_2577_RegressionS.cpp Bug_2577_RegressionS.h Bug_2577_RegressionS.inl Bug_2577_RegressionS_T.cpp Bug_2577_RegressionS_T.h: Bug_2577_Regression-stamp - -Bug_2577_Regression-stamp: $(srcdir)/Bug_2577_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2577_Regression.idl - @touch $@ - -BUILT_SOURCES += \ - Bug_2582_RegressionC.cpp \ - Bug_2582_RegressionC.h \ - Bug_2582_RegressionC.inl \ - Bug_2582_RegressionS.cpp \ - Bug_2582_RegressionS.h \ - Bug_2582_RegressionS.inl \ - Bug_2582_RegressionS_T.cpp \ - Bug_2582_RegressionS_T.h - -CLEANFILES += \ - Bug_2582_Regression-stamp \ - Bug_2582_RegressionC.cpp \ - Bug_2582_RegressionC.h \ - Bug_2582_RegressionC.inl \ - Bug_2582_RegressionS.cpp \ - Bug_2582_RegressionS.h \ - Bug_2582_RegressionS.inl \ - Bug_2582_RegressionS_T.cpp \ - Bug_2582_RegressionS_T.h - -Bug_2582_RegressionC.cpp Bug_2582_RegressionC.h Bug_2582_RegressionC.inl Bug_2582_RegressionS.cpp Bug_2582_RegressionS.h Bug_2582_RegressionS.inl Bug_2582_RegressionS_T.cpp Bug_2582_RegressionS_T.h: Bug_2582_Regression-stamp - -Bug_2582_Regression-stamp: $(srcdir)/Bug_2582_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2582_Regression.idl - @touch $@ - -BUILT_SOURCES += \ - Bug_2583_RegressionC.cpp \ - Bug_2583_RegressionC.h \ - Bug_2583_RegressionC.inl \ - Bug_2583_RegressionS.cpp \ - Bug_2583_RegressionS.h \ - Bug_2583_RegressionS.inl \ - Bug_2583_RegressionS_T.cpp \ - Bug_2583_RegressionS_T.h - -CLEANFILES += \ - Bug_2583_Regression-stamp \ - Bug_2583_RegressionC.cpp \ - Bug_2583_RegressionC.h \ - Bug_2583_RegressionC.inl \ - Bug_2583_RegressionS.cpp \ - Bug_2583_RegressionS.h \ - Bug_2583_RegressionS.inl \ - Bug_2583_RegressionS_T.cpp \ - Bug_2583_RegressionS_T.h - -Bug_2583_RegressionC.cpp Bug_2583_RegressionC.h Bug_2583_RegressionC.inl Bug_2583_RegressionS.cpp Bug_2583_RegressionS.h Bug_2583_RegressionS.inl Bug_2583_RegressionS_T.cpp Bug_2583_RegressionS_T.h: Bug_2583_Regression-stamp - -Bug_2583_Regression-stamp: $(srcdir)/Bug_2583_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2583_Regression.idl - @touch $@ - -BUILT_SOURCES += \ - Bug_2616_RegressionC.cpp \ - Bug_2616_RegressionC.h \ - Bug_2616_RegressionC.inl \ - Bug_2616_RegressionS.cpp \ - Bug_2616_RegressionS.h \ - Bug_2616_RegressionS.inl \ - Bug_2616_RegressionS_T.cpp \ - Bug_2616_RegressionS_T.h - -CLEANFILES += \ - Bug_2616_Regression-stamp \ - Bug_2616_RegressionC.cpp \ - Bug_2616_RegressionC.h \ - Bug_2616_RegressionC.inl \ - Bug_2616_RegressionS.cpp \ - Bug_2616_RegressionS.h \ - Bug_2616_RegressionS.inl \ - Bug_2616_RegressionS_T.cpp \ - Bug_2616_RegressionS_T.h - -Bug_2616_RegressionC.cpp Bug_2616_RegressionC.h Bug_2616_RegressionC.inl Bug_2616_RegressionS.cpp Bug_2616_RegressionS.h Bug_2616_RegressionS.inl Bug_2616_RegressionS_T.cpp Bug_2616_RegressionS_T.h: Bug_2616_Regression-stamp - -Bug_2616_Regression-stamp: $(srcdir)/Bug_2616_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2616_Regression.idl - @touch $@ - -BUILT_SOURCES += \ - Bug_2619_RegressionC.cpp \ - Bug_2619_RegressionC.h \ - Bug_2619_RegressionC.inl \ - Bug_2619_RegressionS.cpp \ - Bug_2619_RegressionS.h \ - Bug_2619_RegressionS.inl \ - Bug_2619_RegressionS_T.cpp \ - Bug_2619_RegressionS_T.h - -CLEANFILES += \ - Bug_2619_Regression-stamp \ - Bug_2619_RegressionC.cpp \ - Bug_2619_RegressionC.h \ - Bug_2619_RegressionC.inl \ - Bug_2619_RegressionS.cpp \ - Bug_2619_RegressionS.h \ - Bug_2619_RegressionS.inl \ - Bug_2619_RegressionS_T.cpp \ - Bug_2619_RegressionS_T.h - -Bug_2619_RegressionC.cpp Bug_2619_RegressionC.h Bug_2619_RegressionC.inl Bug_2619_RegressionS.cpp Bug_2619_RegressionS.h Bug_2619_RegressionS.inl Bug_2619_RegressionS_T.cpp Bug_2619_RegressionS_T.h: Bug_2619_Regression-stamp - -Bug_2619_Regression-stamp: $(srcdir)/Bug_2619_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2619_Regression.idl - @touch $@ - -BUILT_SOURCES += \ - enum_in_structC.cpp \ - enum_in_structC.h \ - enum_in_structC.inl \ - enum_in_structS.cpp \ - enum_in_structS.h \ - enum_in_structS.inl \ - enum_in_structS_T.cpp \ - enum_in_structS_T.h - -CLEANFILES += \ - enum_in_struct-stamp \ - enum_in_structC.cpp \ - enum_in_structC.h \ - enum_in_structC.inl \ - enum_in_structS.cpp \ - enum_in_structS.h \ - enum_in_structS.inl \ - enum_in_structS_T.cpp \ - enum_in_structS_T.h - -enum_in_structC.cpp enum_in_structC.h enum_in_structC.inl enum_in_structS.cpp enum_in_structS.h enum_in_structS.inl enum_in_structS_T.cpp enum_in_structS_T.h: enum_in_struct-stamp - -enum_in_struct-stamp: $(srcdir)/enum_in_struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/enum_in_struct.idl - @touch $@ - -BUILT_SOURCES += \ - fullC.cpp \ - fullC.h \ - fullC.inl \ - fullS.cpp \ - fullS.h \ - fullS.inl \ - fullS_T.cpp \ - fullS_T.h - -CLEANFILES += \ - full-stamp \ - fullC.cpp \ - fullC.h \ - fullC.inl \ - fullS.cpp \ - fullS.h \ - fullS.inl \ - fullS_T.cpp \ - fullS_T.h - -fullC.cpp fullC.h fullC.inl fullS.cpp fullS.h fullS.inl fullS_T.cpp fullS_T.h: full-stamp - -full-stamp: $(srcdir)/full.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/full.idl - @touch $@ - -BUILT_SOURCES += \ - fwdC.cpp \ - fwdC.h \ - fwdC.inl \ - fwdS.cpp \ - fwdS.h \ - fwdS.inl \ - fwdS_T.cpp \ - fwdS_T.h - -CLEANFILES += \ - fwd-stamp \ - fwdC.cpp \ - fwdC.h \ - fwdC.inl \ - fwdS.cpp \ - fwdS.h \ - fwdS.inl \ - fwdS_T.cpp \ - fwdS_T.h - -fwdC.cpp fwdC.h fwdC.inl fwdS.cpp fwdS.h fwdS.inl fwdS_T.cpp fwdS_T.h: fwd-stamp - -fwd-stamp: $(srcdir)/fwd.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/fwd.idl - @touch $@ - -BUILT_SOURCES += \ - gperfC.cpp \ - gperfC.h \ - gperfC.inl \ - gperfS.cpp \ - gperfS.h \ - gperfS.inl \ - gperfS_T.cpp \ - gperfS_T.h - -CLEANFILES += \ - gperf-stamp \ - gperfC.cpp \ - gperfC.h \ - gperfC.inl \ - gperfS.cpp \ - gperfS.h \ - gperfS.inl \ - gperfS_T.cpp \ - gperfS_T.h - -gperfC.cpp gperfC.h gperfC.inl gperfS.cpp gperfS.h gperfS.inl gperfS_T.cpp gperfS_T.h: gperf-stamp - -gperf-stamp: $(srcdir)/gperf.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/gperf.idl - @touch $@ - -BUILT_SOURCES += \ - includingC.cpp \ - includingC.h \ - includingC.inl \ - includingS.cpp \ - includingS.h \ - includingS.inl \ - includingS_T.cpp \ - includingS_T.h - -CLEANFILES += \ - including-stamp \ - includingC.cpp \ - includingC.h \ - includingC.inl \ - includingS.cpp \ - includingS.h \ - includingS.inl \ - includingS_T.cpp \ - includingS_T.h - -includingC.cpp includingC.h includingC.inl includingS.cpp includingS.h includingS.inl includingS_T.cpp includingS_T.h: including-stamp - -including-stamp: $(srcdir)/including.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/including.idl - @touch $@ - -BUILT_SOURCES += \ - interfaceC.cpp \ - interfaceC.h \ - interfaceC.inl \ - interfaceS.cpp \ - interfaceS.h \ - interfaceS.inl \ - interfaceS_T.cpp \ - interfaceS_T.h - -CLEANFILES += \ - interface-stamp \ - interfaceC.cpp \ - interfaceC.h \ - interfaceC.inl \ - interfaceS.cpp \ - interfaceS.h \ - interfaceS.inl \ - interfaceS_T.cpp \ - interfaceS_T.h - -interfaceC.cpp interfaceC.h interfaceC.inl interfaceS.cpp interfaceS.h interfaceS.inl interfaceS_T.cpp interfaceS_T.h: interface-stamp - -interface-stamp: $(srcdir)/interface.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/interface.idl - @touch $@ - -BUILT_SOURCES += \ - includedC.cpp \ - includedC.h \ - includedC.inl \ - includedS.cpp \ - includedS.h \ - includedS.inl \ - includedS_T.cpp \ - includedS_T.h - -CLEANFILES += \ - included-stamp \ - includedC.cpp \ - includedC.h \ - includedC.inl \ - includedS.cpp \ - includedS.h \ - includedS.inl \ - includedS_T.cpp \ - includedS_T.h - -includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl includedS_T.cpp includedS_T.h: included-stamp - -included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/included.idl - @touch $@ - -BUILT_SOURCES += \ - unionC.cpp \ - unionC.h \ - unionC.inl \ - unionS.cpp \ - unionS.h \ - unionS.inl \ - unionS_T.cpp \ - unionS_T.h - -CLEANFILES += \ - union-stamp \ - unionC.cpp \ - unionC.h \ - unionC.inl \ - unionS.cpp \ - unionS.h \ - unionS.inl \ - unionS_T.cpp \ - unionS_T.h - -unionC.cpp unionC.h unionC.inl unionS.cpp unionS.h unionS.inl unionS_T.cpp unionS_T.h: union-stamp - -union-stamp: $(srcdir)/union.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/union.idl - @touch $@ - -BUILT_SOURCES += \ - nested_scopeC.cpp \ - nested_scopeC.h \ - nested_scopeC.inl \ - nested_scopeS.cpp \ - nested_scopeS.h \ - nested_scopeS.inl \ - nested_scopeS_T.cpp \ - nested_scopeS_T.h - -CLEANFILES += \ - nested_scope-stamp \ - nested_scopeC.cpp \ - nested_scopeC.h \ - nested_scopeC.inl \ - nested_scopeS.cpp \ - nested_scopeS.h \ - nested_scopeS.inl \ - nested_scopeS_T.cpp \ - nested_scopeS_T.h - -nested_scopeC.cpp nested_scopeC.h nested_scopeC.inl nested_scopeS.cpp nested_scopeS.h nested_scopeS.inl nested_scopeS_T.cpp nested_scopeS_T.h: nested_scope-stamp - -nested_scope-stamp: $(srcdir)/nested_scope.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/nested_scope.idl - @touch $@ - -BUILT_SOURCES += \ - paramsC.cpp \ - paramsC.h \ - paramsC.inl \ - paramsS.cpp \ - paramsS.h \ - paramsS.inl \ - paramsS_T.cpp \ - paramsS_T.h - -CLEANFILES += \ - params-stamp \ - paramsC.cpp \ - paramsC.h \ - paramsC.inl \ - paramsS.cpp \ - paramsS.h \ - paramsS.inl \ - paramsS_T.cpp \ - paramsS_T.h - -paramsC.cpp paramsC.h paramsC.inl paramsS.cpp paramsS.h paramsS.inl paramsS_T.cpp paramsS_T.h: params-stamp - -params-stamp: $(srcdir)/params.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/params.idl - @touch $@ - -BUILT_SOURCES += \ - reopened_modulesC.cpp \ - reopened_modulesC.h \ - reopened_modulesC.inl \ - reopened_modulesS.cpp \ - reopened_modulesS.h \ - reopened_modulesS.inl \ - reopened_modulesS_T.cpp \ - reopened_modulesS_T.h - -CLEANFILES += \ - reopened_modules-stamp \ - reopened_modulesC.cpp \ - reopened_modulesC.h \ - reopened_modulesC.inl \ - reopened_modulesS.cpp \ - reopened_modulesS.h \ - reopened_modulesS.inl \ - reopened_modulesS_T.cpp \ - reopened_modulesS_T.h - -reopened_modulesC.cpp reopened_modulesC.h reopened_modulesC.inl reopened_modulesS.cpp reopened_modulesS.h reopened_modulesS.inl reopened_modulesS_T.cpp reopened_modulesS_T.h: reopened_modules-stamp - -reopened_modules-stamp: $(srcdir)/reopened_modules.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopened_modules.idl - @touch $@ - -BUILT_SOURCES += \ - sequenceC.cpp \ - sequenceC.h \ - sequenceC.inl \ - sequenceS.cpp \ - sequenceS.h \ - sequenceS.inl \ - sequenceS_T.cpp \ - sequenceS_T.h - -CLEANFILES += \ - sequence-stamp \ - sequenceC.cpp \ - sequenceC.h \ - sequenceC.inl \ - sequenceS.cpp \ - sequenceS.h \ - sequenceS.inl \ - sequenceS_T.cpp \ - sequenceS_T.h - -sequenceC.cpp sequenceC.h sequenceC.inl sequenceS.cpp sequenceS.h sequenceS.inl sequenceS_T.cpp sequenceS_T.h: sequence-stamp - -sequence-stamp: $(srcdir)/sequence.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/sequence.idl - @touch $@ - -BUILT_SOURCES += \ - reopen_include1C.cpp \ - reopen_include1C.h \ - reopen_include1C.inl \ - reopen_include1S.cpp \ - reopen_include1S.h \ - reopen_include1S.inl \ - reopen_include1S_T.cpp \ - reopen_include1S_T.h - -CLEANFILES += \ - reopen_include1-stamp \ - reopen_include1C.cpp \ - reopen_include1C.h \ - reopen_include1C.inl \ - reopen_include1S.cpp \ - reopen_include1S.h \ - reopen_include1S.inl \ - reopen_include1S_T.cpp \ - reopen_include1S_T.h - -reopen_include1C.cpp reopen_include1C.h reopen_include1C.inl reopen_include1S.cpp reopen_include1S.h reopen_include1S.inl reopen_include1S_T.cpp reopen_include1S_T.h: reopen_include1-stamp - -reopen_include1-stamp: $(srcdir)/reopen_include1.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include1.idl - @touch $@ - -BUILT_SOURCES += \ - reopen_include2C.cpp \ - reopen_include2C.h \ - reopen_include2C.inl \ - reopen_include2S.cpp \ - reopen_include2S.h \ - reopen_include2S.inl \ - reopen_include2S_T.cpp \ - reopen_include2S_T.h - -CLEANFILES += \ - reopen_include2-stamp \ - reopen_include2C.cpp \ - reopen_include2C.h \ - reopen_include2C.inl \ - reopen_include2S.cpp \ - reopen_include2S.h \ - reopen_include2S.inl \ - reopen_include2S_T.cpp \ - reopen_include2S_T.h - -reopen_include2C.cpp reopen_include2C.h reopen_include2C.inl reopen_include2S.cpp reopen_include2S.h reopen_include2S.inl reopen_include2S_T.cpp reopen_include2S_T.h: reopen_include2-stamp - -reopen_include2-stamp: $(srcdir)/reopen_include2.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include2.idl - @touch $@ - -BUILT_SOURCES += \ - typeprefixC.cpp \ - typeprefixC.h \ - typeprefixC.inl \ - typeprefixS.cpp \ - typeprefixS.h \ - typeprefixS.inl \ - typeprefixS_T.cpp \ - typeprefixS_T.h - -CLEANFILES += \ - typeprefix-stamp \ - typeprefixC.cpp \ - typeprefixC.h \ - typeprefixC.inl \ - typeprefixS.cpp \ - typeprefixS.h \ - typeprefixS.inl \ - typeprefixS_T.cpp \ - typeprefixS_T.h - -typeprefixC.cpp typeprefixC.h typeprefixC.inl typeprefixS.cpp typeprefixS.h typeprefixS.inl typeprefixS_T.cpp typeprefixS_T.h: typeprefix-stamp - -typeprefix-stamp: $(srcdir)/typeprefix.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/typeprefix.idl - @touch $@ - -BUILT_SOURCES += \ - anonymousA.cpp \ - anonymousA.h \ - anonymousC.cpp \ - anonymousC.h \ - anonymousC.inl \ - anonymousS.cpp \ - anonymousS.h \ - anonymousS.inl \ - anonymousS_T.cpp \ - anonymousS_T.h - -CLEANFILES += \ - anonymous-stamp \ - anonymousA.cpp \ - anonymousA.h \ - anonymousC.cpp \ - anonymousC.h \ - anonymousC.inl \ - anonymousS.cpp \ - anonymousS.h \ - anonymousS.inl \ - anonymousS_T.cpp \ - anonymousS_T.h - -anonymousA.cpp anonymousA.h anonymousC.cpp anonymousC.h anonymousC.inl anonymousS.cpp anonymousS.h anonymousS.inl anonymousS_T.cpp anonymousS_T.h: anonymous-stamp - -anonymous-stamp: $(srcdir)/anonymous.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/anonymous.idl - @touch $@ - -BUILT_SOURCES += \ - constantsA.cpp \ - constantsA.h \ - constantsC.cpp \ - constantsC.h \ - constantsC.inl \ - constantsS.cpp \ - constantsS.h \ - constantsS.inl \ - constantsS_T.cpp \ - constantsS_T.h - -CLEANFILES += \ - constants-stamp \ - constantsA.cpp \ - constantsA.h \ - constantsC.cpp \ - constantsC.h \ - constantsC.inl \ - constantsS.cpp \ - constantsS.h \ - constantsS.inl \ - constantsS_T.cpp \ - constantsS_T.h - -constantsA.cpp constantsA.h constantsC.cpp constantsC.h constantsC.inl constantsS.cpp constantsS.h constantsS.inl constantsS_T.cpp constantsS_T.h: constants-stamp - -constants-stamp: $(srcdir)/constants.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/constants.idl - @touch $@ - -BUILT_SOURCES += \ - generic_objectA.cpp \ - generic_objectA.h \ - generic_objectC.cpp \ - generic_objectC.h \ - generic_objectC.inl \ - generic_objectS.cpp \ - generic_objectS.h \ - generic_objectS.inl \ - generic_objectS_T.cpp \ - generic_objectS_T.h - -CLEANFILES += \ - generic_object-stamp \ - generic_objectA.cpp \ - generic_objectA.h \ - generic_objectC.cpp \ - generic_objectC.h \ - generic_objectC.inl \ - generic_objectS.cpp \ - generic_objectS.h \ - generic_objectS.inl \ - generic_objectS_T.cpp \ - generic_objectS_T.h - -generic_objectA.cpp generic_objectA.h generic_objectC.cpp generic_objectC.h generic_objectC.inl generic_objectS.cpp generic_objectS.h generic_objectS.inl generic_objectS_T.cpp generic_objectS_T.h: generic_object-stamp - -generic_object-stamp: $(srcdir)/generic_object.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/generic_object.idl - @touch $@ - -BUILT_SOURCES += \ - keywordsA.cpp \ - keywordsA.h \ - keywordsC.cpp \ - keywordsC.h \ - keywordsC.inl \ - keywordsS.cpp \ - keywordsS.h \ - keywordsS.inl \ - keywordsS_T.cpp \ - keywordsS_T.h - -CLEANFILES += \ - keywords-stamp \ - keywordsA.cpp \ - keywordsA.h \ - keywordsC.cpp \ - keywordsC.h \ - keywordsC.inl \ - keywordsS.cpp \ - keywordsS.h \ - keywordsS.inl \ - keywordsS_T.cpp \ - keywordsS_T.h - -keywordsA.cpp keywordsA.h keywordsC.cpp keywordsC.h keywordsC.inl keywordsS.cpp keywordsS.h keywordsS.inl keywordsS_T.cpp keywordsS_T.h: keywords-stamp - -keywords-stamp: $(srcdir)/keywords.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/keywords.idl - @touch $@ - -BUILT_SOURCES += \ - pragmaA.cpp \ - pragmaA.h \ - pragmaC.cpp \ - pragmaC.h \ - pragmaC.inl \ - pragmaS.cpp \ - pragmaS.h \ - pragmaS.inl \ - pragmaS_T.cpp \ - pragmaS_T.h - -CLEANFILES += \ - pragma-stamp \ - pragmaA.cpp \ - pragmaA.h \ - pragmaC.cpp \ - pragmaC.h \ - pragmaC.inl \ - pragmaS.cpp \ - pragmaS.h \ - pragmaS.inl \ - pragmaS_T.cpp \ - pragmaS_T.h - -pragmaA.cpp pragmaA.h pragmaC.cpp pragmaC.h pragmaC.inl pragmaS.cpp pragmaS.h pragmaS.inl pragmaS_T.cpp pragmaS_T.h: pragma-stamp - -pragma-stamp: $(srcdir)/pragma.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/pragma.idl - @touch $@ - -BUILT_SOURCES += \ - repo_id_modA.cpp \ - repo_id_modA.h \ - repo_id_modC.cpp \ - repo_id_modC.h \ - repo_id_modC.inl \ - repo_id_modS.cpp \ - repo_id_modS.h \ - repo_id_modS.inl \ - repo_id_modS_T.cpp \ - repo_id_modS_T.h - -CLEANFILES += \ - repo_id_mod-stamp \ - repo_id_modA.cpp \ - repo_id_modA.h \ - repo_id_modC.cpp \ - repo_id_modC.h \ - repo_id_modC.inl \ - repo_id_modS.cpp \ - repo_id_modS.h \ - repo_id_modS.inl \ - repo_id_modS_T.cpp \ - repo_id_modS_T.h - -repo_id_modA.cpp repo_id_modA.h repo_id_modC.cpp repo_id_modC.h repo_id_modC.inl repo_id_modS.cpp repo_id_modS.h repo_id_modS.inl repo_id_modS_T.cpp repo_id_modS_T.h: repo_id_mod-stamp - -repo_id_mod-stamp: $(srcdir)/repo_id_mod.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/repo_id_mod.idl - @touch $@ - -BUILT_SOURCES += \ - typedefA.cpp \ - typedefA.h \ - typedefC.cpp \ - typedefC.h \ - typedefC.inl \ - typedefS.cpp \ - typedefS.h \ - typedefS.inl \ - typedefS_T.cpp \ - typedefS_T.h - -CLEANFILES += \ - typedef-stamp \ - typedefA.cpp \ - typedefA.h \ - typedefC.cpp \ - typedefC.h \ - typedefC.inl \ - typedefS.cpp \ - typedefS.h \ - typedefS.inl \ - typedefS_T.cpp \ - typedefS_T.h - -typedefA.cpp typedefA.h typedefC.cpp typedefC.h typedefC.inl typedefS.cpp typedefS.h typedefS.inl typedefS_T.cpp typedefS_T.h: typedef-stamp - -typedef-stamp: $(srcdir)/typedef.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/typedef.idl - @touch $@ - -BUILT_SOURCES += \ - valuetypeA.cpp \ - valuetypeA.h \ - valuetypeC.cpp \ - valuetypeC.h \ - valuetypeC.inl \ - valuetypeS.cpp \ - valuetypeS.h \ - valuetypeS.inl \ - valuetypeS_T.cpp \ - valuetypeS_T.h - -CLEANFILES += \ - valuetype-stamp \ - valuetypeA.cpp \ - valuetypeA.h \ - valuetypeC.cpp \ - valuetypeC.h \ - valuetypeC.inl \ - valuetypeS.cpp \ - valuetypeS.h \ - valuetypeS.inl \ - valuetypeS_T.cpp \ - valuetypeS_T.h - -valuetypeA.cpp valuetypeA.h valuetypeC.cpp valuetypeC.h valuetypeC.inl valuetypeS.cpp valuetypeS.h valuetypeS.inl valuetypeS_T.cpp valuetypeS_T.h: valuetype-stamp - -valuetype-stamp: $(srcdir)/valuetype.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/valuetype.idl - @touch $@ - -BUILT_SOURCES += \ - array_onlyA.cpp \ - array_onlyA.h \ - array_onlyC.cpp \ - array_onlyC.h \ - array_onlyC.inl \ - array_onlyS.cpp \ - array_onlyS.h \ - array_onlyS.inl \ - array_onlyS_T.cpp \ - array_onlyS_T.h - -CLEANFILES += \ - array_only-stamp \ - array_onlyA.cpp \ - array_onlyA.h \ - array_onlyC.cpp \ - array_onlyC.h \ - array_onlyC.inl \ - array_onlyS.cpp \ - array_onlyS.h \ - array_onlyS.inl \ - array_onlyS_T.cpp \ - array_onlyS_T.h - -array_onlyA.cpp array_onlyA.h array_onlyC.cpp array_onlyC.h array_onlyC.inl array_onlyS.cpp array_onlyS.h array_onlyS.inl array_onlyS_T.cpp array_onlyS_T.h: array_only-stamp - -array_only-stamp: $(srcdir)/array_only.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/array_only.idl - @touch $@ - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -main_SOURCES = \ - Bug_2577_RegressionC.cpp \ - Bug_2577_RegressionS.cpp \ - Bug_2582_RegressionC.cpp \ - Bug_2582_RegressionS.cpp \ - Bug_2583_RegressionC.cpp \ - Bug_2583_RegressionS.cpp \ - Bug_2616_RegressionC.cpp \ - Bug_2616_RegressionS.cpp \ - Bug_2619_RegressionC.cpp \ - Bug_2619_RegressionS.cpp \ - anonymousA.cpp \ - anonymousC.cpp \ - anonymousS.cpp \ - arrayC.cpp \ - arrayS.cpp \ - array_onlyA.cpp \ - array_onlyC.cpp \ - array_onlyS.cpp \ - constantsA.cpp \ - constantsC.cpp \ - constantsS.cpp \ - enum_in_structC.cpp \ - enum_in_structS.cpp \ - fullC.cpp \ - fullS.cpp \ - fwdC.cpp \ - fwdS.cpp \ - generic_objectA.cpp \ - generic_objectC.cpp \ - generic_objectS.cpp \ - gperfC.cpp \ - gperfS.cpp \ - includedC.cpp \ - includedS.cpp \ - includingC.cpp \ - includingS.cpp \ - interfaceC.cpp \ - interfaceS.cpp \ - keywordsA.cpp \ - keywordsC.cpp \ - keywordsS.cpp \ - main.cpp \ - nested_scopeC.cpp \ - nested_scopeS.cpp \ - paramsC.cpp \ - paramsS.cpp \ - pragmaA.cpp \ - pragmaC.cpp \ - pragmaS.cpp \ - reopen_include1C.cpp \ - reopen_include1S.cpp \ - reopen_include2C.cpp \ - reopen_include2S.cpp \ - reopened_modulesC.cpp \ - reopened_modulesS.cpp \ - repo_id_modA.cpp \ - repo_id_modC.cpp \ - repo_id_modS.cpp \ - sequenceC.cpp \ - sequenceS.cpp \ - typedefA.cpp \ - typedefC.cpp \ - typedefS.cpp \ - typeprefixC.cpp \ - typeprefixS.cpp \ - unionC.cpp \ - unionS.cpp \ - valuetypeA.cpp \ - valuetypeC.cpp \ - valuetypeS.cpp \ - Bug_2577_RegressionC.h \ - Bug_2577_RegressionC.inl \ - Bug_2577_RegressionS.h \ - Bug_2577_RegressionS.inl \ - Bug_2577_RegressionS_T.h \ - Bug_2582_RegressionC.h \ - Bug_2582_RegressionC.inl \ - Bug_2582_RegressionS.h \ - Bug_2582_RegressionS.inl \ - Bug_2582_RegressionS_T.h \ - Bug_2583_RegressionC.h \ - Bug_2583_RegressionC.inl \ - Bug_2583_RegressionS.h \ - Bug_2583_RegressionS.inl \ - Bug_2583_RegressionS_T.h \ - Bug_2616_RegressionC.h \ - Bug_2616_RegressionC.inl \ - Bug_2616_RegressionS.h \ - Bug_2616_RegressionS.inl \ - Bug_2616_RegressionS_T.h \ - Bug_2619_RegressionC.h \ - Bug_2619_RegressionC.inl \ - Bug_2619_RegressionS.h \ - Bug_2619_RegressionS.inl \ - Bug_2619_RegressionS_T.h \ - anonymousA.h \ - anonymousC.h \ - anonymousC.inl \ - anonymousS.h \ - anonymousS.inl \ - anonymousS_T.h \ - arrayC.h \ - arrayC.inl \ - arrayS.h \ - arrayS.inl \ - arrayS_T.h \ - array_onlyA.h \ - array_onlyC.h \ - array_onlyC.inl \ - array_onlyS.h \ - array_onlyS.inl \ - array_onlyS_T.h \ - constantsA.h \ - constantsC.h \ - constantsC.inl \ - constantsS.h \ - constantsS.inl \ - constantsS_T.h \ - enum_in_structC.h \ - enum_in_structC.inl \ - enum_in_structS.h \ - enum_in_structS.inl \ - enum_in_structS_T.h \ - fullC.h \ - fullC.inl \ - fullS.h \ - fullS.inl \ - fullS_T.h \ - fwdC.h \ - fwdC.inl \ - fwdS.h \ - fwdS.inl \ - fwdS_T.h \ - generic_objectA.h \ - generic_objectC.h \ - generic_objectC.inl \ - generic_objectS.h \ - generic_objectS.inl \ - generic_objectS_T.h \ - gperfC.h \ - gperfC.inl \ - gperfS.h \ - gperfS.inl \ - gperfS_T.h \ - includedC.h \ - includedC.inl \ - includedS.h \ - includedS.inl \ - includedS_T.h \ - includingC.h \ - includingC.inl \ - includingS.h \ - includingS.inl \ - includingS_T.h \ - interfaceC.h \ - interfaceC.inl \ - interfaceS.h \ - interfaceS.inl \ - interfaceS_T.h \ - keywordsA.h \ - keywordsC.h \ - keywordsC.inl \ - keywordsS.h \ - keywordsS.inl \ - keywordsS_T.h \ - nested_scopeC.h \ - nested_scopeC.inl \ - nested_scopeS.h \ - nested_scopeS.inl \ - nested_scopeS_T.h \ - paramsC.h \ - paramsC.inl \ - paramsS.h \ - paramsS.inl \ - paramsS_T.h \ - pragmaA.h \ - pragmaC.h \ - pragmaC.inl \ - pragmaS.h \ - pragmaS.inl \ - pragmaS_T.h \ - reopen_include1C.h \ - reopen_include1C.inl \ - reopen_include1S.h \ - reopen_include1S.inl \ - reopen_include1S_T.h \ - reopen_include2C.h \ - reopen_include2C.inl \ - reopen_include2S.h \ - reopen_include2S.inl \ - reopen_include2S_T.h \ - reopened_modulesC.h \ - reopened_modulesC.inl \ - reopened_modulesS.h \ - reopened_modulesS.inl \ - reopened_modulesS_T.h \ - repo_id_modA.h \ - repo_id_modC.h \ - repo_id_modC.inl \ - repo_id_modS.h \ - repo_id_modS.inl \ - repo_id_modS_T.h \ - sequenceC.h \ - sequenceC.inl \ - sequenceS.h \ - sequenceS.inl \ - sequenceS_T.h \ - typedefA.h \ - typedefC.h \ - typedefC.inl \ - typedefS.h \ - typedefS.inl \ - typedefS_T.h \ - typeprefixC.h \ - typeprefixC.inl \ - typeprefixS.h \ - typeprefixS.inl \ - typeprefixS_T.h \ - unionC.h \ - unionC.inl \ - unionS.h \ - unionS.inl \ - unionS_T.h \ - valuetypeA.h \ - valuetypeC.h \ - valuetypeC.inl \ - valuetypeS.h \ - valuetypeS.inl \ - valuetypeS_T.h - -main_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/IDL_Test/array_only.idl b/TAO/tests/IDL_Test/array_only.idl index bb791128223..bb791128223 100644..100755 --- a/TAO/tests/IDL_Test/array_only.idl +++ b/TAO/tests/IDL_Test/array_only.idl diff --git a/TAO/tests/IDL_Test/included.idl b/TAO/tests/IDL_Test/included.idl index 09bbab318ad..a8da94acedc 100644 --- a/TAO/tests/IDL_Test/included.idl +++ b/TAO/tests/IDL_Test/included.idl @@ -43,15 +43,4 @@ module VT_Def valuetype VT {}; }; -// A valuetype in valuetype.idl inherits from this one. -// In the original bug, the name for this valuetype's -// anonymous sequence member was not created in the derived -// valuetype's AST, so when the arglist for the derived -// valuetype's constructor w/arglist was generated, the member -// below was named 'sequence', which of course didn't compile. -valuetype IncludedBase -{ - public sequence<long> DeprecatedMember; -}; - #endif /* IDL_TEST_INCLUDED_IDL */ diff --git a/TAO/tests/IDL_Test/nested_scope.idl b/TAO/tests/IDL_Test/nested_scope.idl index b36ce32cdb1..d0e3dc6d966 100644 --- a/TAO/tests/IDL_Test/nested_scope.idl +++ b/TAO/tests/IDL_Test/nested_scope.idl @@ -9,7 +9,7 @@ // nested_scope.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -26,7 +26,7 @@ module skip { module hump { - struct skip {short s;}; + struct skip {short s;}; }; }; @@ -142,11 +142,11 @@ module bug_1985_c // This one caused several problems - in the stub declaration of // the operation, and in the skeleton body's allocation of return type. module Negotiator -{ +{ interface UAV_Negotiator {}; interface UAV_Negotiator_Factory : ::Negotiator::UAV_Negotiator - { + { ::Negotiator::UAV_Negotiator make_negotiator (in string bitrate_sc); }; }; @@ -154,19 +154,19 @@ module Negotiator // Caught some generation of arg helper template parameters not using // the qualifying '::' on scoped names. -module bug_2125 +module bug_2125 { - module Bar + module Bar { enum Stuff {ONE, TWO}; }; }; -module Wow +module Wow { - module bug_2125 + module bug_2125 { - interface MyInterface + interface MyInterface { void op1 (in bug_2125::Bar::Stuff fbs); void op2 (in ::bug_2125::Bar::Stuff fbs); @@ -180,8 +180,6 @@ module Company { module CORBA { - typedef unsigned long LongU; - module Inner { struct Foo diff --git a/TAO/tests/IDL_Test/valuetype.idl b/TAO/tests/IDL_Test/valuetype.idl index a31a8eb7938..eb594ec23cf 100644 --- a/TAO/tests/IDL_Test/valuetype.idl +++ b/TAO/tests/IDL_Test/valuetype.idl @@ -9,7 +9,7 @@ // valuetype.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -20,14 +20,9 @@ // // ============================================================================ -#ifndef IDL_TEST_VALUETYPE_IDL -#define IDL_TEST_VALUETYPE_IDL - -#include "included.idl" - // A valuetype factory can have exceptions, so the declaration must pull in // an #include of SystemException.h. -valuetype MyValueType +valuetype MyValueType { public string my_string_value; factory make_one (); @@ -45,12 +40,3 @@ valuetype RecValueType private sequence<RecValueType> rec_value_types; }; -// Inherits an anonymous sequence member, which was not named -// correctly in the original bug when used in the arglist for -// this valuetype's constructor from values. -valuetype GetsDeprecatedMember : IncludedBase -{ - public string StringMember; -}; - -#endif /* IDL_TEST_VALUETYPE_IDL */ diff --git a/TAO/tests/IORManipulation/.cvsignore b/TAO/tests/IORManipulation/.cvsignore new file mode 100644 index 00000000000..7fde61cf549 --- /dev/null +++ b/TAO/tests/IORManipulation/.cvsignore @@ -0,0 +1 @@ +IORTest diff --git a/TAO/tests/IORManipulation/Makefile.am b/TAO/tests/IORManipulation/Makefile.am deleted file mode 100644 index 6ce89cee981..00000000000 --- a/TAO/tests/IORManipulation/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.IORManipulation_IORTest.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = IORTest - -IORTest_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -IORTest_SOURCES = \ - IORTest.cpp - -IORTest_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am b/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am deleted file mode 100644 index dff8bc9b49b..00000000000 --- a/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am +++ /dev/null @@ -1,96 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.generate_ior.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - bogusC.cpp \ - bogusC.h \ - bogusC.inl \ - bogusS.cpp \ - bogusS.h \ - bogusS.inl - -CLEANFILES = \ - bogus-stamp \ - bogusC.cpp \ - bogusC.h \ - bogusC.inl \ - bogusS.cpp \ - bogusS.h \ - bogusS.inl - -bogusC.cpp bogusC.h bogusC.inl bogusS.cpp bogusS.h bogusS.inl: bogus-stamp - -bogus-stamp: $(srcdir)/bogus.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/bogus.idl - @touch $@ - -noinst_PROGRAMS += generate_ior - -generate_ior_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -generate_ior_SOURCES = \ - bogusC.cpp \ - bogusS.cpp \ - bogus_i.cpp \ - generate_ior.cpp \ - bogusC.h \ - bogusC.inl \ - bogusS.h \ - bogusS.inl \ - bogus_i.h - -generate_ior_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.list_interfaces.am - -noinst_PROGRAMS += list_interfaces - -list_interfaces_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -list_interfaces_SOURCES = \ - list_interfaces.cpp \ - bogus_i.h - -list_interfaces_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/IPV6/IPV6_Hello.mpc b/TAO/tests/IPV6/IPV6_Hello.mpc index 02e2ddc1120..9a1892855d9 100644 --- a/TAO/tests/IPV6/IPV6_Hello.mpc +++ b/TAO/tests/IPV6/IPV6_Hello.mpc @@ -1,36 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl + idlflags += -Sa -St Source_Files { Hello.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/IPV6/Makefile.am b/TAO/tests/IPV6/Makefile.am deleted file mode 100644 index 787fd73222f..00000000000 --- a/TAO/tests/IPV6/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.IPV6_Hello_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.IPV6_Hello_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.IPV6_Hello_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/InterOp-Naming/.cvsignore b/TAO/tests/InterOp-Naming/.cvsignore new file mode 100644 index 00000000000..aa5c0fd4566 --- /dev/null +++ b/TAO/tests/InterOp-Naming/.cvsignore @@ -0,0 +1,2 @@ +INS_test_client +INS_test_server diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc index 47fba039d91..163fd3de1c3 100644 --- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc +++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc @@ -1,39 +1,21 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - INS.idl - } - custom_only = 1 -} - -project(*Server): taoserver, utils, iortable, avoids_corba_e_micro { +project(*Server): taoserver, utils, iortable { exename = INS_test_server - after += *idl Source_Files { INS_i.cpp Server_i.cpp INS_test_server.cpp } - Source_Files { - INSC.cpp - INSS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { exename = INS_test_client - after += *idl after += *Server Source_Files { - INS_test_client.cpp - } - Source_Files { INSC.cpp - } - IDL_Files { + INS_test_client.cpp } } + diff --git a/TAO/tests/InterOp-Naming/Makefile.am b/TAO/tests/InterOp-Naming/Makefile.am deleted file mode 100644 index c7005e99c6c..00000000000 --- a/TAO/tests/InterOp-Naming/Makefile.am +++ /dev/null @@ -1,113 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.InterOp_Naming_Idl.am - -BUILT_SOURCES = \ - INSC.cpp \ - INSC.h \ - INSC.inl \ - INSS.cpp \ - INSS.h \ - INSS.inl - -CLEANFILES = \ - INS-stamp \ - INSC.cpp \ - INSC.h \ - INSC.inl \ - INSS.cpp \ - INSS.h \ - INSS.inl - -INSC.cpp INSC.h INSC.inl INSS.cpp INSS.h INSS.inl: INS-stamp - -INS-stamp: $(srcdir)/INS.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/INS.idl - @touch $@ - -noinst_HEADERS = \ - INS.idl - -## Makefile.InterOp_Naming_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += INS_test_server - -INS_test_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -INS_test_server_SOURCES = \ - INSC.cpp \ - INSS.cpp \ - INS_i.cpp \ - INS_test_server.cpp \ - Server_i.cpp \ - INS_i.h \ - Server_i.h - -INS_test_server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.InterOp_Naming_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += INS_test_client - -INS_test_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -INS_test_client_SOURCES = \ - INSC.cpp \ - INS_test_client.cpp \ - INS_i.h \ - Server_i.h - -INS_test_client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Leader_Followers/.cvsignore b/TAO/tests/Leader_Followers/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Leader_Followers/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Leader_Followers/Leader_Followers.mpc b/TAO/tests/Leader_Followers/Leader_Followers.mpc index d9ff8a0f0df..a3b794ac88f 100644 --- a/TAO/tests/Leader_Followers/Leader_Followers.mpc +++ b/TAO/tests/Leader_Followers/Leader_Followers.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, strategies { - after += *idl Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, strategies { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Leader_Followers/Makefile.am b/TAO/tests/Leader_Followers/Makefile.am deleted file mode 100644 index e63688a3796..00000000000 --- a/TAO/tests/Leader_Followers/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Leader_Followers_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Leader_Followers_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Leader_Followers_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/LongUpcalls/.cvsignore b/TAO/tests/LongUpcalls/.cvsignore new file mode 100644 index 00000000000..263d5e84f49 --- /dev/null +++ b/TAO/tests/LongUpcalls/.cvsignore @@ -0,0 +1,4 @@ +ami_client +ami_server +blocking_client +blocking_server diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc index 050e6e72952..13a0c026057 100644 --- a/TAO/tests/LongUpcalls/LongUpcalls.mpc +++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc @@ -1,71 +1,37 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, ami { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging, ami { exename = blocking_server - after += *idl Source_Files { Manager.cpp blocking_server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): messaging, taoexe, portableserver, ami { - after += *idl after += *Server Source_Files { Controller.cpp blocking_client.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*AMI_Server): taoserver, messaging, ami { exename = ami_server - after += *idl after += *Client Source_Files { AMI_Manager.cpp ami_server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*AMI_Client): messaging, taoexe, portableserver, ami { - after += *idl after += *AMI_Server Source_Files { Controller.cpp Manager_Handler.cpp ami_client.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/LongUpcalls/Makefile.am b/TAO/tests/LongUpcalls/Makefile.am deleted file mode 100644 index 06171bdb762..00000000000 --- a/TAO/tests/LongUpcalls/Makefile.am +++ /dev/null @@ -1,205 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.LongUpcalls_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.LongUpcalls_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += blocking_server - -blocking_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -blocking_server_SOURCES = \ - Manager.cpp \ - TestC.cpp \ - TestS.cpp \ - blocking_server.cpp \ - Manager.h - -blocking_server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.LongUpcalls_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += blocking_client - -blocking_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -blocking_client_SOURCES = \ - Controller.cpp \ - TestC.cpp \ - TestS.cpp \ - blocking_client.cpp \ - Controller.h - -blocking_client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.LongUpcalls_AMI_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += ami_server - -ami_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ami_server_SOURCES = \ - AMI_Manager.cpp \ - TestC.cpp \ - TestS.cpp \ - ami_server.cpp \ - AMI_Manager.h - -ami_server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.LongUpcalls_AMI_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += ami_client - -ami_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ami_client_SOURCES = \ - Controller.cpp \ - Manager_Handler.cpp \ - TestC.cpp \ - TestS.cpp \ - ami_client.cpp \ - Controller.h \ - Manager_Handler.h - -ami_client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/MProfile/.cvsignore b/TAO/tests/MProfile/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/MProfile/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc index 6f0f5e0df59..e48d767fd5c 100644 --- a/TAO/tests/MProfile/MProfile.mpc +++ b/TAO/tests/MProfile/MProfile.mpc @@ -1,36 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, iormanip { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, iormanip { - after += *idl Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, iormanip { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/MProfile/Makefile.am b/TAO/tests/MProfile/Makefile.am deleted file mode 100644 index e8a8b75a660..00000000000 --- a/TAO/tests/MProfile/Makefile.am +++ /dev/null @@ -1,112 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.MProfile_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.MProfile_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.MProfile_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/MProfile_Connection_Timeout/.cvsignore b/TAO/tests/MProfile_Connection_Timeout/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/MProfile_Connection_Timeout/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc index 57409e95046..e4abfd734d6 100644 --- a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc +++ b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc @@ -1,36 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging, iormanip { - after += *idl Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, messaging, iormanip { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/MProfile_Connection_Timeout/Makefile.am b/TAO/tests/MProfile_Connection_Timeout/Makefile.am deleted file mode 100644 index 3154b18da39..00000000000 --- a/TAO/tests/MProfile_Connection_Timeout/Makefile.am +++ /dev/null @@ -1,121 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.MProfile_Connection_Timeout_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.MProfile_Connection_Timeout_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.MProfile_Connection_Timeout_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/MProfile_Forwarding/.cvsignore b/TAO/tests/MProfile_Forwarding/.cvsignore new file mode 100644 index 00000000000..74e19e1c1de --- /dev/null +++ b/TAO/tests/MProfile_Forwarding/.cvsignore @@ -0,0 +1,3 @@ +Manager +client +server diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc index a8cd11740a7..d6f4df5acc4 100644 --- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc +++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc @@ -1,52 +1,28 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): taoserver, minimum_corba { Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*Client): taoclient, anytypecode, minimum_corba { exename = client - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } -project(*Manager): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, iormanip { +project(*Manager): taoserver, minimum_corba, iormanip { exename = manager - after += *idl after += *Client Source_Files { + testC.cpp Servant_Locator.cpp Manager.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/MProfile_Forwarding/Makefile.am b/TAO/tests/MProfile_Forwarding/Makefile.am deleted file mode 100644 index d7b57f22c0b..00000000000 --- a/TAO/tests/MProfile_Forwarding/Makefile.am +++ /dev/null @@ -1,139 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.MProfile_Forwarding_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.MProfile_Forwarding_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.MProfile_Forwarding_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - Manager.h \ - Servant_Locator.h \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.MProfile_Forwarding_Manager.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += manager - -manager_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -manager_SOURCES = \ - Manager.cpp \ - Servant_Locator.cpp \ - testC.cpp \ - Manager.h \ - Servant_Locator.h \ - test_i.inl - -manager_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp index fc690fa5cf4..fc690fa5cf4 100644..100755 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.h b/TAO/tests/MProfile_Forwarding/Servant_Locator.h index ac226fda180..ac226fda180 100644..100755 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.h +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.h diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp index 04c27ae739f..04c27ae739f 100644..100755 --- a/TAO/tests/MProfile_Forwarding/server.cpp +++ b/TAO/tests/MProfile_Forwarding/server.cpp diff --git a/TAO/tests/MProfile_Forwarding/test.idl b/TAO/tests/MProfile_Forwarding/test.idl index 1f1e6389faf..1f1e6389faf 100644..100755 --- a/TAO/tests/MProfile_Forwarding/test.idl +++ b/TAO/tests/MProfile_Forwarding/test.idl diff --git a/TAO/tests/MProfile_Forwarding/test_i.inl b/TAO/tests/MProfile_Forwarding/test_i.inl index b11bb431e1f..b11bb431e1f 100644..100755 --- a/TAO/tests/MProfile_Forwarding/test_i.inl +++ b/TAO/tests/MProfile_Forwarding/test_i.inl diff --git a/TAO/tests/MT_BiDir/.cvsignore b/TAO/tests/MT_BiDir/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/MT_BiDir/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc index f04bbed84ce..ab023c419a3 100644 --- a/TAO/tests/MT_BiDir/MT_BiDir.mpc +++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc @@ -1,42 +1,26 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Receiver.idl - Sender.idl - } - custom_only = 1 -} - -project(*Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { - after += *idl - Source_Files { - Sender_i.cpp - Server_Task.cpp - server.cpp - } +project(*Server): taoexe, portableserver, minimum_corba, bidir_giop { Source_Files { ReceiverC.cpp SenderC.cpp SenderS.cpp - } - IDL_Files { + Sender_i.cpp + Server_Task.cpp + server.cpp } } -project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro { - after += *idl - Source_Files { - Client_Task.cpp - Receiver_i.cpp - client.cpp - } +project(*Client): taoexe, portableserver, minimum_corba, bidir_giop { + after += *Server Source_Files { ReceiverC.cpp ReceiverS.cpp SenderC.cpp - } - IDL_Files { + Client_Task.cpp + Receiver_i.cpp + client.cpp } } + diff --git a/TAO/tests/MT_BiDir/Makefile.am b/TAO/tests/MT_BiDir/Makefile.am deleted file mode 100644 index 52dc0f6042e..00000000000 --- a/TAO/tests/MT_BiDir/Makefile.am +++ /dev/null @@ -1,145 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.MT_BiDir_Idl.am - -BUILT_SOURCES = \ - ReceiverC.cpp \ - ReceiverC.h \ - ReceiverC.inl \ - ReceiverS.cpp \ - ReceiverS.h \ - ReceiverS.inl - -CLEANFILES = \ - Receiver-stamp \ - ReceiverC.cpp \ - ReceiverC.h \ - ReceiverC.inl \ - ReceiverS.cpp \ - ReceiverS.h \ - ReceiverS.inl - -ReceiverC.cpp ReceiverC.h ReceiverC.inl ReceiverS.cpp ReceiverS.h ReceiverS.inl: Receiver-stamp - -Receiver-stamp: $(srcdir)/Receiver.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Receiver.idl - @touch $@ - -BUILT_SOURCES += \ - SenderC.cpp \ - SenderC.h \ - SenderC.inl \ - SenderS.cpp \ - SenderS.h \ - SenderS.inl - -CLEANFILES += \ - Sender-stamp \ - SenderC.cpp \ - SenderC.h \ - SenderC.inl \ - SenderS.cpp \ - SenderS.h \ - SenderS.inl - -SenderC.cpp SenderC.h SenderC.inl SenderS.cpp SenderS.h SenderS.inl: Sender-stamp - -Sender-stamp: $(srcdir)/Sender.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Sender.idl - @touch $@ - -noinst_HEADERS = \ - Receiver.idl \ - Sender.idl - -## Makefile.MT_BiDir_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - ReceiverC.cpp \ - ReceiverS.cpp \ - Receiver_i.cpp \ - SenderC.cpp \ - client.cpp \ - Client_Task.h \ - Receiver_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.MT_BiDir_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ReceiverC.cpp \ - SenderC.cpp \ - SenderS.cpp \ - Sender_i.cpp \ - Server_Task.cpp \ - server.cpp \ - Sender_i.h \ - Server_Task.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/MT_Client/.cvsignore b/TAO/tests/MT_Client/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/MT_Client/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc index 4c7c0e8f0a7..1974ade69bd 100644 --- a/TAO/tests/MT_Client/MT_Client.mpc +++ b/TAO/tests/MT_Client/MT_Client.mpc @@ -1,36 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl + idlflags += -Sa -St Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/MT_Client/Makefile.am b/TAO/tests/MT_Client/Makefile.am deleted file mode 100644 index 12314a2dccf..00000000000 --- a/TAO/tests/MT_Client/Makefile.am +++ /dev/null @@ -1,107 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.MT_Client_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.MT_Client_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.MT_Client_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/MT_Server/.cvsignore b/TAO/tests/MT_Server/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/MT_Server/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/MT_Server/MT_Server.mpc b/TAO/tests/MT_Server/MT_Server.mpc index aa28b25107f..bfb96e8b536 100644 --- a/TAO/tests/MT_Server/MT_Server.mpc +++ b/TAO/tests/MT_Server/MT_Server.mpc @@ -1,37 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/MT_Server/Makefile.am b/TAO/tests/MT_Server/Makefile.am deleted file mode 100644 index 1a9ac25de1c..00000000000 --- a/TAO/tests/MT_Server/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.MT_Server_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.MT_Server_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.MT_Server_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/MT_Timeout/.cvsignore b/TAO/tests/MT_Timeout/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/MT_Timeout/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc index dbf0552a387..634030e4814 100644 --- a/TAO/tests/MT_Timeout/MT_Timeout.mpc +++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc @@ -1,38 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): messaging, taoserver { - after += *idl Source_Files { Sleep_Service.cpp Server_Task.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): messaging, taoexe, portableserver { - after += *idl after += *Server Source_Files { + TestC.cpp Client_Task.cpp client.cpp } - Source_Files { - TestC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/MT_Timeout/Makefile.am b/TAO/tests/MT_Timeout/Makefile.am deleted file mode 100644 index 550a8987388..00000000000 --- a/TAO/tests/MT_Timeout/Makefile.am +++ /dev/null @@ -1,122 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.MT_Timeout_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.MT_Timeout_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_Task.cpp \ - Sleep_Service.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Server_Task.h \ - Sleep_Service.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.MT_Timeout_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Makefile.am b/TAO/tests/Makefile.am deleted file mode 100644 index dbbfea23a83..00000000000 --- a/TAO/tests/Makefile.am +++ /dev/null @@ -1,191 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - AMH_Exceptions \ - AMH_Oneway \ - AMI \ - AMI_Buffering \ - AMI_Timeouts \ - Abstract_Interface \ - Any \ - BiDirectional \ - BiDirectional_DelayedUpcall \ - BiDirectional_MultipleORB \ - BiDirectional_NestedUpcall \ - Big_AMI \ - Big_Oneways \ - Big_Reply \ - Big_Request_Muxing \ - Big_Twoways \ - Blocking_Sync_None \ - Bug_1020_Basic_Regression \ - Bug_1020_Regression \ - Bug_1254_Regression \ - Bug_1269_Regression \ - Bug_1270_Regression \ - Bug_1330_Regression \ - Bug_1361_Regression \ - Bug_1476_Regression \ - Bug_1476_Test \ - Bug_1482_Regression \ - Bug_1495_Regression \ - Bug_1535_Regression \ - Bug_1551_Regression \ - Bug_1568_Regression \ - Bug_1627_Regression \ - Bug_1635_Regression \ - Bug_1636_Regression \ - Bug_1639_Regression \ - Bug_1670_Regression \ - Bug_1676_Regression \ - Bug_1693_Test \ - Bug_1812_Regression \ - Bug_1813_Regression \ - Bug_1869_Regression \ - Bug_1904_Regression \ - Bug_2084_Regression \ - Bug_2119_Regression \ - Bug_2122_Regression \ - Bug_2124_Regression \ - Bug_2126_Regression \ - Bug_2134_Regression \ - Bug_2144_Regression \ - Bug_2174_Regression \ - Bug_2183_Regression \ - Bug_2186_Regression \ - Bug_2188_Regression \ - Bug_2201_Regression \ - Bug_2222_Regression \ - Bug_2234_Regression \ - Bug_2289_Regression \ - Bug_2319_Regression \ - Bug_2328_Regression \ - Bug_2345_Regression \ - Bug_2349_Regression \ - Bug_2375_Regression \ - Bug_2417_Regression \ - Bug_2419_Regression \ - Bug_2424_Regression \ - Bug_2429_Regression \ - Bug_2494_Regression \ - Bug_2503_Regression \ - Bug_2542_Regression \ - Bug_2543_Regression \ - Bug_2549_Regression \ - Bug_2560_Regression \ - Bug_2593_Regression \ - Bug_2595_Regression \ - Bug_2654_Regression \ - Bug_2669_Regression \ - Bug_2683_Regression \ - Bug_2702_Regression \ - CDR \ - COIOP \ - Cache_Growth_Test \ - CallbackTest \ - Client_Leaks \ - CodeSets \ - Codec \ - Collocation \ - CollocationLockup \ - Collocation_Exception_Test \ - Collocation_Oneway_Tests \ - Collocation_Opportunities \ - Collocation_Tests \ - Compression \ - Connect_Strategy_Test \ - Connection_Failure \ - Connection_Purging \ - Connection_Timeout \ - Crash_On_Write \ - Crashed_Callback \ - DII_Collocation_Tests \ - DLL_ORB \ - DSI_Gateway \ - DynAny_Test \ - Explicit_Event_Loop \ - Exposed_Policies \ - FL_Cube \ - Faults \ - File_IO \ - Forwarding \ - GIOP_Fragments \ - Hang_Shutdown \ - Hello \ - ICMG_Any_Bug \ - IDL_Test \ - IORManipulation \ - IOR_Endpoint_Hostnames \ - IPV6 \ - InterOp-Naming \ - Leader_Followers \ - LongUpcalls \ - MProfile \ - MProfile_Connection_Timeout \ - MProfile_Forwarding \ - MT_BiDir \ - MT_Client \ - MT_Server \ - MT_Timeout \ - Multiple \ - Multiple_Inheritance \ - Muxed_GIOP_Versions \ - Muxing \ - Native_Exceptions \ - NestedUpcall \ - Nested_Event_Loop \ - Nested_Upcall_Crash \ - No_Server_MT_Connect_Test \ - OBV \ - ORB_Local_Config \ - ORB_destroy \ - ORB_init \ - ORB_shutdown \ - ORT \ - Object_Loader \ - Objref_Sequence_Test \ - OctetSeq \ - Ondemand_Write \ - Oneway_Buffering \ - Oneway_Timeouts \ - Oneways_Invoking_Twoways \ - Optimized_Connection \ - POA \ - Parallel_Connect_Strategy \ - Param_Test \ - Permanent_Forward \ - Policies \ - Portable_Interceptors \ - QtTests \ - Queued_Message_Test \ - RTCORBA \ - RTScheduling \ - Reliable_Oneways \ - Sequence_Unit_Tests \ - Servant_To_Reference_Test \ - Server_Connection_Purging \ - Server_Leaks \ - Server_Port_Zero \ - Single_Read \ - Smart_Proxies \ - Stack_Recursion \ - Strategies \ - Timed_Buffered_Oneways \ - Timeout \ - TransportCurrent \ - Two_Objects \ - Typedef_String_Array \ - UNKNOWN_Exception \ - Xt_Stopwatch - -# SUBDIRS += \ -# Bug_2399_Regression \ -# CSD_Strategy_Tests diff --git a/TAO/tests/Multiple/.cvsignore b/TAO/tests/Multiple/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Multiple/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Multiple/Makefile.am b/TAO/tests/Multiple/Makefile.am deleted file mode 100644 index 62626563bbf..00000000000 --- a/TAO/tests/Multiple/Makefile.am +++ /dev/null @@ -1,113 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Multiple_Idl.am - -BUILT_SOURCES = \ - MultipleC.cpp \ - MultipleC.h \ - MultipleC.inl \ - MultipleS.cpp \ - MultipleS.h \ - MultipleS.inl - -CLEANFILES = \ - Multiple-stamp \ - MultipleC.cpp \ - MultipleC.h \ - MultipleC.inl \ - MultipleS.cpp \ - MultipleS.h \ - MultipleS.inl - -MultipleC.cpp MultipleC.h MultipleC.inl MultipleS.cpp MultipleS.h MultipleS.inl: Multiple-stamp - -Multiple-stamp: $(srcdir)/Multiple.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gd $(srcdir)/Multiple.idl - @touch $@ - -noinst_HEADERS = \ - Multiple.idl - -## Makefile.Multiple_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Collocation_Tester.cpp \ - MultipleC.cpp \ - MultipleS.cpp \ - Multiple_Impl.cpp \ - server.cpp \ - Collocation_Tester.h \ - Multiple_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Multiple_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Collocation_Tester.cpp \ - MultipleC.cpp \ - MultipleS.cpp \ - Multiple_Impl.cpp \ - client.cpp \ - Collocation_Tester.h \ - Multiple_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc index fff5e12d1e2..47b388a8e0f 100644 --- a/TAO/tests/Multiple/Multiple.mpc +++ b/TAO/tests/Multiple/Multiple.mpc @@ -1,32 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - idlflags += -Gd - IDL_Files { - Multiple.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl + idlflags += -Gd Source_Files { Multiple_Impl.cpp Collocation_Tester.cpp server.cpp } - Source_Files { - MultipleC.cpp - MultipleS.cpp - } - IDL_Files { - } } project(*Client): taoexe, portableserver { - after += *idl + idlflags += -Gd after += *Server Source_Files { @@ -34,10 +20,5 @@ project(*Client): taoexe, portableserver { Collocation_Tester.cpp client.cpp } - Source_Files { - MultipleC.cpp - MultipleS.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Multiple_Inheritance/.cvsignore b/TAO/tests/Multiple_Inheritance/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Multiple_Inheritance/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Multiple_Inheritance/Makefile.am b/TAO/tests/Multiple_Inheritance/Makefile.am deleted file mode 100644 index f8a34582f24..00000000000 --- a/TAO/tests/Multiple_Inheritance/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Multiple_Inheritance_Idl.am - -BUILT_SOURCES = \ - Multiple_InheritanceC.cpp \ - Multiple_InheritanceC.h \ - Multiple_InheritanceC.inl \ - Multiple_InheritanceS.cpp \ - Multiple_InheritanceS.h \ - Multiple_InheritanceS.inl - -CLEANFILES = \ - Multiple_Inheritance-stamp \ - Multiple_InheritanceC.cpp \ - Multiple_InheritanceC.h \ - Multiple_InheritanceC.inl \ - Multiple_InheritanceS.cpp \ - Multiple_InheritanceS.h \ - Multiple_InheritanceS.inl - -Multiple_InheritanceC.cpp Multiple_InheritanceC.h Multiple_InheritanceC.inl Multiple_InheritanceS.cpp Multiple_InheritanceS.h Multiple_InheritanceS.inl: Multiple_Inheritance-stamp - -Multiple_Inheritance-stamp: $(srcdir)/Multiple_Inheritance.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Multiple_Inheritance.idl - @touch $@ - -noinst_HEADERS = \ - Multiple_Inheritance.idl - -## Makefile.Multiple_Inheritance_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Multiple_InheritanceC.cpp \ - Multiple_InheritanceS.cpp \ - server.cpp \ - Multiple_Inheritance_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Multiple_Inheritance_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Multiple_InheritanceC.cpp \ - client.cpp \ - Multiple_Inheritance_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl index a045d5540d8..df5e183c1da 100644 --- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl +++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl @@ -5,7 +5,7 @@ interface A string method1 (); }; -interface intB : A +interface B : A { string method2 (); }; @@ -15,7 +15,7 @@ interface C : A string method3 (); }; -interface D : intB, C +interface D : B, C { string method4 (); }; diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc index 7a02f54b12f..f818ca1c940 100644 --- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc +++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc @@ -1,35 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Multiple_Inheritance.idl - } - custom_only = 1 -} - -project(*Server): taoserver, utils, avoids_corba_e_micro { - after += *idl +project(*Server): taoserver, utils { Source_Files { server.cpp } - Source_Files { - Multiple_InheritanceC.cpp - Multiple_InheritanceS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { Multiple_InheritanceC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp index ce7f8434a2f..8406386f614 100644 --- a/TAO/tests/Multiple_Inheritance/client.cpp +++ b/TAO/tests/Multiple_Inheritance/client.cpp @@ -114,7 +114,7 @@ main (int argc, char **argv) ACE_TRY_CHECK; // Narrow the object reference - intB_var b = intB::_narrow (a.in () ACE_ENV_ARG_PARAMETER); + B_var b = B::_narrow (a.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference diff --git a/TAO/tests/Muxed_GIOP_Versions/.cvsignore b/TAO/tests/Muxed_GIOP_Versions/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Muxed_GIOP_Versions/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Muxed_GIOP_Versions/Makefile.am b/TAO/tests/Muxed_GIOP_Versions/Makefile.am deleted file mode 100644 index 62f1b5d76cb..00000000000 --- a/TAO/tests/Muxed_GIOP_Versions/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Muxed_GIOP_Versions_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Muxed_GIOP_Versions_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Muxed_GIOP_Versions_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc index 95c18b6becb..bfb96e8b536 100644 --- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc +++ b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc @@ -1,37 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { testC.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Muxing/.cvsignore b/TAO/tests/Muxing/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Muxing/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Muxing/Makefile.am b/TAO/tests/Muxing/Makefile.am deleted file mode 100644 index 39d793b9b0a..00000000000 --- a/TAO/tests/Muxing/Makefile.am +++ /dev/null @@ -1,109 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Muxing_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Muxing_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Receiver.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Receiver.h \ - Server_Task.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Muxing_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc index f920367a5b4..1d115e8dc19 100644 --- a/TAO/tests/Muxing/Muxing.mpc +++ b/TAO/tests/Muxing/Muxing.mpc @@ -1,38 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { Receiver.cpp Server_Task.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { + TestC.cpp Client_Task.cpp client.cpp } - Source_Files { - TestC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp index d1cd37643c1..6ffff418f91 100644 --- a/TAO/tests/Muxing/Receiver.cpp +++ b/TAO/tests/Muxing/Receiver.cpp @@ -5,10 +5,9 @@ ACE_RCSID(Muxing, Receiver, "$Id$") -Receiver::Receiver (CORBA::ORB_ptr orb) +Receiver::Receiver (void) : message_count_ (0) , byte_count_ (0) - , orb_ (CORBA::ORB::_duplicate (orb)) { } @@ -40,10 +39,3 @@ Receiver::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->message_count_; } - -void -Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h index c297521ed30..d8db9cc926b 100644 --- a/TAO/tests/Muxing/Receiver.h +++ b/TAO/tests/Muxing/Receiver.h @@ -22,7 +22,7 @@ class Receiver { public: /// Constructor - Receiver (CORBA::ORB_ptr orb); + Receiver (void); /// Print out the results void dump_results (void); @@ -34,16 +34,10 @@ public: virtual CORBA::Long get_event_count (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - private: ACE_SYNCH_MUTEX mutex_; CORBA::ULong message_count_; CORBA::ULong byte_count_; - /// Use an ORB reference to shutdown - /// the application. - CORBA::ORB_var orb_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp index b0b3408f831..828f010158d 100644 --- a/TAO/tests/Muxing/Server_Task.cpp +++ b/TAO/tests/Muxing/Server_Task.cpp @@ -20,13 +20,8 @@ Server_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { -#if defined (ACE_OPENVMS) - // OpenVMS typically takes a lot longer... - ACE_Time_Value tv (360, 0); -#else // run the test for at most 120 seconds... ACE_Time_Value tv (120, 0); -#endif this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Muxing/Test.idl b/TAO/tests/Muxing/Test.idl index af7010bd6c0..6a3b8921c78 100644 --- a/TAO/tests/Muxing/Test.idl +++ b/TAO/tests/Muxing/Test.idl @@ -12,8 +12,5 @@ module Test /// Return the number of messages received so far long get_event_count (); - - /// A method to shutdown the ORB - oneway void shutdown (); }; }; diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp index e149b323d49..01e0b962d78 100644 --- a/TAO/tests/Muxing/client.cpp +++ b/TAO/tests/Muxing/client.cpp @@ -6,12 +6,11 @@ ACE_RCSID(Muxing, client, "$Id$") const char *ior = "file://test.ior"; -bool shutdown_srv = false; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:x"); + ACE_Get_Opt get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -20,15 +19,11 @@ parse_args (int argc, char *argv[]) case 'k': ior = get_opts.opt_arg (); break; - case 'x': - shutdown_srv = true; - break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " - "-k <ior> " - "[-x]" + "-k <ior>" "\n", argv [0]), -1); @@ -65,34 +60,24 @@ main (int argc, char *argv[]) 1); } - if (shutdown_srv) - { - receiver->shutdown (); - } - else + + Client_Task client_task (receiver.in (), + 1000, + 32768, + ACE_Thread_Manager::instance ()); + + if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1) { - - Client_Task client_task (receiver.in (), -#if defined (ACE_OPENVMS) - 750, /* test takes much longer on OpenVMS */ -#else - 1000, -#endif - 32768, - ACE_Thread_Manager::instance ()); - - if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1) - { - ACE_ERROR ((LM_ERROR, "Error activating client task\n")); - } - ACE_Thread_Manager::instance ()->wait (); - - CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n", - count)); + ACE_ERROR ((LM_ERROR, "Error activating client task\n")); } + ACE_Thread_Manager::instance ()->wait (); + + CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n", + count)); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Muxing/run_test.pl b/TAO/tests/Muxing/run_test.pl index 4dd9dbdc537..32264a0bf51 100755 --- a/TAO/tests/Muxing/run_test.pl +++ b/TAO/tests/Muxing/run_test.pl @@ -23,7 +23,7 @@ $CL2 = new PerlACE::Process ("client", " -k file://$iorfile"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; @@ -32,31 +32,21 @@ if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_cr $CL1->Spawn (60); $CL2->Spawn (60); -$max_wait = 60; -if ($^O == 'VMS') { - $max_wait = 360; -} - -$client1 = $CL1->WaitKill ($max_wait); +$client1 = $CL1->WaitKill (60); if ($client1 != 0) { print STDERR "ERROR: client 1 returned $client1\n"; $status = 1; } -$client2 = $CL2->WaitKill ($max_wait); +$client2 = $CL2->WaitKill (60); if ($client2 != 0) { print STDERR "ERROR: client 2 returned $client2\n"; $status = 1; } -# shutdown -$CLx = new PerlACE::Process ("client", " -k file://$iorfile -x"); -$CLx->Spawn (60); -$CLx->WaitKill (15); - -$server = $SV->WaitKill (15); +$server = $SV->TerminateWaitKill (5); if ($server != 0) { print STDERR "ERROR: server returned $server\n"; diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp index ad2a9a98241..06a120b2183 100644 --- a/TAO/tests/Muxing/server.cpp +++ b/TAO/tests/Muxing/server.cpp @@ -64,7 +64,7 @@ main (int argc, char *argv[]) Receiver *receiver_impl; ACE_NEW_RETURN (receiver_impl, - Receiver (orb.in ()), + Receiver, 1); PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl); diff --git a/TAO/tests/Native_Exceptions/.cvsignore b/TAO/tests/Native_Exceptions/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Native_Exceptions/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Native_Exceptions/Makefile.am b/TAO/tests/Native_Exceptions/Makefile.am deleted file mode 100644 index 6b5becb8e1c..00000000000 --- a/TAO/tests/Native_Exceptions/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Native_Exceptions_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Native_Exceptions_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Native_Exceptions_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc index 98f1c7fa090..1b292027ede 100644 --- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc +++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - Source_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): taoserver, anytypecode { - after += *idl +project(*Server): taoserver, anytypecode, exceptions { Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, anytypecode { - after += *idl +project(*Client): taoclient, anytypecode, exceptions { after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/.cvsignore b/TAO/tests/NestedUpcall/MT_Client_Test/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/NestedUpcall/MT_Client_Test/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc index 954d4141fff..35e6a89edfd 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc @@ -1,39 +1,19 @@ // -*- MPC -*- // $Id$ -project(*Nested_Upcall_Idl): taoidldefaults { - IDL_Files { - MT_Client_Test.idl - } - custom_only = 1 -} - -project(*Nested_Upcall_Server): taoserver, utils, avoids_corba_e_micro { - after += *Nested_Upcall_Idl +project(*Nested_Upcall_Server): taoserver, utils { Source_Files { MT_Object_i.cpp server.cpp } - Source_Files { - MT_Client_TestC.cpp - MT_Client_TestS.cpp - } - IDL_Files { - } } -project(*Nested_Upcall_Client): taoexe, utils, portableserver, avoids_corba_e_micro { - after += *Nested_Upcall_Idl +project(*Nested_Upcall_Client): taoexe, utils, portableserver { after += *Nested_Upcall_Server Source_Files { MT_Object_i.cpp local_server.cpp client.cpp } - Source_Files { - MT_Client_TestC.cpp - MT_Client_TestS.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.am b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.am deleted file mode 100644 index 4b7236d4dbb..00000000000 --- a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.am +++ /dev/null @@ -1,119 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.MT_Client_Test_Nested_Upcall_Idl.am - -BUILT_SOURCES = \ - MT_Client_TestC.cpp \ - MT_Client_TestC.h \ - MT_Client_TestC.inl \ - MT_Client_TestS.cpp \ - MT_Client_TestS.h \ - MT_Client_TestS.inl - -CLEANFILES = \ - MT_Client_Test-stamp \ - MT_Client_TestC.cpp \ - MT_Client_TestC.h \ - MT_Client_TestC.inl \ - MT_Client_TestS.cpp \ - MT_Client_TestS.h \ - MT_Client_TestS.inl - -MT_Client_TestC.cpp MT_Client_TestC.h MT_Client_TestC.inl MT_Client_TestS.cpp MT_Client_TestS.h MT_Client_TestS.inl: MT_Client_Test-stamp - -MT_Client_Test-stamp: $(srcdir)/MT_Client_Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/MT_Client_Test.idl - @touch $@ - -noinst_HEADERS = \ - MT_Client_Test.idl - -## Makefile.MT_Client_Test_Nested_Upcall_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - MT_Client_TestC.cpp \ - MT_Client_TestS.cpp \ - MT_Object_i.cpp \ - server.cpp \ - MT_Object_i.h \ - server.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.MT_Client_Test_Nested_Upcall_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - MT_Client_TestC.cpp \ - MT_Client_TestS.cpp \ - MT_Object_i.cpp \ - client.cpp \ - local_server.cpp \ - MT_Object_i.h \ - client.h \ - local_server.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/NestedUpcall/Makefile.am b/TAO/tests/NestedUpcall/Makefile.am deleted file mode 100644 index 5cd4e889a89..00000000000 --- a/TAO/tests/NestedUpcall/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - MT_Client_Test \ - Simple \ - Triangle_Test - diff --git a/TAO/tests/NestedUpcall/Simple/.cvsignore b/TAO/tests/NestedUpcall/Simple/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/NestedUpcall/Simple/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/NestedUpcall/Simple/Makefile.am b/TAO/tests/NestedUpcall/Simple/Makefile.am deleted file mode 100644 index 70f7fc41fab..00000000000 --- a/TAO/tests/NestedUpcall/Simple/Makefile.am +++ /dev/null @@ -1,109 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Simple_Nested_Upcall_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Simple_Nested_Upcall_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - server_i.cpp \ - testC.cpp \ - testS.cpp \ - server_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Simple_Nested_Upcall_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - client_i.cpp \ - testC.cpp \ - testS.cpp \ - client_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc index 06a89698d66..766f62db832 100644 --- a/TAO/tests/NestedUpcall/Simple/Simple.mpc +++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc @@ -1,38 +1,18 @@ // -*- MPC -*- // $Id$ -project(*Nested_Upcall_Idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Nested_Upcall_Server): taoexe, portableserver { - after += *Nested_Upcall_Idl Source_Files { server_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Nested_Upcall_Client): taoexe, portableserver { - after += *Nested_Upcall_Idl after += *Nested_Upcall_Server Source_Files { client_i.cpp client.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/NestedUpcall/Triangle_Test/.cvsignore b/TAO/tests/NestedUpcall/Triangle_Test/.cvsignore new file mode 100644 index 00000000000..67a66b46f69 --- /dev/null +++ b/TAO/tests/NestedUpcall/Triangle_Test/.cvsignore @@ -0,0 +1,3 @@ +initiator +server_A +server_B diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Makefile.am b/TAO/tests/NestedUpcall/Triangle_Test/Makefile.am deleted file mode 100644 index 34901f48553..00000000000 --- a/TAO/tests/NestedUpcall/Triangle_Test/Makefile.am +++ /dev/null @@ -1,148 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.TT_Nested_Upcall_Server_Idl.am - -BUILT_SOURCES = \ - Triangle_TestC.cpp \ - Triangle_TestC.h \ - Triangle_TestC.inl \ - Triangle_TestS.cpp \ - Triangle_TestS.h \ - Triangle_TestS.inl - -CLEANFILES = \ - Triangle_Test-stamp \ - Triangle_TestC.cpp \ - Triangle_TestC.h \ - Triangle_TestC.inl \ - Triangle_TestS.cpp \ - Triangle_TestS.h \ - Triangle_TestS.inl - -Triangle_TestC.cpp Triangle_TestC.h Triangle_TestC.inl Triangle_TestS.cpp Triangle_TestS.h Triangle_TestS.inl: Triangle_Test-stamp - -Triangle_Test-stamp: $(srcdir)/Triangle_Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Triangle_Test.idl - @touch $@ - -noinst_HEADERS = \ - Triangle_Test.idl - -## Makefile.TT_Nested_Upcall_Initiator.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += initiator - -initiator_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -initiator_SOURCES = \ - Initiator_i.cpp \ - Triangle_TestC.cpp \ - Triangle_TestS.cpp \ - initiator.cpp \ - Initiator_i.h \ - initiator.h - -initiator_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.TT_Nested_Upcall_Server_A.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server_A - -server_A_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_A_SOURCES = \ - Object_A_i.cpp \ - Triangle_TestC.cpp \ - Triangle_TestS.cpp \ - server_A.cpp \ - Object_A_i.h \ - server_A.h - -server_A_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.TT_Nested_Upcall_Server_B.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server_B - -server_B_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_B_SOURCES = \ - Object_B_i.cpp \ - Triangle_TestC.cpp \ - Triangle_TestS.cpp \ - server_B.cpp \ - Object_B_i.h \ - server_B.h - -server_B_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc index 1bb97bfa9d3..e8b0864ecd5 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc +++ b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc @@ -1,52 +1,26 @@ // -*- MPC -*- // $Id$ -project(*Nested_Upcall_Server_Idl): taoidldefaults { - IDL_Files { - Triangle_Test.idl - } - custom_only = 1 -} - -project(*Nested_Upcall_Server_A): taoexe, utils, portableserver, avoids_corba_e_micro { - after += *Nested_Upcall_Server_Idl +project(*Nested_Upcall_Server_A): taoexe, utils, portableserver { Source_Files { Object_A_i.cpp server_A.cpp } - Source_Files { - Triangle_TestC.cpp - Triangle_TestS.cpp - } - IDL_Files { - } } -project(*Nested_Upcall_Server_B): taoexe, utils, portableserver, avoids_corba_e_micro { - after += *Nested_Upcall_Server_Idl +project(*Nested_Upcall_Server_B): taoexe, utils, portableserver { + after += *Nested_Upcal_Server_A Source_Files { Object_B_i.cpp server_B.cpp } - Source_Files { - Triangle_TestC.cpp - Triangle_TestS.cpp - } - IDL_Files { - } } -project(*Nested_Upcall_Initiator): taoexe, utils, portableserver, avoids_corba_e_micro { - after += *Nested_Upcall_Server_Idl +project(*Nested_Upcall_Initiator): taoexe, utils, portableserver { + after += *Nested_Upcall_Server_B Source_Files { Initiator_i.cpp initiator.cpp } - Source_Files { - Triangle_TestC.cpp - Triangle_TestS.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Nested_Event_Loop/.cvsignore b/TAO/tests/Nested_Event_Loop/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Nested_Event_Loop/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Nested_Event_Loop/Makefile.am b/TAO/tests/Nested_Event_Loop/Makefile.am deleted file mode 100644 index 98113306dc5..00000000000 --- a/TAO/tests/Nested_Event_Loop/Makefile.am +++ /dev/null @@ -1,111 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Nested_Event_Loop_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Nested_Event_Loop_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Nested_Event_Loop_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc index 73c8c902fc0..50ef58ea252 100644 --- a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc +++ b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc @@ -1,38 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): strategies, taoexe, portableserver { - after += *idl Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): strategies, taoexe, portableserver { - after += *idl after += *Server Source_Files { test_i.cpp client.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Nested_Upcall_Crash/.cvsignore b/TAO/tests/Nested_Upcall_Crash/.cvsignore new file mode 100644 index 00000000000..553990c9618 --- /dev/null +++ b/TAO/tests/Nested_Upcall_Crash/.cvsignore @@ -0,0 +1,3 @@ +client +scavenger +server diff --git a/TAO/tests/Nested_Upcall_Crash/Makefile.am b/TAO/tests/Nested_Upcall_Crash/Makefile.am deleted file mode 100644 index f8a95f21305..00000000000 --- a/TAO/tests/Nested_Upcall_Crash/Makefile.am +++ /dev/null @@ -1,159 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Nested_Upcall_Crash_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Nested_Upcall_Crash_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Clock_Ticks.cpp \ - Server_Peer.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Clock_Ticks.h \ - Server_Peer.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Nested_Upcall_Crash_Scavenger.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += scavenger - -scavenger_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -scavenger_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - scavenger.cpp \ - Client_Peer.h \ - Clock_Ticks.h \ - Server_Peer.h - -scavenger_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Nested_Upcall_Crash_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Peer.cpp \ - Clock_Ticks.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Peer.h \ - Clock_Ticks.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc index a07b5d528e7..68469dc0fff 100644 --- a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc +++ b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc @@ -1,15 +1,7 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging { - after += *idl specific(bmake, borland, nmake, em3, vc6, vc71, vc8) { // Use a roughly 16MB stack to avoid stack overflow in this test StackReserveSize = 16000000 @@ -19,42 +11,23 @@ project(*Server): taoserver, messaging { Server_Peer.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Scavenger): taoserver, messaging { exename = scavenger - after += *idl after += *Server Source_Files { scavenger.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoserver, messaging { exename = client - after += *idl after += *Scavenger Source_Files { Clock_Ticks.cpp Client_Peer.cpp client.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/No_Server_MT_Connect_Test/.cvsignore b/TAO/tests/No_Server_MT_Connect_Test/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/No_Server_MT_Connect_Test/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/No_Server_MT_Connect_Test/Makefile.am b/TAO/tests/No_Server_MT_Connect_Test/Makefile.am deleted file mode 100644 index 599c26f9a46..00000000000 --- a/TAO/tests/No_Server_MT_Connect_Test/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.No_Server_Connect_Test_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.No_Server_Connect_Test_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.No_Server_Connect_Test_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc index aa28b25107f..bfb96e8b536 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc +++ b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc @@ -1,37 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/OBV/Any/.cvsignore b/TAO/tests/OBV/Any/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/OBV/Any/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/OBV/Any/Makefile.am b/TAO/tests/OBV/Any/Makefile.am deleted file mode 100644 index ba5caa6ec5a..00000000000 --- a/TAO/tests/OBV/Any/Makefile.am +++ /dev/null @@ -1,112 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.OBV_Any_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - AnyC.cpp \ - AnyC.h \ - AnyC.inl \ - AnyS.cpp \ - AnyS.h \ - AnyS.inl - -CLEANFILES = \ - Any-stamp \ - AnyC.cpp \ - AnyC.h \ - AnyC.inl \ - AnyS.cpp \ - AnyS.h \ - AnyS.inl - -AnyC.cpp AnyC.h AnyC.inl AnyS.cpp AnyS.h AnyS.inl: Any-stamp - -Any-stamp: $(srcdir)/Any.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Any.idl - @touch $@ - -noinst_HEADERS = \ - Any.idl - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Any_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - AnyC.cpp \ - AnyS.cpp \ - AnyS_impl.cpp \ - server.cpp \ - AnyS_impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Any_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - AnyC.cpp \ - client.cpp \ - AnyS_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc index f930c31a9d5..62083fb37f5 100644 --- a/TAO/tests/OBV/Any/OBV_Any.mpc +++ b/TAO/tests/OBV/Any/OBV_Any.mpc @@ -1,36 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, valuetype { - IDL_Files { - Any.idl - } - custom_only = 1 -} - project(*Server): taoexe, portableserver, valuetype { - after += *idl Source_Files { AnyS_impl.cpp server.cpp } - Source_Files { - AnyC.cpp - AnyS.cpp - } - IDL_Files { - } } project(*Client): taoexe, valuetype { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { AnyC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/OBV/Collocated/Forward/.cvsignore b/TAO/tests/OBV/Collocated/Forward/.cvsignore new file mode 100644 index 00000000000..9b04cc7c341 --- /dev/null +++ b/TAO/tests/OBV/Collocated/Forward/.cvsignore @@ -0,0 +1 @@ +collocated diff --git a/TAO/tests/OBV/Collocated/Forward/Makefile.am b/TAO/tests/OBV/Collocated/Forward/Makefile.am deleted file mode 100644 index 3342f2616ea..00000000000 --- a/TAO/tests/OBV/Collocated/Forward/Makefile.am +++ /dev/null @@ -1,145 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.OBV_Forward_Collocated.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TreeBaseC.cpp \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.cpp \ - TreeBaseS.h \ - TreeBaseS.inl - -CLEANFILES += \ - TreeBase-stamp \ - TreeBaseC.cpp \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.cpp \ - TreeBaseS.h \ - TreeBaseS.inl - -TreeBaseC.cpp TreeBaseC.h TreeBaseC.inl TreeBaseS.cpp TreeBaseS.h TreeBaseS.inl: TreeBase-stamp - -TreeBase-stamp: $(srcdir)/TreeBase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeBase.idl - @touch $@ - -BUILT_SOURCES += \ - TreeControllerC.cpp \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.cpp \ - TreeControllerS.h \ - TreeControllerS.inl - -CLEANFILES += \ - TreeController-stamp \ - TreeControllerC.cpp \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.cpp \ - TreeControllerS.h \ - TreeControllerS.inl - -TreeControllerC.cpp TreeControllerC.h TreeControllerC.inl TreeControllerS.cpp TreeControllerS.h TreeControllerS.inl: TreeController-stamp - -TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl - @touch $@ - -BUILT_SOURCES += \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.cpp \ - TreeNodeS.h \ - TreeNodeS.inl - -CLEANFILES += \ - TreeNode-stamp \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.cpp \ - TreeNodeS.h \ - TreeNodeS.inl - -TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp - -TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl - @touch $@ - -noinst_PROGRAMS = collocated - -collocated_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -collocated_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Server_Task.cpp \ - Test_impl.cpp \ - TreeBaseC.cpp \ - TreeBaseS.cpp \ - TreeControllerC.cpp \ - TreeControllerS.cpp \ - TreeNodeC.cpp \ - TreeNodeS.cpp \ - Client_Task.h \ - Server_Task.h \ - Test_impl.h \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.h \ - TreeBaseS.inl \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.h \ - TreeControllerS.inl \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.h \ - TreeNodeS.inl - -collocated_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/OBV/Collocated/Makefile.am b/TAO/tests/OBV/Collocated/Makefile.am deleted file mode 100644 index b00fc1a19f3..00000000000 --- a/TAO/tests/OBV/Collocated/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Forward - diff --git a/TAO/tests/OBV/Factory/.cvsignore b/TAO/tests/OBV/Factory/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/OBV/Factory/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/OBV/Factory/Makefile.am b/TAO/tests/OBV/Factory/Makefile.am deleted file mode 100644 index 463ec0a7659..00000000000 --- a/TAO/tests/OBV/Factory/Makefile.am +++ /dev/null @@ -1,115 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.OBV_Factory_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - FactoryC.cpp \ - FactoryC.h \ - FactoryC.inl \ - FactoryS.cpp \ - FactoryS.h \ - FactoryS.inl - -CLEANFILES = \ - Factory-stamp \ - FactoryC.cpp \ - FactoryC.h \ - FactoryC.inl \ - FactoryS.cpp \ - FactoryS.h \ - FactoryS.inl - -FactoryC.cpp FactoryC.h FactoryC.inl FactoryS.cpp FactoryS.h FactoryS.inl: Factory-stamp - -Factory-stamp: $(srcdir)/Factory.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Factory.idl - @touch $@ - -noinst_HEADERS = \ - Factory.idl - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Factory_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - FactoryC.cpp \ - FactoryC_impl.cpp \ - FactoryS.cpp \ - FactoryS_impl.cpp \ - server.cpp \ - FactoryC_impl.h \ - FactoryS_impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Factory_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - FactoryC.cpp \ - FactoryC_impl.cpp \ - client.cpp \ - FactoryC_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/OBV/Factory/OBV_Factory.mpc b/TAO/tests/OBV/Factory/OBV_Factory.mpc index b12ca4f383f..e257b945987 100644 --- a/TAO/tests/OBV/Factory/OBV_Factory.mpc +++ b/TAO/tests/OBV/Factory/OBV_Factory.mpc @@ -1,38 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, valuetype { - IDL_Files { - Factory.idl - } - custom_only = 1 -} - project(*Server): taoserver, valuetype { - after += *idl Source_Files { FactoryC_impl.cpp FactoryS_impl.cpp server.cpp } - Source_Files { - FactoryC.cpp - FactoryS.cpp - } - IDL_Files { - } } project(*Client): taoclient, valuetype { - after += *idl after += *Server Source_Files { + FactoryC.cpp FactoryC_impl.cpp client.cpp } - Source_Files { - FactoryC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/OBV/Forward/.cvsignore b/TAO/tests/OBV/Forward/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/OBV/Forward/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/OBV/Forward/Makefile.am b/TAO/tests/OBV/Forward/Makefile.am deleted file mode 100644 index f76f3d922b3..00000000000 --- a/TAO/tests/OBV/Forward/Makefile.am +++ /dev/null @@ -1,168 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.OBV_Forward_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TreeBaseC.cpp \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.cpp \ - TreeBaseS.h \ - TreeBaseS.inl - -CLEANFILES += \ - TreeBase-stamp \ - TreeBaseC.cpp \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.cpp \ - TreeBaseS.h \ - TreeBaseS.inl - -TreeBaseC.cpp TreeBaseC.h TreeBaseC.inl TreeBaseS.cpp TreeBaseS.h TreeBaseS.inl: TreeBase-stamp - -TreeBase-stamp: $(srcdir)/TreeBase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeBase.idl - @touch $@ - -BUILT_SOURCES += \ - TreeControllerC.cpp \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.cpp \ - TreeControllerS.h \ - TreeControllerS.inl - -CLEANFILES += \ - TreeController-stamp \ - TreeControllerC.cpp \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.cpp \ - TreeControllerS.h \ - TreeControllerS.inl - -TreeControllerC.cpp TreeControllerC.h TreeControllerC.inl TreeControllerS.cpp TreeControllerS.h TreeControllerS.inl: TreeController-stamp - -TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl - @touch $@ - -BUILT_SOURCES += \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.cpp \ - TreeNodeS.h \ - TreeNodeS.inl - -CLEANFILES += \ - TreeNode-stamp \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.cpp \ - TreeNodeS.h \ - TreeNodeS.inl - -TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp - -TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl - @touch $@ - -noinst_HEADERS = \ - TreeBase.idl \ - TreeController.idl \ - TreeNode.idl - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Forward_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Test_impl.cpp \ - TreeBaseC.cpp \ - TreeBaseS.cpp \ - TreeControllerC.cpp \ - TreeControllerS.cpp \ - TreeNodeC.cpp \ - TreeNodeS.cpp \ - server.cpp \ - Test_impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Forward_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TreeBaseC.cpp \ - TreeControllerC.cpp \ - TreeNodeC.cpp \ - client.cpp \ - Test_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/OBV/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Forward/OBV_Forward.mpc index 5068a915e27..ee6e2623910 100644 --- a/TAO/tests/OBV/Forward/OBV_Forward.mpc +++ b/TAO/tests/OBV/Forward/OBV_Forward.mpc @@ -1,44 +1,25 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, valuetype { +project(*Server): taoserver, valuetype { IDL_Files { TreeBase.idl TreeController.idl TreeNode.idl } - custom_only = 1 -} - -project(*Server): taoserver, valuetype { - after += *idl Source_Files { Test_impl.cpp server.cpp } - Source_Files { - TreeBaseC.cpp - TreeBaseS.cpp - TreeControllerC.cpp - TreeControllerS.cpp - TreeNodeC.cpp - TreeNodeS.cpp - } - IDL_Files { - } } project(*Client): taoclient, valuetype { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TreeBaseC.cpp TreeControllerC.cpp TreeNodeC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/OBV/Makefile.am b/TAO/tests/OBV/Makefile.am deleted file mode 100644 index 4e18d90f362..00000000000 --- a/TAO/tests/OBV/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Any \ - Collocated \ - Factory \ - Forward \ - Simple \ - TC_Alignment \ - Truncatable \ - ValueBox - diff --git a/TAO/tests/OBV/Simple/Makefile.am b/TAO/tests/OBV/Simple/Makefile.am deleted file mode 100644 index 33f001ede17..00000000000 --- a/TAO/tests/OBV/Simple/Makefile.am +++ /dev/null @@ -1,121 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.OBV_Simple_IDL.am - -BUILT_SOURCES = \ - OBVC.cpp \ - OBVC.h \ - OBVC.inl \ - OBVS.cpp \ - OBVS.h \ - OBVS.inl - -CLEANFILES = \ - OBV-stamp \ - OBVC.cpp \ - OBVC.h \ - OBVC.inl \ - OBVS.cpp \ - OBVS.h \ - OBVS.inl - -OBVC.cpp OBVC.h OBVC.inl OBVS.cpp OBVS.h OBVS.inl: OBV-stamp - -OBV-stamp: $(srcdir)/OBV.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa $(srcdir)/OBV.idl - @touch $@ - -noinst_HEADERS = \ - OBV.idl - -## Makefile.OBV_Simple_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_i.cpp \ - OBVC.cpp \ - OBVS.cpp \ - OBV_impl.cpp \ - client.cpp \ - Client_i.h \ - OBV_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Simple_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - OBVC.cpp \ - OBVS.cpp \ - OBV_impl.cpp \ - Server_i.cpp \ - server.cpp \ - OBV_impl.h \ - Server_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/OBV/Simple/OBV_Simple.mpc b/TAO/tests/OBV/Simple/OBV_Simple.mpc index 661a72fb220..f8c08720d20 100644 --- a/TAO/tests/OBV/Simple/OBV_Simple.mpc +++ b/TAO/tests/OBV/Simple/OBV_Simple.mpc @@ -2,7 +2,6 @@ // $Id$ project(*IDL): taoidldefaults { - idlflags -= -St IDL_Files { OBV.idl } diff --git a/TAO/tests/OBV/TC_Alignment/.cvsignore b/TAO/tests/OBV/TC_Alignment/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/OBV/TC_Alignment/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/OBV/TC_Alignment/Makefile.am b/TAO/tests/OBV/TC_Alignment/Makefile.am deleted file mode 100644 index 1b21e048ad5..00000000000 --- a/TAO/tests/OBV/TC_Alignment/Makefile.am +++ /dev/null @@ -1,112 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.OBV_TC_Alignment_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_TC_Alignment_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_TC_Alignment_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc index 27e71e69ea6..f9e3d32dc18 100644 --- a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc +++ b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc @@ -1,36 +1,20 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, valuetype { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, valuetype { - after += *idl Source_Files { + testS.cpp + testC.cpp test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, valuetype { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/OBV/Truncatable/Makefile.am b/TAO/tests/OBV/Truncatable/Makefile.am deleted file mode 100644 index 97cbaf84abd..00000000000 --- a/TAO/tests/OBV/Truncatable/Makefile.am +++ /dev/null @@ -1,141 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.OBV_Truncatable_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - ExtraC.cpp \ - ExtraC.h \ - ExtraC.inl \ - ExtraS.cpp \ - ExtraS.h \ - ExtraS.inl - -CLEANFILES += \ - Extra-stamp \ - ExtraC.cpp \ - ExtraC.h \ - ExtraC.inl \ - ExtraS.cpp \ - ExtraS.h \ - ExtraS.inl - -ExtraC.cpp ExtraC.h ExtraC.inl ExtraS.cpp ExtraS.h ExtraS.inl: Extra-stamp - -Extra-stamp: $(srcdir)/Extra.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Extra.idl - @touch $@ - -BUILT_SOURCES += \ - TruncatableC.cpp \ - TruncatableC.h \ - TruncatableC.inl \ - TruncatableS.cpp \ - TruncatableS.h \ - TruncatableS.inl - -CLEANFILES += \ - Truncatable-stamp \ - TruncatableC.cpp \ - TruncatableC.h \ - TruncatableC.inl \ - TruncatableS.cpp \ - TruncatableS.h \ - TruncatableS.inl - -TruncatableC.cpp TruncatableC.h TruncatableC.inl TruncatableS.cpp TruncatableS.h TruncatableS.inl: Truncatable-stamp - -Truncatable-stamp: $(srcdir)/Truncatable.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Truncatable.idl - @touch $@ - -noinst_HEADERS = \ - Extra.idl \ - Truncatable.idl - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Truncatable_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ExtraC.cpp \ - ExtraS.cpp \ - TruncatableC.cpp \ - TruncatableS.cpp \ - TruncatableS_impl.cpp \ - server.cpp \ - TruncatableS_impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Truncatable_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ExtraC.cpp \ - TruncatableC.cpp \ - client.cpp \ - TruncatableS_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc index 9d26a4b386b..1dbf29bc7f6 100644 --- a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc +++ b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc @@ -1,40 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, valuetype { - IDL_Files { - Extra.idl - Truncatable.idl - } - custom_only = 1 -} - project(*Server): taoexe, portableserver, valuetype { - after += *idl Source_Files { TruncatableS_impl.cpp server.cpp } - Source_Files { - ExtraC.cpp - ExtraS.cpp - TruncatableC.cpp - TruncatableS.cpp - } - IDL_Files { - } } project(*Client): taoexe, valuetype { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { ExtraC.cpp TruncatableC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp index 4f75c2cd7c8..c372ce85579 100644 --- a/TAO/tests/OBV/Truncatable/client.cpp +++ b/TAO/tests/OBV/Truncatable/client.cpp @@ -12,10 +12,6 @@ int fail = 0; int pretest = 0; int verbose = 0; -#if defined (VERIFY) -#undef VERIFY -#endif /* VERIFY */ - #define VERIFY(Condition) \ { \ if ((Condition)==0) \ diff --git a/TAO/tests/OBV/ValueBox/Makefile.am b/TAO/tests/OBV/ValueBox/Makefile.am deleted file mode 100644 index 4f382b3ec31..00000000000 --- a/TAO/tests/OBV/ValueBox/Makefile.am +++ /dev/null @@ -1,195 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.valuebox_idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - vb_basicC.cpp \ - vb_basicC.h \ - vb_basicC.inl \ - vb_basicS.cpp \ - vb_basicS.h \ - vb_basicS.inl - -CLEANFILES += \ - vb_basic-stamp \ - vb_basicC.cpp \ - vb_basicC.h \ - vb_basicC.inl \ - vb_basicS.cpp \ - vb_basicS.h \ - vb_basicS.inl - -vb_basicC.cpp vb_basicC.h vb_basicC.inl vb_basicS.cpp vb_basicS.h vb_basicS.inl: vb_basic-stamp - -vb_basic-stamp: $(srcdir)/vb_basic.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_basic.idl - @touch $@ - -BUILT_SOURCES += \ - vb_structC.cpp \ - vb_structC.h \ - vb_structC.inl \ - vb_structS.cpp \ - vb_structS.h \ - vb_structS.inl - -CLEANFILES += \ - vb_struct-stamp \ - vb_structC.cpp \ - vb_structC.h \ - vb_structC.inl \ - vb_structS.cpp \ - vb_structS.h \ - vb_structS.inl - -vb_structC.cpp vb_structC.h vb_structC.inl vb_structS.cpp vb_structS.h vb_structS.inl: vb_struct-stamp - -vb_struct-stamp: $(srcdir)/vb_struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_struct.idl - @touch $@ - -BUILT_SOURCES += \ - vb_unionC.cpp \ - vb_unionC.h \ - vb_unionC.inl \ - vb_unionS.cpp \ - vb_unionS.h \ - vb_unionS.inl - -CLEANFILES += \ - vb_union-stamp \ - vb_unionC.cpp \ - vb_unionC.h \ - vb_unionC.inl \ - vb_unionS.cpp \ - vb_unionS.h \ - vb_unionS.inl - -vb_unionC.cpp vb_unionC.h vb_unionC.inl vb_unionS.cpp vb_unionS.h vb_unionS.inl: vb_union-stamp - -vb_union-stamp: $(srcdir)/vb_union.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_union.idl - @touch $@ - -BUILT_SOURCES += \ - valueboxC.cpp \ - valueboxC.h \ - valueboxC.inl \ - valueboxS.cpp \ - valueboxS.h \ - valueboxS.inl - -CLEANFILES += \ - valuebox-stamp \ - valueboxC.cpp \ - valueboxC.h \ - valueboxC.inl \ - valueboxS.cpp \ - valueboxS.h \ - valueboxS.inl - -valueboxC.cpp valueboxC.h valueboxC.inl valueboxS.cpp valueboxS.h valueboxS.inl: valuebox-stamp - -valuebox-stamp: $(srcdir)/valuebox.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/valuebox.idl - @touch $@ - -noinst_HEADERS = \ - valuebox.idl \ - vb_basic.idl \ - vb_struct.idl \ - vb_union.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Valuebox_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Test_impl.cpp \ - server.cpp \ - valueboxC.cpp \ - valueboxS.cpp \ - vb_basicC.cpp \ - vb_basicS.cpp \ - vb_structC.cpp \ - vb_structS.cpp \ - vb_unionC.cpp \ - vb_unionS.cpp \ - Test_impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Valuebox_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - valueboxC.cpp \ - vb_basicC.cpp \ - vb_structC.cpp \ - vb_unionC.cpp \ - Test_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp index bc264fa3110..12a3eb2bbd9 100644 --- a/TAO/tests/OBV/ValueBox/client.cpp +++ b/TAO/tests/OBV/ValueBox/client.cpp @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) } -#define OBV_VERITY(Condition) \ +#define VERIFY(Condition) \ { \ if ((Condition)==0) \ { \ @@ -62,36 +62,36 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2) 1); // should be a deep copy of val1... - OBV_VERITY ( &valuebox_clone->_boxed_inout () != &valuebox->_boxed_inout () ); + VERIFY ( &valuebox_clone->_boxed_inout () != &valuebox->_boxed_inout () ); // but values should be equal - OBV_VERITY ( valuebox_clone->_value () == valuebox->_value () ); + VERIFY ( valuebox_clone->_value () == valuebox->_value () ); // Check that modifier is working. valuebox_clone->_value ( val2 ); - OBV_VERITY ( valuebox_clone->_value () != valuebox->_value () ); + VERIFY ( valuebox_clone->_value () != valuebox->_value () ); // use operator= *valuebox = val2; - OBV_VERITY ( valuebox_clone->_value () == valuebox->_value () ); + VERIFY ( valuebox_clone->_value () == valuebox->_value () ); // Check that _value and _boxed_in are the same. - OBV_VERITY ( valuebox_clone->_value () == valuebox_clone->_boxed_in () ); - OBV_VERITY ( valuebox->_value () == valuebox->_boxed_in () ); + VERIFY ( valuebox_clone->_value () == valuebox_clone->_boxed_in () ); + VERIFY ( valuebox->_value () == valuebox->_boxed_in () ); // Used _boxed_inout to change the value - OBV_VERITY ( valuebox->_value () != val1 ); + VERIFY ( valuebox->_value () != val1 ); valuebox->_boxed_inout () = val1; - OBV_VERITY ( valuebox->_value () == val1 ); + VERIFY ( valuebox->_value () == val1 ); // Use _boxed_out to access the value - OBV_VERITY ( valuebox_clone->_value () != val1 ); + VERIFY ( valuebox_clone->_value () != val1 ); valuebox_clone->_boxed_out () = val1; - OBV_VERITY ( valuebox_clone->_value () == val1 ); + VERIFY ( valuebox_clone->_value () == val1 ); // Test _copy_value CORBA::ValueBase *copy = valuebox->_copy_value (); - OBV_VERITY ( copy != 0 ); + VERIFY ( copy != 0 ); // check add_ref, remove_ref copy->_add_ref (); copy->_remove_ref (); @@ -105,10 +105,10 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2) } else { - OBV_VERITY ( down->_value () == val1 ); + VERIFY ( down->_value () == val1 ); down->_value ( val2 ); - OBV_VERITY ( down->_value () != valuebox->_value () ); - OBV_VERITY ( down->_value () == val2 ); + VERIFY ( down->_value () != valuebox->_value () ); + VERIFY ( down->_value () == val2 ); } CORBA::remove_ref (copy); @@ -148,13 +148,13 @@ int box_test_ref (BoxT *valuebox, UT &val1, UT &val2) 1); // should be a deep copy of val1... - OBV_VERITY ( &p->_boxed_inout () != &valuebox->_boxed_inout () ); + VERIFY ( &p->_boxed_inout () != &valuebox->_boxed_inout () ); p->_value ( val2 ); // deep copy - OBV_VERITY ( &p->_boxed_inout () != &valuebox->_boxed_inout () ); + VERIFY ( &p->_boxed_inout () != &valuebox->_boxed_inout () ); *valuebox = val2; // deep copy, too. - OBV_VERITY ( &p->_boxed_inout () != &valuebox->_boxed_inout () ); + VERIFY ( &p->_boxed_inout () != &valuebox->_boxed_inout () ); CORBA::remove_ref (p); @@ -287,16 +287,16 @@ int test_basic_invocations (Test * test_object) 1); VBlong *p3; - OBV_VERITY (p1->_value () == 25); - OBV_VERITY (p2->_value () == 53); + VERIFY (p1->_value () == 25); + VERIFY (p2->_value () == 53); VBlong_var result = test_object->basic_op1(p1, p2, p3); ACE_TRY_CHECK; - OBV_VERITY (p2->_value () == (53*3)); - OBV_VERITY (p3->_value () == (53*5)); - OBV_VERITY (result->_value () == (p1->_value () *3)); + VERIFY (p2->_value () == (53*3)); + VERIFY (p3->_value () == (53*5)); + VERIFY (result->_value () == (p1->_value () *3)); //============================================================ // Test method invocation with boxed value from nested module @@ -314,16 +314,16 @@ int test_basic_invocations (Test * test_object) vb_basic::M_VBlong *mp3; - OBV_VERITY (mp1->_value () == 25); - OBV_VERITY (mp2->_value () == 53); + VERIFY (mp1->_value () == 25); + VERIFY (mp2->_value () == 53); vb_basic::M_VBlong_var mresult = test_object->basic_op2(mp1, mp2, mp3); ACE_TRY_CHECK; - OBV_VERITY (mp2->_value () == (53*3)); - OBV_VERITY (mp3->_value () == (53*5)); - OBV_VERITY (mresult->_value () == (mp1->_value () *3)); + VERIFY (mp2->_value () == (53*3)); + VERIFY (mp3->_value () == (53*5)); + VERIFY (mresult->_value () == (mp1->_value () *3)); //============================================================ // Test _boxed_in(), _boxed_inout(), and _boxed_out()) @@ -337,9 +337,9 @@ int test_basic_invocations (Test * test_object) p3->_boxed_out()); ACE_TRY_CHECK; - OBV_VERITY (p2->_value () == (93*3)); - OBV_VERITY (p3->_value () == (93*5)); - OBV_VERITY (lresult == (p1->_value()*3)); + VERIFY (p2->_value () == (93*3)); + VERIFY (p3->_value () == (93*5)); + VERIFY (lresult == (p1->_value()*3)); p1->_remove_ref (); p2->_remove_ref (); @@ -373,9 +373,9 @@ int test_boxed_string() const char *string2 = "Second-string"; // Establish that we have data setup correctly... - OBV_VERITY (strcmp (string1, string2) < 0); - OBV_VERITY (strcmp (string2, string1) > 0); - OBV_VERITY (strcmp (string1, string1) == 0); + VERIFY (strcmp (string1, string2) < 0); + VERIFY (strcmp (string2, string1) > 0); + VERIFY (strcmp (string1, string1) == 0); // Make some objects, using our data VBstring *temp = 0; @@ -389,8 +389,8 @@ int test_boxed_string() VBstring(string1), // tests const char * ctor. 1); - OBV_VERITY (strcmp (vbstring1->_value(), string1) == 0); - OBV_VERITY (strcmp (vbstring2->_value(), string1) == 0); + VERIFY (strcmp (vbstring1->_value(), string1) == 0); + VERIFY (strcmp (vbstring2->_value(), string1) == 0); // Test assignment operators char *carray1 = 0; @@ -399,12 +399,12 @@ int test_boxed_string() 1); memcpy(carray1, string2, strlen(string2)); *vbstring2 = carray1; // char * (adopted by box) - OBV_VERITY ((*vbstring2)[0] == 'S'); + VERIFY ((*vbstring2)[0] == 'S'); *vbstring2 = string1; - OBV_VERITY ((*vbstring2)[0] == 'F'); + VERIFY ((*vbstring2)[0] == 'F'); CORBA::String_var svar(string2); *vbstring2 = svar; - OBV_VERITY ((*vbstring2)[0] == 'S'); + VERIFY ((*vbstring2)[0] == 'S'); // Test _value modifiers--like assignment drill above. char *carray2 = 0; @@ -413,15 +413,15 @@ int test_boxed_string() 1); memcpy(carray2, string1, strlen(string1)); vbstring2->_value(carray2); // char * (adopted by box) - OBV_VERITY ((*vbstring2)[0] == 'F'); + VERIFY ((*vbstring2)[0] == 'F'); vbstring2->_value(string2); // const char * - OBV_VERITY ((*vbstring2)[0] == 'S'); + VERIFY ((*vbstring2)[0] == 'S'); (*vbstring2)[0] = 'Y'; - OBV_VERITY ((*vbstring2)[0] != 'S'); + VERIFY ((*vbstring2)[0] != 'S'); vbstring2->_value(svar); - OBV_VERITY ((*vbstring2)[0] == 'S'); + VERIFY ((*vbstring2)[0] == 'S'); // test value accessor - OBV_VERITY ( (vbstring2->_value())[0] == 'S' ); + VERIFY ( (vbstring2->_value())[0] == 'S' ); // // Test ctors. @@ -430,9 +430,9 @@ int test_boxed_string() ACE_NEW_RETURN (vbstring3, VBstring(*vbstring2), 1); - OBV_VERITY ((*vbstring3)[0] == 'S'); + VERIFY ((*vbstring3)[0] == 'S'); (*vbstring3)[0] = 'W'; - OBV_VERITY ((*vbstring3)[0] == 'W' && (*vbstring2)[0] == 'S'); + VERIFY ((*vbstring3)[0] == 'W' && (*vbstring2)[0] == 'S'); vbstring3->_remove_ref (); // @@ -446,7 +446,7 @@ int test_boxed_string() ACE_NEW_RETURN (vbstring4, VBstring(carray3), 1); - OBV_VERITY ((*vbstring4)[0] == 'F'); + VERIFY ((*vbstring4)[0] == 'F'); vbstring4->_remove_ref (); // @@ -455,9 +455,9 @@ int test_boxed_string() ACE_NEW_RETURN (vbstring5, VBstring(svar), 1); - OBV_VERITY ((*vbstring5)[0] == 'S'); + VERIFY ((*vbstring5)[0] == 'S'); (*vbstring5)[0] = 'W'; - OBV_VERITY ((*vbstring5)[0] == 'W' && (svar.in())[0] == 'S'); + VERIFY ((*vbstring5)[0] == 'W' && (svar.in())[0] == 'S'); vbstring5->_remove_ref (); // release, as usual @@ -487,15 +487,15 @@ int test_boxed_string_invocations (Test * test_object) 1); VBstring *p3 = 0; - OBV_VERITY (strcmp(p1->_value (), "string1") == 0); - OBV_VERITY (strcmp(p2->_value (), "string2") == 0); + VERIFY (strcmp(p1->_value (), "string1") == 0); + VERIFY (strcmp(p2->_value (), "string2") == 0); VBstring_var result = test_object->string_op1(p1, p2, p3); ACE_TRY_CHECK; - OBV_VERITY (strcmp(p2->_value (), "2string") == 0); - OBV_VERITY (strcmp(p3->_value (), "2string") == 0); - OBV_VERITY (strcmp(result->_value (), "1string") == 0); + VERIFY (strcmp(p2->_value (), "2string") == 0); + VERIFY (strcmp(p3->_value (), "2string") == 0); + VERIFY (strcmp(result->_value (), "1string") == 0); //============================================================ // Test _boxed_in(), _boxed_inout(), and _boxed_out()) @@ -508,9 +508,9 @@ int test_boxed_string_invocations (Test * test_object) p3->_boxed_out()); ACE_TRY_CHECK; - OBV_VERITY (strcmp(p2->_value (), "2second string") == 0); - OBV_VERITY (strcmp(p3->_value (), "2second string") == 0); - OBV_VERITY (strcmp(sresult.in (), "1string") == 0); + VERIFY (strcmp(p2->_value (), "2second string") == 0); + VERIFY (strcmp(p3->_value (), "2second string") == 0); + VERIFY (strcmp(sresult.in (), "1string") == 0); p1->_remove_ref (); p2->_remove_ref (); @@ -551,8 +551,8 @@ int test_boxed_sequence (void) 1); VBseqlong_var vbseqlong2 (temp); - OBV_VERITY (vbseqlong1->length() == 0); - OBV_VERITY (vbseqlong2->length() == 0); + VERIFY (vbseqlong1->length() == 0); + VERIFY (vbseqlong2->length() == 0); CORBA::Long *longarray = 0; ACE_NEW_RETURN (longarray, CORBA::Long[3], @@ -567,7 +567,7 @@ int test_boxed_sequence (void) TDseqlong(10, 3, longarray, 1), 1); TDseqlong_var seqlong1 (temp2); - OBV_VERITY (seqlong1[0] == 101 && seqlong1[2] == 303); + VERIFY (seqlong1[0] == 101 && seqlong1[2] == 303); VBseqlong *vbseqlong3 = 0; ACE_NEW_RETURN (vbseqlong3, @@ -582,18 +582,18 @@ int test_boxed_sequence (void) // Test assignment and subscript operators vbseqlong2 = vbseqlong3; - OBV_VERITY (vbseqlong2->length() == 3); + VERIFY (vbseqlong2->length() == 3); VBseqlong &vbseqlong5 = *vbseqlong2.inout(); - OBV_VERITY (vbseqlong5[2] == 303); + VERIFY (vbseqlong5[2] == 303); vbseqlong5[2] = 444; - OBV_VERITY (vbseqlong5[2] == 444); - OBV_VERITY (seqlong1[0] == 101 && seqlong1[2] == 303); - OBV_VERITY ((*vbseqlong4)[0] == 101 && (*vbseqlong4)[2] == 303); + VERIFY (vbseqlong5[2] == 444); + VERIFY (seqlong1[0] == 101 && seqlong1[2] == 303); + VERIFY ((*vbseqlong4)[0] == 101 && (*vbseqlong4)[2] == 303); seqlong1[0] = 111; - OBV_VERITY ((*vbseqlong4)[0] == 111); - OBV_VERITY (vbseqlong4->maximum() == 10); + VERIFY ((*vbseqlong4)[0] == 111); + VERIFY (vbseqlong4->maximum() == 10); *vbseqlong4 = vbseqlong1->_value(); - OBV_VERITY (vbseqlong4->length() == 0); + VERIFY (vbseqlong4->length() == 0); // Test copy_value VBseqlong *vbseqlong6 = VBseqlong::_downcast( vbseqlong4->_copy_value() ); @@ -604,7 +604,7 @@ int test_boxed_sequence (void) } else { - OBV_VERITY (vbseqlong6->length() == 0); + VERIFY (vbseqlong6->length() == 0); vbseqlong6->_remove_ref (); } @@ -649,24 +649,24 @@ int test_boxed_sequence_invocations (Test * test_object) (*p2)[1] = 99; (*p2)[2] = 98; - OBV_VERITY ((*p1)[0] == 10); - OBV_VERITY ((*p1)[1] == 9); - OBV_VERITY ((*p1)[2] == 8); - OBV_VERITY ((*p1)[3] == 7); + VERIFY ((*p1)[0] == 10); + VERIFY ((*p1)[1] == 9); + VERIFY ((*p1)[2] == 8); + VERIFY ((*p1)[3] == 7); VBseqlong_var result = test_object->seq_op1(p1, p2, p3); ACE_TRY_CHECK; - OBV_VERITY ((*p2)[0] == 100*3); - OBV_VERITY ((*p2)[1] == 99*3); - OBV_VERITY ((*p2)[2] == 98*3); - OBV_VERITY ((*p3)[0] == 100*5); - OBV_VERITY ((*p3)[1] == 99*5); - OBV_VERITY ((*p3)[2] == 98*5); - OBV_VERITY ((*result.in ())[0] == 10); - OBV_VERITY ((*result.in ())[1] == 9); - OBV_VERITY ((*result.in ())[2] == 8); - OBV_VERITY ((*result.in ())[3] == 7); + VERIFY ((*p2)[0] == 100*3); + VERIFY ((*p2)[1] == 99*3); + VERIFY ((*p2)[2] == 98*3); + VERIFY ((*p3)[0] == 100*5); + VERIFY ((*p3)[1] == 99*5); + VERIFY ((*p3)[2] == 98*5); + VERIFY ((*result.in ())[0] == 10); + VERIFY ((*result.in ())[1] == 9); + VERIFY ((*result.in ())[2] == 8); + VERIFY ((*result.in ())[3] == 7); //============================================================ // Test _boxed_in(), _boxed_inout(), and _boxed_out()) @@ -676,13 +676,13 @@ int test_boxed_sequence_invocations (Test * test_object) p3->_boxed_out()); ACE_TRY_CHECK; - OBV_VERITY ((*p2)[0] == 100*3*3); - OBV_VERITY ((*p2)[1] == 99*3*3); - OBV_VERITY ((*p2)[2] == 98*3*3); - OBV_VERITY ((*p3)[0] == (*p1)[0]*5); - OBV_VERITY ((*p3)[1] == (*p1)[1]*5); - OBV_VERITY ((*p3)[2] == (*p1)[2]*5); - OBV_VERITY ((*p3)[3] == (*p1)[3]*5); + VERIFY ((*p2)[0] == 100*3*3); + VERIFY ((*p2)[1] == 99*3*3); + VERIFY ((*p2)[2] == 98*3*3); + VERIFY ((*p3)[0] == (*p1)[0]*5); + VERIFY ((*p3)[1] == (*p1)[1]*5); + VERIFY ((*p3)[2] == (*p1)[2]*5); + VERIFY ((*p3)[3] == (*p1)[3]*5); p1->_remove_ref (); p2->_remove_ref (); @@ -735,19 +735,19 @@ int test_boxed_struct (void) 1); VBfixed_struct1_var valuebox2 = valuebox2_ptr; - OBV_VERITY (valuebox1->l () == valuebox2->l ()); - OBV_VERITY ((valuebox1->abstruct ()).s1 == (valuebox2->abstruct ()).s1 ); - OBV_VERITY ((valuebox1->abstruct ()).s2 == (valuebox2->abstruct ()).s2 ); + VERIFY (valuebox1->l () == valuebox2->l ()); + VERIFY ((valuebox1->abstruct ()).s1 == (valuebox2->abstruct ()).s1 ); + VERIFY ((valuebox1->abstruct ()).s2 == (valuebox2->abstruct ()).s2 ); // Change an element valuebox1->l (505); - OBV_VERITY (valuebox1->l () != valuebox2->l ()); + VERIFY (valuebox1->l () != valuebox2->l ()); // Change some more, to test other types. (valuebox2->abstruct ()).s1 = 667; - OBV_VERITY ((valuebox1->abstruct ()).s1 != (valuebox2->abstruct ()).s1 ); + VERIFY ((valuebox1->abstruct ()).s1 != (valuebox2->abstruct ()).s1 ); (valuebox2->abstruct ()).s2 = 1667; - OBV_VERITY ((valuebox1->abstruct ()).s2 != (valuebox2->abstruct ()).s2 ); + VERIFY ((valuebox1->abstruct ()).s2 != (valuebox2->abstruct ()).s2 ); Fixed_Struct1 *fixed_struct_b = 0; ACE_NEW_RETURN (fixed_struct_b, @@ -766,15 +766,15 @@ int test_boxed_struct (void) // Test assignment operator *valuebox3 = *fixed_struct_b; - OBV_VERITY (valuebox3->l () == fixed_struct_b->l); - OBV_VERITY ((valuebox3->abstruct ()).s1 == fixed_struct_b->abstruct.s1); - OBV_VERITY ((valuebox3->abstruct ()).s2 == fixed_struct_b->abstruct.s2); + VERIFY (valuebox3->l () == fixed_struct_b->l); + VERIFY ((valuebox3->abstruct ()).s1 == fixed_struct_b->abstruct.s1); + VERIFY ((valuebox3->abstruct ()).s2 == fixed_struct_b->abstruct.s2); // Test _value modifier method valuebox2->_value (*fixed_struct_b); - OBV_VERITY (valuebox2->l () == fixed_struct_b->l); - OBV_VERITY ((valuebox2->abstruct ()).s1 == fixed_struct_b->abstruct.s1); - OBV_VERITY ((valuebox2->abstruct ()).s2 == fixed_struct_b->abstruct.s2); + VERIFY (valuebox2->l () == fixed_struct_b->l); + VERIFY ((valuebox2->abstruct ()).s1 == fixed_struct_b->abstruct.s1); + VERIFY ((valuebox2->abstruct ()).s2 == fixed_struct_b->abstruct.s2); // Test _copy_value and _downcast VBfixed_struct1_var valuebox4 = @@ -786,9 +786,9 @@ int test_boxed_struct (void) } else { - OBV_VERITY (valuebox4->l () == fixed_struct_b->l); - OBV_VERITY ((valuebox4->abstruct ()).s1 == fixed_struct_b->abstruct.s1); - OBV_VERITY ((valuebox4->abstruct ()).s2 == fixed_struct_b->abstruct.s2); + VERIFY (valuebox4->l () == fixed_struct_b->l); + VERIFY ((valuebox4->abstruct ()).s1 == fixed_struct_b->abstruct.s1); + VERIFY ((valuebox4->abstruct ()).s2 == fixed_struct_b->abstruct.s2); } // @@ -843,24 +843,24 @@ int test_boxed_struct_invocations (Test * test_object) VBfixed_struct1 *p3; - OBV_VERITY (p1->l() == 29); - OBV_VERITY ((p1->abstruct()).s1 == 117); - OBV_VERITY ((p1->abstruct()).s2 == 21); + VERIFY (p1->l() == 29); + VERIFY ((p1->abstruct()).s1 == 117); + VERIFY ((p1->abstruct()).s2 == 21); VBfixed_struct1_var result = test_object->struct_op1(p1, p2, p3); ACE_TRY_CHECK; - OBV_VERITY (p2->l() == 92*3); - OBV_VERITY ((p2->abstruct()).s1 == 171*3); - OBV_VERITY ((p2->abstruct()).s2 == 12*3); + VERIFY (p2->l() == 92*3); + VERIFY ((p2->abstruct()).s1 == 171*3); + VERIFY ((p2->abstruct()).s2 == 12*3); - OBV_VERITY (p3->l() == 92*5); - OBV_VERITY ((p3->abstruct()).s1 == 171*5); - OBV_VERITY ((p3->abstruct()).s2 == 12*5); + VERIFY (p3->l() == 92*5); + VERIFY ((p3->abstruct()).s1 == 171*5); + VERIFY ((p3->abstruct()).s2 == 12*5); - OBV_VERITY (result->l() == fs1.l); - OBV_VERITY ((result->abstruct()).s1 == fs1.abstruct.s1); - OBV_VERITY ((result->abstruct()).s2 == fs1.abstruct.s2); + VERIFY (result->l() == fs1.l); + VERIFY ((result->abstruct()).s1 == fs1.abstruct.s1); + VERIFY ((result->abstruct()).s2 == fs1.abstruct.s2); //============================================================ // Fixed struct @@ -870,13 +870,13 @@ int test_boxed_struct_invocations (Test * test_object) test_object->struct_op2(p1->_boxed_in(), p2->_boxed_inout(), p3->_boxed_out()); - OBV_VERITY (p2->l() == 92*3*3); - OBV_VERITY ((p2->abstruct()).s1 == 171*3*3); - OBV_VERITY ((p2->abstruct()).s2 == 12*3*3); + VERIFY (p2->l() == 92*3*3); + VERIFY ((p2->abstruct()).s1 == 171*3*3); + VERIFY ((p2->abstruct()).s2 == 12*3*3); - OBV_VERITY (p3->l() == fs1.l); - OBV_VERITY ((p3->abstruct()).s1 == fs1.abstruct.s1); - OBV_VERITY ((p3->abstruct()).s2 == fs1.abstruct.s2); + VERIFY (p3->l() == fs1.l); + VERIFY ((p3->abstruct()).s1 == fs1.abstruct.s1); + VERIFY ((p3->abstruct()).s2 == fs1.abstruct.s2); p1->_remove_ref (); @@ -910,20 +910,20 @@ int test_boxed_struct_invocations (Test * test_object) VBvariable_struct1 *p6; - OBV_VERITY (p4->l() == 29); - OBV_VERITY (strcmp(p4->str(), "variable1") == 0); + VERIFY (p4->l() == 29); + VERIFY (strcmp(p4->str(), "variable1") == 0); VBvariable_struct1_var result2 = test_object->struct_op3(p4, p5, p6); ACE_TRY_CHECK; - OBV_VERITY (p5->l() == vs2.l*3); - OBV_VERITY (strcmp(p5->str(), "2variable") == 0); + VERIFY (p5->l() == vs2.l*3); + VERIFY (strcmp(p5->str(), "2variable") == 0); - OBV_VERITY (p6->l() == vs2.l*3); - OBV_VERITY (strcmp(p6->str(), "2variable") == 0); + VERIFY (p6->l() == vs2.l*3); + VERIFY (strcmp(p6->str(), "2variable") == 0); - OBV_VERITY (result2->l() == vs1.l); - OBV_VERITY (strcmp(result2->str(), vs1.str) == 0); + VERIFY (result2->l() == vs1.l); + VERIFY (strcmp(result2->str(), vs1.str) == 0); //============================================================ @@ -935,11 +935,11 @@ int test_boxed_struct_invocations (Test * test_object) p6->_boxed_out()); ACE_TRY_CHECK; - OBV_VERITY (p5->l() == vs2.l*3*3); - OBV_VERITY (strcmp(p5->str(), "e2variabl") == 0); + VERIFY (p5->l() == vs2.l*3*3); + VERIFY (strcmp(p5->str(), "e2variabl") == 0); - OBV_VERITY (p6->l() == vs1.l); - OBV_VERITY (strcmp(p6->str(), vs1.str) == 0); + VERIFY (p6->l() == vs1.l); + VERIFY (strcmp(p6->str(), vs1.str) == 0); p4->_remove_ref (); @@ -988,34 +988,34 @@ int test_boxed_array() VBlongarray(*valuebox2), 1); - OBV_VERITY ((*valuebox2)[0] == 101 + VERIFY ((*valuebox2)[0] == 101 && valuebox2->_value()[1] == 202 && valuebox2->_value()[2] == 303); - OBV_VERITY ((*valuebox3)[0] == 101 + VERIFY ((*valuebox3)[0] == 101 && (*valuebox3)[1] == 202 && (*valuebox3)[2] == 303); (*valuebox3)[0] = 111; valuebox3->_value()[1] = 222; - OBV_VERITY ((*valuebox2)[0] == 101 + VERIFY ((*valuebox2)[0] == 101 && (*valuebox2)[1] == 202 && (*valuebox2)[2] == 303); - OBV_VERITY ((*valuebox3)[0] == 111 + VERIFY ((*valuebox3)[0] == 111 && (*valuebox3)[1] == 222 && (*valuebox3)[2] == 303); *valuebox1 = la; - OBV_VERITY ((*valuebox1)[0] == 101 + VERIFY ((*valuebox1)[0] == 101 && valuebox1->_value()[1] == 202 && valuebox1->_value()[2] == 303); valuebox2->_value(la); - OBV_VERITY ((*valuebox2)[0] == 101 + VERIFY ((*valuebox2)[0] == 101 && valuebox2->_value()[1] == 202 && valuebox2->_value()[2] == 303); @@ -1024,7 +1024,7 @@ int test_boxed_array() *valuebox2 = valuebox3->_value(); valuebox3->_value()[1] = 777; - OBV_VERITY ((*valuebox2)[0] == 111 + VERIFY ((*valuebox2)[0] == 111 && valuebox2->_value()[1] == 222 && valuebox2->_value()[2] == 303); @@ -1069,7 +1069,7 @@ int test_boxed_array_invocations (Test * test_object) VBlongarray (la2), 1); - OBV_VERITY ((*p1)[0] == 101 + VERIFY ((*p1)[0] == 101 && (*p1)[1] == 202 && (*p1)[2] == 303); @@ -1078,15 +1078,15 @@ int test_boxed_array_invocations (Test * test_object) VBlongarray_var result = test_object->array_op1 (p1, p2, p3); ACE_TRY_CHECK; - OBV_VERITY ((*p2)[0] == (3101*3) + VERIFY ((*p2)[0] == (3101*3) && (*p2)[1] == (3202*3) && (*p3)[2] == (3303*3)); - OBV_VERITY ((*p3)[0] == (3101*3) + VERIFY ((*p3)[0] == (3101*3) && (*p3)[1] == (3202*3) && (*p3)[2] == (3303*3)); - OBV_VERITY ((*result.in ())[0] == 101 + VERIFY ((*result.in ())[0] == 101 && (*result.in ())[1] == 202 && (*result.in ())[2] == 303); @@ -1102,11 +1102,11 @@ int test_boxed_array_invocations (Test * test_object) p3->_boxed_out()); ACE_TRY_CHECK; - OBV_VERITY ((*p2)[0] == (3101*3*3) + VERIFY ((*p2)[0] == (3101*3*3) && (*p2)[1] == (3202*3*3) && (*p2)[2] == (3303*3*3)); - OBV_VERITY ((*p3)[0] == (*p1)[0] + VERIFY ((*p3)[0] == (*p1)[0] && (*p3)[1] == (*p1)[1] && (*p3)[2] == (*p1)[2]); #endif @@ -1138,19 +1138,19 @@ int test_boxed_array_invocations (Test * test_object) VBstringarray (sa2), 1); - OBV_VERITY (strcmp((*p4)[0], sa[0]) == 0); - OBV_VERITY (strcmp((*p4)[1], sa[1]) == 0); + VERIFY (strcmp((*p4)[0], sa[0]) == 0); + VERIFY (strcmp((*p4)[1], sa[1]) == 0); VBstringarray *p6; VBstringarray_var result2 = test_object->array_op3 (p4, p5, p6); - OBV_VERITY (strcmp((*p5)[0], "1inout string") == 0); - OBV_VERITY (strcmp((*p5)[1], "2inout string") == 0); - OBV_VERITY (strcmp((*p6)[0], "1inout string") == 0); - OBV_VERITY (strcmp((*p6)[1], "2inout string") == 0); - OBV_VERITY (strcmp((*result2.in ())[0], sa[0]) == 0); - OBV_VERITY (strcmp((*result2.in ())[1], sa[1]) == 0); + VERIFY (strcmp((*p5)[0], "1inout string") == 0); + VERIFY (strcmp((*p5)[1], "2inout string") == 0); + VERIFY (strcmp((*p6)[0], "1inout string") == 0); + VERIFY (strcmp((*p6)[1], "2inout string") == 0); + VERIFY (strcmp((*result2.in ())[0], sa[0]) == 0); + VERIFY (strcmp((*result2.in ())[1], sa[1]) == 0); //============================================================ // Array (variable) @@ -1177,10 +1177,10 @@ int test_boxed_array_invocations (Test * test_object) ACE_DEBUG ((LM_DEBUG, "(%P|%t) p5[1]=%s\n", (const char *)((*p5)[1]))); ACE_DEBUG ((LM_DEBUG, "(%P|%t) p6[0]=%s\n", (const char *)((*p6)[0]))); ACE_DEBUG ((LM_DEBUG, "(%P|%t) p6[1]=%s\n", (const char *)((*p6)[1]))); - OBV_VERITY (strcmp((*p5)[0], "g1inout strin") == 0); - OBV_VERITY (strcmp((*p5)[1], "g2inout strin") == 0); - OBV_VERITY (strcmp((*p6)[0], sa[0]) == 0); - OBV_VERITY (strcmp((*p6)[1], sa[1]) == 0); + VERIFY (strcmp((*p5)[0], "g1inout strin") == 0); + VERIFY (strcmp((*p5)[1], "g2inout strin") == 0); + VERIFY (strcmp((*p6)[0], sa[0]) == 0); + VERIFY (strcmp((*p6)[1], sa[1]) == 0); #endif p4->_remove_ref (); @@ -1228,25 +1228,25 @@ int test_boxed_union() // Test modifiers, accessors, discriminant access valuebox1->m1 (37); - OBV_VERITY (valuebox1->m1 () == 37); - OBV_VERITY (valuebox1->_d () == 1 || valuebox1->_d () == 2); + VERIFY (valuebox1->m1 () == 37); + VERIFY (valuebox1->_d () == 1 || valuebox1->_d () == 2); // Explicitly set discriminant, make sure thats the only thing // that changes. valuebox1->_d (2); - OBV_VERITY (valuebox1->_d () == 2); - OBV_VERITY (valuebox1->m1 () == 37); + VERIFY (valuebox1->_d () == 2); + VERIFY (valuebox1->m1 () == 37); valuebox1->_d (1); - OBV_VERITY (valuebox1->_d () == 1); - OBV_VERITY (valuebox1->m1 () == 37); + VERIFY (valuebox1->_d () == 1); + VERIFY (valuebox1->m1 () == 37); // Use _value() to access valuebox1->_value ()._d (2); - OBV_VERITY (valuebox1->_d () == 2); + VERIFY (valuebox1->_d () == 2); // Use _value as modifier. valuebox1->_value (fixed_union1.in()); - OBV_VERITY (valuebox1->_d () != 1 && valuebox1->_d () != 2); + VERIFY (valuebox1->_d () != 1 && valuebox1->_d () != 2); // VBfixed_union1* valuebox2_ptr = 0; @@ -1255,7 +1255,7 @@ int test_boxed_union() 1); VBfixed_union1_var valuebox2 (valuebox2_ptr); valuebox2->m2(333); - OBV_VERITY (valuebox2->_d () == 2); + VERIFY (valuebox2->_d () == 2); // Test copy ctor VBfixed_union1* valuebox3_ptr = 0; @@ -1263,14 +1263,14 @@ int test_boxed_union() VBfixed_union1 (*valuebox2.in ()), 1); VBfixed_union1_var valuebox3 (valuebox3_ptr); - OBV_VERITY (valuebox3->_d () == 2); - OBV_VERITY (valuebox3->m2 () == 333); + VERIFY (valuebox3->_d () == 2); + VERIFY (valuebox3->m2 () == 333); // Test assignment op valuebox3->m2 (456); *valuebox3.in () = valuebox2->_value (); - OBV_VERITY (valuebox3->_d () == 2); - OBV_VERITY (valuebox3->m2 () == 333); + VERIFY (valuebox3->_d () == 2); + VERIFY (valuebox3->m2 () == 333); // Test constructor taking union argument fixed_union1->m2 (137); @@ -1279,8 +1279,8 @@ int test_boxed_union() VBfixed_union1 (fixed_union1.in ()), 1); VBfixed_union1_var valuebox4 (valuebox4_ptr); - OBV_VERITY (valuebox4->m2 () == 137); - OBV_VERITY (valuebox4->_d () == 1 || valuebox4->_d () == 2); + VERIFY (valuebox4->m2 () == 137); + VERIFY (valuebox4->_d () == 1 || valuebox4->_d () == 2); return fail; } @@ -1322,22 +1322,22 @@ int test_boxed_union_invocations (Test * test_object) VBfixed_union1 (fixed_union2.in ()), 1); - OBV_VERITY (p1->_d () == 1); - OBV_VERITY (p1->m1 () == 321); - OBV_VERITY (p2->_d () == 2); - OBV_VERITY (p2->m2 () == 789); + VERIFY (p1->_d () == 1); + VERIFY (p1->m1 () == 321); + VERIFY (p2->_d () == 2); + VERIFY (p2->m2 () == 789); VBfixed_union1 * p3; VBfixed_union1_var result = test_object->union_op1 (p1, p2, p3); ACE_TRY_CHECK; - OBV_VERITY (p2->_d () == 2); - OBV_VERITY (p2->m2 () == 789*3); - OBV_VERITY (p3->_d () == 1); - OBV_VERITY (p3->m1 () == 321*3); - OBV_VERITY (result->_d () == 1); - OBV_VERITY (result->m1 () == 321*3); + VERIFY (p2->_d () == 2); + VERIFY (p2->m2 () == 789*3); + VERIFY (p3->_d () == 1); + VERIFY (p3->m1 () == 321*3); + VERIFY (result->_d () == 1); + VERIFY (result->m1 () == 321*3); //============================================================ @@ -1348,11 +1348,11 @@ int test_boxed_union_invocations (Test * test_object) test_object->union_op2(p1->_boxed_in(), p2->_boxed_inout(), p3->_boxed_out()); - OBV_VERITY (p2->_d () == 2); - OBV_VERITY (p2->m2 () == 789*3*3); + VERIFY (p2->_d () == 2); + VERIFY (p2->m2 () == 789*3*3); - OBV_VERITY (p3->_d () == 1); - OBV_VERITY (p3->m1 () == 321); + VERIFY (p3->_d () == 1); + VERIFY (p3->m1 () == 321); p1->_remove_ref (); p2->_remove_ref (); @@ -1383,22 +1383,22 @@ int test_boxed_union_invocations (Test * test_object) VBvariable_union1 (variable_union2.in ()), 1); - OBV_VERITY (p4->_d () == 1); - OBV_VERITY (p4->m1 () == 321); - OBV_VERITY (p5->_d () == 2); - OBV_VERITY (strcmp(p5->m2 (), "abracadabra") == 0); + VERIFY (p4->_d () == 1); + VERIFY (p4->m1 () == 321); + VERIFY (p5->_d () == 2); + VERIFY (strcmp(p5->m2 (), "abracadabra") == 0); VBvariable_union1 * p6; VBvariable_union1_var result2 = test_object->union_op3 (p4, p5, p6); ACE_TRY_CHECK; - OBV_VERITY (p5->_d () == 2); - OBV_VERITY (strcmp(p5->m2 (), "aabracadabr") == 0); - OBV_VERITY (p6->_d () == 1); - OBV_VERITY (p6->m1 () == 321); - OBV_VERITY (result2->_d () == 1); - OBV_VERITY (result2->m1 () == 321); + VERIFY (p5->_d () == 2); + VERIFY (strcmp(p5->m2 (), "aabracadabr") == 0); + VERIFY (p6->_d () == 1); + VERIFY (p6->m1 () == 321); + VERIFY (result2->_d () == 1); + VERIFY (result2->m1 () == 321); //============================================================ // Union (variable) @@ -1411,11 +1411,11 @@ int test_boxed_union_invocations (Test * test_object) p6->_boxed_out()); ACE_TRY_CHECK; - OBV_VERITY (p5->_d () == 2); - OBV_VERITY (strcmp(p5->m2 (), "raabracadab") == 0); + VERIFY (p5->_d () == 2); + VERIFY (strcmp(p5->m2 (), "raabracadab") == 0); - OBV_VERITY (p6->_d () == 1); - OBV_VERITY (p6->m1 () == 1722); + VERIFY (p6->_d () == 1); + VERIFY (p6->m1 () == 1722); p4->_remove_ref (); p5->_remove_ref (); diff --git a/TAO/tests/OBV/ValueBox/valuebox.mpc b/TAO/tests/OBV/ValueBox/valuebox.mpc index f776106f692..64145b1880f 100644 --- a/TAO/tests/OBV/ValueBox/valuebox.mpc +++ b/TAO/tests/OBV/ValueBox/valuebox.mpc @@ -1,22 +1,13 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, valuetype { +project(*Server): taoserver, valuetype { IDL_Files { vb_basic.idl vb_struct.idl vb_union.idl valuebox.idl } - custom_only = 1 -} - -project(*Server): taoserver, valuetype { - after += *idl - Source_Files { - Test_impl.cpp - server.cpp - } Source_Files { vb_basicC.cpp vb_basicS.cpp @@ -26,23 +17,18 @@ project(*Server): taoserver, valuetype { vb_unionS.cpp valueboxC.cpp valueboxS.cpp - } - IDL_Files { + Test_impl.cpp + server.cpp } } project(*Client): taoclient, valuetype { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { vb_basicC.cpp vb_structC.cpp vb_unionC.cpp valueboxC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc b/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc index b1f403cb3ff..31c098be24e 100644 --- a/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc +++ b/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc @@ -4,13 +4,7 @@ project(*) : taoserver { exename = Test - - specific(automake) { - includes += $(srcdir)/../lib - } else { - includes += ../lib - } - + includes += ../lib Source_Files { Test.cpp } diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Makefile.am b/TAO/tests/ORB_Local_Config/Bug_1459/Makefile.am deleted file mode 100644 index 07f2cdbbe15..00000000000 --- a/TAO/tests/ORB_Local_Config/Bug_1459/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_1459.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp - -Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc b/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc deleted file mode 100644 index 88f1ede13cf..00000000000 --- a/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc +++ /dev/null @@ -1,26 +0,0 @@ - -// $Id$ - -project (DllOrb) : taolib, portableserver { - - dynamicflags = DLLORB_BUILD_DLL - - source_files { - DllOrb.cpp - } - header_files { - DllOrb.h - DllOrb_Export.h - } -} - -project : taoexe { - - exename = Test - - after += DllOrb - - source_files { - Test.cpp - } -} diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp deleted file mode 100644 index fe629b8d48d..00000000000 --- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp +++ /dev/null @@ -1,236 +0,0 @@ -/* - * @author Iliyan jeliazkov <iliyan@ociweb.com> - * @author Lothar Werzinger <lothar@tradescape.biz> - * - * $Id$ - */ - - -#include "ace/Arg_Shifter.h" -#include "ace/SString.h" -#include "ace/OS_NS_unistd.h" - -#include "tao/corba.h" -#include "tao/TAO_Singleton_Manager.h" - -#include "DllOrb.h" - - -DllOrb::DllOrb (int nthreads) -: - m_nthreads_ (nthreads), - m_failPrePostInit(0), -#if defined (ACE_HAS_THREADS) - mp_barrier(0), -#endif - mv_orb(), - mv_rootPOA() -{ -} - -DllOrb::~DllOrb ( ) - throw () -{ -#if defined (ACE_HAS_THREADS) - delete mp_barrier; -#endif -} - - -int DllOrb::init (int argc, char *argv[]) -{ - int result = 0; - int threadCnt = this->m_nthreads_; - - try - { - ACE_Arg_Shifter as(argc, argv); - const ACE_TCHAR *currentArg = 0; - while(as.is_anything_left()) - { - if((currentArg = as.get_the_parameter("-t"))) - { - int num = ACE_OS::atoi(currentArg); - if(num >= 1) - threadCnt = num; - as.consume_arg(); - } - else - as.ignore_arg(); - } - - if (m_failPrePostInit < 3) - { - ACE_DEBUG((LM_DEBUG, "TEST (%P|%t) Pre-ORB initialization ...\n")); - - // ----------------------------------------------------------------- - // Pre-ORB initialization steps necessary for proper DLL ORB - // support. - // ----------------------------------------------------------------- - // Make sure TAO's singleton manager is initialized, and set to not - // register itself with the ACE_Object_Manager since it is under the - // control of the Service Configurator. If we register with the - // ACE_Object_Manager, then the ACE_Object_Manager will still hold - // (dangling) references to instances of objects created by this - // module and destroyed by this object when it is dynamically - // unloaded. - int register_with_object_manager = 0; - TAO_Singleton_Manager * p_tsm = TAO_Singleton_Manager::instance(); - result = p_tsm->init(register_with_object_manager); - - if (result == -1 && m_failPrePostInit == 0) - return -1; - } - - // Initialize the ORB - mv_orb = CORBA::ORB_init(argc, argv, 0); - if (CORBA::is_nil(mv_orb.in())) - return -1; - - CORBA::Object_var v_poa = mv_orb->resolve_initial_references("RootPOA"); - - mv_rootPOA = PortableServer::POA::_narrow(v_poa.in ()); - if (CORBA::is_nil(mv_rootPOA.in())) - return -1; - - mv_poaManager = mv_rootPOA->the_POAManager(); - if (CORBA::is_nil(mv_poaManager.in())) - return -1; - - mv_poaManager->activate(); - } - catch(CORBA::Exception& ex) - { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("(%P|%t) init failed:")); - return -1; - } - catch(...) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) init failed\n")), - -1); - } - -#if defined (ACE_HAS_THREADS) - mp_barrier = new ACE_Thread_Barrier(threadCnt + 1); - - this->activate( - THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED, - threadCnt - ); - mp_barrier->wait(); -#endif - - return 0; -} - - -int DllOrb::fini (void) -{ - int result; - - try - { -#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA) - mv_poaManager->deactivate(1, 1); -#endif - mv_poaManager = PortableServer::POAManager::_nil(); - - // attempt to protect against sporadic BAD_INV_ORDER exceptions - ACE_OS::sleep(ACE_Time_Value(0, 500)); - - mv_orb->shutdown(1); - } - catch(CORBA::Exception& ex) - { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("(%P|%t) fini failed:")); - return -1; - } - catch(...) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) fini failed to deactivate/shutdown\n")), - -1); - } - - - // wait for our threads to finish - wait(); - -#if defined (ACE_HAS_THREADS) - delete mp_barrier; - mp_barrier = 0; -#endif - - try - { - mv_orb->destroy(); - mv_orb = CORBA::ORB::_nil(); - } - catch(CORBA::Exception& ex) - { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("(%P|%t) init failed to destroy the orb:")); - return -1; - } - - if (m_failPrePostInit < 3) - { - ACE_DEBUG((LM_DEBUG, "TEST (%P|%t) Post-ORB finalization ...\n")); - - // ----------------------------------------------------------------- - // Post-ORB finalization steps necessary for proper DLL ORB - // support. - // ----------------------------------------------------------------- - // Explicitly clean up singletons created by TAO before - // unloading this module. - TAO_Singleton_Manager * p_tsm = TAO_Singleton_Manager::instance(); - result = p_tsm->fini(); - if (result == -1 && m_failPrePostInit == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) fini failed to destroy TAO_Singleton_Manager\n")), - -1); - } /* end of if */ - - return 0; -} - - -int DllOrb::svc (void) -{ -#if defined (ACE_HAS_THREADS) - mp_barrier->wait(); -#endif - - try - { - mv_orb->run(); - } - catch(CORBA::BAD_INV_ORDER const & rc_ex) - { - const CORBA::ULong VMCID = rc_ex.minor() & 0xFFFFF000U; - const CORBA::ULong minorCode = rc_ex.minor() & 0xFFFU; - if (VMCID != CORBA::OMGVMCID || minorCode != 4) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) svc exits (-1)\n")), - -1); - } - catch(CORBA::Exception& ex) - { - ACE_PRINT_EXCEPTION (ex, - ACE_TEXT ("(%P|%t) svc - orb->run() failed:")); - return -1; - } - catch(...) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) svc got some exception\n")), - -1); - } - return 0; -} - - -ACE_FACTORY_DEFINE (DllOrb, DllOrb) diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h deleted file mode 100644 index 9832228d6e4..00000000000 --- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * @author Iliyan jeliazkov <iliyan@ociweb.com> - * @author Lothar Werzinger <lothar@tradescape.biz> - * - * $Id$ - */ - -#ifndef DllOrb_h -#define DllOrb_h - -#include "ace/Barrier.h" -#include "ace/Task.h" - -#include "tao/ORB.h" -#include "tao/PortableServer/PortableServer.h" - -#include "DllOrb_Export.h" - -/** The CORBA ORB as a dynamic loadable module. - * - */ -class DllOrb_Export DllOrb -: - public ACE_Task_Base -{ - public: - /// Default constructor. - DllOrb (int nthreads = 1); - - /// Destructor. - ~DllOrb (void) throw (); - - CORBA::ORB_ptr orb (void) const; - - virtual int init (int argc, char *argv[]); - - virtual int fini (void); - - // protected types and methods - protected: - virtual int svc (void); - - // private methods and instance variables - private: - int m_nthreads_; - unsigned int m_failPrePostInit; - -#if defined (ACE_HAS_THREADS) - ACE_Thread_Barrier * mp_barrier; -#endif - - CORBA::ORB_var mv_orb; - PortableServer::POA_var mv_rootPOA; - PortableServer::POAManager_var mv_poaManager; -}; /* end of DllOrb */ - - -ACE_FACTORY_DECLARE (DllOrb, DllOrb) - - -#endif /* DllOrb_h */ diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h deleted file mode 100644 index 9eb5083ea7b..00000000000 --- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl DllOrb -// ------------------------------ -#ifndef DLLORB_EXPORT_H -#define DLLORB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (DLLORB_HAS_DLL) -# define DLLORB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && DLLORB_HAS_DLL */ - -#if !defined (DLLORB_HAS_DLL) -# define DLLORB_HAS_DLL 1 -#endif /* ! DLLORB_HAS_DLL */ - -#if defined (DLLORB_HAS_DLL) && (DLLORB_HAS_DLL == 1) -# if defined (DLLORB_BUILD_DLL) -# define DllOrb_Export ACE_Proper_Export_Flag -# define DLLORB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define DLLORB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* DLLORB_BUILD_DLL */ -# define DllOrb_Export ACE_Proper_Import_Flag -# define DLLORB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define DLLORB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* DLLORB_BUILD_DLL */ -#else /* DLLORB_HAS_DLL == 1 */ -# define DllOrb_Export -# define DLLORB_SINGLETON_DECLARATION(T) -# define DLLORB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* DLLORB_HAS_DLL == 1 */ - -// Set DLLORB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DLLORB_NTRACE) -# if (ACE_NTRACE == 1) -# define DLLORB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DLLORB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DLLORB_NTRACE */ - -#if (DLLORB_NTRACE == 1) -# define DLLORB_TRACE(X) -#else /* (DLLORB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DLLORB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DLLORB_NTRACE == 1) */ - -#endif /* DLLORB_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Makefile.am b/TAO/tests/ORB_Local_Config/Bug_2612/Makefile.am deleted file mode 100644 index 3c877a90e26..00000000000 --- a/TAO/tests/ORB_Local_Config/Bug_2612/Makefile.am +++ /dev/null @@ -1,68 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.DllOrb.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES = libDllOrb.la - -libDllOrb_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DDLLORB_BUILD_DLL - -libDllOrb_la_SOURCES = \ - DllOrb.cpp - -noinst_HEADERS = \ - DllOrb.h \ - DllOrb_Export.h - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2612.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Test_SOURCES = \ - Test.cpp \ - DllOrb.h \ - DllOrb_Export.h - -Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp deleted file mode 100644 index f0bf0a340eb..00000000000 --- a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* - * @author Iliyan jeliazkov <iliyan@ociweb.com> - * @author Lothar Werzinger <lothar@tradescape.biz> - * - * $Id$ - */ - -#include "ace/OS.h" -#include "ace/Service_Config.h" -#include "tao/corba.h" - -char const * const scpc_loadOrb = - ACE_DYNAMIC_SERVICE_DIRECTIVE ("testDllOrb", - "DllOrb", - "_make_DllOrb", - "DllOrb -t 1 -ORBDebugLevel 3 -ORBId testORB -ORBInitRef " - "NameService=file:///tmp/test-ns.ior -ORBDottedDecimalAddresses 1" - ); - -char const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE ("testDllOrb"); - -int ACE_TMAIN(int, char **) -{ - if (0 > ACE_Service_Config::process_directive(scpc_loadOrb)) - return -1; - - ACE_OS::sleep(2); - - if (0 > ACE_Service_Config::process_directive(scpc_unloadOrb)) - return -1; - - ACE_OS::sleep(2); - ACE_DEBUG ((LM_DEBUG, "MAIN (%P|%t) Lather, Rince, Repeat ...\n")); - - if (0 > ACE_Service_Config::process_directive(scpc_loadOrb)) - return -1; - - ACE_OS::sleep(2); - - if (0 > ACE_Service_Config::process_directive(scpc_unloadOrb)) - return -1; - - return 0; -} diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl b/TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl deleted file mode 100755 index 672625fa515..00000000000 --- a/TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl +++ /dev/null @@ -1,49 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; - -sub add_path { - my($name) = shift; - my($value) = shift; - if (defined $ENV{$name}) { - $ENV{$name} .= ':' . $value - } - else { - $ENV{$name} = $value; - } -} - -# Set the library path for the client to be able to load -# the Time_Date library. -add_path('LD_LIBRARY_PATH', '../lib'); -add_path('LIBPATH', '../lib'); -add_path('SHLIB_PATH', '../lib'); - -sub test($) -{ - (my $executable, my $arguments) = @_; - my $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : "")); - my $status = $t1->SpawnWaitKill (10); - if ($status != 0) { - print STDERR "ERROR: test failed, status=$status\n"; - } - return $status; -} - -my $status = 0; -$status |= test("Test"); - -if ($status == 0) { - print STDERR "SUCCESS: All tests passed\n"; -} -else { - print STDERR "ERROR: Some test failed, status=$status\n"; -} -exit $status; - diff --git a/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc b/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc index b1f403cb3ff..31c098be24e 100644 --- a/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc +++ b/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc @@ -4,13 +4,7 @@ project(*) : taoserver { exename = Test - - specific(automake) { - includes += $(srcdir)/../lib - } else { - includes += ../lib - } - + includes += ../lib Source_Files { Test.cpp } diff --git a/TAO/tests/ORB_Local_Config/Bunch/Makefile.am b/TAO/tests/ORB_Local_Config/Bunch/Makefile.am deleted file mode 100644 index 88dd5cfe315..00000000000 --- a/TAO/tests/ORB_Local_Config/Bunch/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bunch.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp - -Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORB_Local_Config/Makefile.am b/TAO/tests/ORB_Local_Config/Makefile.am deleted file mode 100644 index 72468788ad8..00000000000 --- a/TAO/tests/ORB_Local_Config/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Bug_1459 \ - Bug_2612 \ - Bunch \ - Separation \ - Service_Dependency \ - Shared \ - Simple \ - Two_DLL_ORB - diff --git a/TAO/tests/ORB_Local_Config/ORB_Local_Config.mwc b/TAO/tests/ORB_Local_Config/ORB_Local_Config.mwc index b9b3417f5ee..b5b8a6b963e 100644 --- a/TAO/tests/ORB_Local_Config/ORB_Local_Config.mwc +++ b/TAO/tests/ORB_Local_Config/ORB_Local_Config.mwc @@ -5,7 +5,6 @@ workspace { lib Bunch Bug_1459 - Bug_2612 Separation Service_Dependency Shared diff --git a/TAO/tests/ORB_Local_Config/Separation/Makefile.am b/TAO/tests/ORB_Local_Config/Separation/Makefile.am deleted file mode 100644 index b80cba26183..00000000000 --- a/TAO/tests/ORB_Local_Config/Separation/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Separation.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp - -Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORB_Local_Config/Separation/Separation.mpc b/TAO/tests/ORB_Local_Config/Separation/Separation.mpc index 5db3489b76f..31c098be24e 100644 --- a/TAO/tests/ORB_Local_Config/Separation/Separation.mpc +++ b/TAO/tests/ORB_Local_Config/Separation/Separation.mpc @@ -4,13 +4,7 @@ project(*) : taoserver { exename = Test - - specific (automake) { - includes += $(srcdir)/../lib - } else { - includes += ../lib - } - + includes += ../lib Source_Files { Test.cpp } diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Makefile.am b/TAO/tests/ORB_Local_Config/Service_Dependency/Makefile.am deleted file mode 100644 index fd006206d71..00000000000 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Service_Config_Dependent_DLL.am - -noinst_LTLIBRARIES = libService_Config_Dependent_DLL.la - -libService_Config_Dependent_DLL_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(srcdir)/../lib \ - -DSERVICE_CONFIG_DLL_BUILD_DLL - -libService_Config_Dependent_DLL_la_SOURCES = \ - Service_Config_DLL.cpp - -noinst_HEADERS = \ - Service_Config_DLL.h \ - Service_Config_DLL_Export.h - -## Makefile.Service_Dependency.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp \ - Service_Config_DLL.h \ - Service_Config_DLL_Export.h - -Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc index d4c4107ac83..4db591a7c44 100644 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc +++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc @@ -4,13 +4,7 @@ project(*) : taoserver { after += Service_Config_Dependent_DLL TAO exename = Test - - specific (automake) { - includes += $(srcdir)/../lib - } else { - includes += ../lib - } - + includes += ../lib Source_Files { Test.cpp } @@ -20,11 +14,7 @@ project(Service Config Dependent DLL) : acelib { sharedname = Service_Config_Dependent_DLL dynamicflags = SERVICE_CONFIG_DLL_BUILD_DLL - specific (automake) { - includes += $(srcdir)/../lib - } else { - includes += ../lib - } + includes += ../lib Source_Files { Service_Config_DLL.cpp diff --git a/TAO/tests/ORB_Local_Config/Shared/Makefile.am b/TAO/tests/ORB_Local_Config/Shared/Makefile.am deleted file mode 100644 index 73fa3a5805b..00000000000 --- a/TAO/tests/ORB_Local_Config/Shared/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Shared.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp - -Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORB_Local_Config/Shared/Shared.mpc b/TAO/tests/ORB_Local_Config/Shared/Shared.mpc index 5db3489b76f..31c098be24e 100644 --- a/TAO/tests/ORB_Local_Config/Shared/Shared.mpc +++ b/TAO/tests/ORB_Local_Config/Shared/Shared.mpc @@ -4,13 +4,7 @@ project(*) : taoserver { exename = Test - - specific (automake) { - includes += $(srcdir)/../lib - } else { - includes += ../lib - } - + includes += ../lib Source_Files { Test.cpp } diff --git a/TAO/tests/ORB_Local_Config/Simple/Makefile.am b/TAO/tests/ORB_Local_Config/Simple/Makefile.am deleted file mode 100644 index 9c20f390524..00000000000 --- a/TAO/tests/ORB_Local_Config/Simple/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Simple.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp - -Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORB_Local_Config/Simple/Simple.mpc b/TAO/tests/ORB_Local_Config/Simple/Simple.mpc index 5db3489b76f..31c098be24e 100644 --- a/TAO/tests/ORB_Local_Config/Simple/Simple.mpc +++ b/TAO/tests/ORB_Local_Config/Simple/Simple.mpc @@ -4,13 +4,7 @@ project(*) : taoserver { exename = Test - - specific (automake) { - includes += $(srcdir)/../lib - } else { - includes += ../lib - } - + includes += ../lib Source_Files { Test.cpp } diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am deleted file mode 100644 index 03650e6d2d8..00000000000 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am +++ /dev/null @@ -1,195 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_LTLIBRARIES = -noinst_HEADERS = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.ORB_DLL_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_LTLIBRARIES += libORB_DLL_Client.la - -libORB_DLL_Client_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DSERVICE_CONFIG_ORB_DLL_BUILD_DLL - -libORB_DLL_Client_la_SOURCES = \ - ORB_DLL.cpp \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - client.cpp \ - server.cpp - -noinst_HEADERS += \ - ORB_DLL.h \ - ORB_DLL_Export.h \ - Test.idl \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ - Test_i.h - -endif BUILD_EXCEPTIONS - -## Makefile.ORB_DLL_Server.am - -if BUILD_THREADS - -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_LTLIBRARIES += libORB_DLL_Server.la - -libORB_DLL_Server_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DSERVICE_CONFIG_ORB_DLL_BUILD_DLL - -libORB_DLL_Server_la_SOURCES = \ - ORB_DLL.cpp \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - client.cpp \ - server.cpp - -noinst_HEADERS += \ - ORB_DLL.h \ - ORB_DLL_Export.h \ - Test.idl \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ - Test_i.h - -endif BUILD_THREADS - -## Makefile.Two_DLL_ORB.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp \ - TestC.cpp \ - TestS.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc index 49f3825dea5..ff5720826da 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc @@ -54,13 +54,7 @@ project(ORB DLL Client) : taolib_with_idl, portableserver { project(*) : taoserver { after += lib ORB_DLL_Client ORB_DLL_Server exename = Test - - specific (automake) { - includes += $(srcdir)/../lib - } else { - includes += ../lib - } - + includes += ../lib Source_Files { Test.cpp } diff --git a/TAO/tests/ORB_Local_Config/run_tests_all.pl b/TAO/tests/ORB_Local_Config/run_tests_all.pl index 1cd3ae6a50c..8a33c9da9ef 100755 --- a/TAO/tests/ORB_Local_Config/run_tests_all.pl +++ b/TAO/tests/ORB_Local_Config/run_tests_all.pl @@ -44,7 +44,6 @@ sub test($) my $status = 0; $status += test("Bug_1459"); -$status += test("Bug_2612"); $status += test("Bunch"); $status += test("Separation"); $status += test("Service_Dependency"); diff --git a/TAO/tests/ORB_destroy/.cvsignore b/TAO/tests/ORB_destroy/.cvsignore new file mode 100644 index 00000000000..4a33aac7808 --- /dev/null +++ b/TAO/tests/ORB_destroy/.cvsignore @@ -0,0 +1 @@ +ORB_destroy diff --git a/TAO/tests/ORB_destroy/Makefile.am b/TAO/tests/ORB_destroy/Makefile.am deleted file mode 100644 index 254e3a073b4..00000000000 --- a/TAO/tests/ORB_destroy/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.ORB_destroy.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = ORB_destroy - -ORB_destroy_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ORB_destroy_SOURCES = \ - ORB_destroy.cpp - -ORB_destroy_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORB_init/.cvsignore b/TAO/tests/ORB_init/.cvsignore new file mode 100644 index 00000000000..c32f7b71039 --- /dev/null +++ b/TAO/tests/ORB_init/.cvsignore @@ -0,0 +1 @@ +ORB_init diff --git a/TAO/tests/ORB_init/Makefile.am b/TAO/tests/ORB_init/Makefile.am deleted file mode 100644 index 78920636fba..00000000000 --- a/TAO/tests/ORB_init/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -SUBDIRS = \ - . \ - Portspan - - -## Makefile.ORB_init.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = ORB_init - -ORB_init_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ORB_init_SOURCES = \ - ORB_init.cpp - -ORB_init_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORB_init/Portspan/.cvsignore b/TAO/tests/ORB_init/Portspan/.cvsignore new file mode 100644 index 00000000000..254defddb53 --- /dev/null +++ b/TAO/tests/ORB_init/Portspan/.cvsignore @@ -0,0 +1 @@ +server diff --git a/TAO/tests/ORB_init/Portspan/Makefile.am b/TAO/tests/ORB_init/Portspan/Makefile.am deleted file mode 100644 index 7d2a3740475..00000000000 --- a/TAO/tests/ORB_init/Portspan/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.ORB_Init_Portspan_Server.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.cpp \ - simpleS.h \ - simpleS.inl - -CLEANFILES = \ - simple-stamp \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.cpp \ - simpleS.h \ - simpleS.inl - -simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp - -simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/simple.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - simpleC.cpp \ - simpleI.cpp \ - simpleS.cpp \ - simpleC.h \ - simpleC.inl \ - simpleI.h \ - simpleS.h \ - simpleS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORB_shutdown/.cvsignore b/TAO/tests/ORB_shutdown/.cvsignore new file mode 100644 index 00000000000..254defddb53 --- /dev/null +++ b/TAO/tests/ORB_shutdown/.cvsignore @@ -0,0 +1 @@ +server diff --git a/TAO/tests/ORB_shutdown/Makefile.am b/TAO/tests/ORB_shutdown/Makefile.am deleted file mode 100644 index 7a0e505354e..00000000000 --- a/TAO/tests/ORB_shutdown/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.ORB_Shutdown_Server.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Foo_Bar.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Foo_Bar.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORT/.cvsignore b/TAO/tests/ORT/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/ORT/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/ORT/Makefile.am b/TAO/tests/ORT/Makefile.am deleted file mode 100644 index c4cf9222ba0..00000000000 --- a/TAO/tests/ORT/Makefile.am +++ /dev/null @@ -1,149 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Test_ORT_IDL.am - -BUILT_SOURCES = \ - ORT_testC.cpp \ - ORT_testC.h \ - ORT_testC.inl \ - ORT_testS.cpp \ - ORT_testS.h \ - ORT_testS.inl - -CLEANFILES = \ - ORT_test-stamp \ - ORT_testC.cpp \ - ORT_testC.h \ - ORT_testC.inl \ - ORT_testS.cpp \ - ORT_testS.h \ - ORT_testS.inl - -ORT_testC.cpp ORT_testC.h ORT_testC.inl ORT_testS.cpp ORT_testS.h ORT_testS.inl: ORT_test-stamp - -ORT_test-stamp: $(srcdir)/ORT_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ORT_test.idl - @touch $@ - -BUILT_SOURCES += \ - ObjectReferenceFactoryC.cpp \ - ObjectReferenceFactoryC.h \ - ObjectReferenceFactoryC.inl \ - ObjectReferenceFactoryS.h - -CLEANFILES += \ - ObjectReferenceFactory-stamp \ - ObjectReferenceFactoryC.cpp \ - ObjectReferenceFactoryC.h \ - ObjectReferenceFactoryC.inl \ - ObjectReferenceFactoryS.h - -ObjectReferenceFactoryC.cpp ObjectReferenceFactoryC.h ObjectReferenceFactoryC.inl ObjectReferenceFactoryS.h: ObjectReferenceFactory-stamp - -ObjectReferenceFactory-stamp: $(srcdir)/ObjectReferenceFactory.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -SS $(srcdir)/ObjectReferenceFactory.idl - @touch $@ - -noinst_HEADERS = \ - ORT_test.idl \ - ObjectReferenceFactory.idl - -## Makefile.Test_ORT_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ORT_testC.cpp \ - ORT_testS.cpp \ - ORT_test_IORInterceptor.cpp \ - ORT_test_i.cpp \ - ObjectReferenceFactory.cpp \ - ObjectReferenceFactoryC.cpp \ - ServerORBInitializer.cpp \ - ServerRequestInterceptor.cpp \ - server.cpp \ - ORT_test_IORInterceptor.h \ - ORT_test_i.h \ - ObjectReferenceFactory.h \ - ServerORBInitializer.h \ - ServerRequestInterceptor.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Test_ORT_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ORT_testC.cpp \ - client.cpp \ - ORT_test_IORInterceptor.h \ - ORT_test_i.h \ - ObjectReferenceFactory.h \ - ServerORBInitializer.h \ - ServerRequestInterceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc index 4d4b4688fc0..461f03a1a7b 100644 --- a/TAO/tests/ORT/ORT.mpc +++ b/TAO/tests/ORT/ORT.mpc @@ -1,20 +1,16 @@ // -*- MPC -*- // $Id$ -project(Test_ORT_IDL): taoidldefaults { +project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, pi_server, interceptors { IDL_Files { ORT_test.idl - } - IDL_Files { - idlflags += -SS ObjectReferenceFactory.idl } - custom_only = 1 -} -project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, pi_server, interceptors { - after += Test_ORT_IDL Source_Files { + ORT_testC.cpp + ORT_testS.cpp + ObjectReferenceFactoryC.cpp ObjectReferenceFactory.cpp ORT_test_i.cpp ServerORBInitializer.cpp @@ -22,26 +18,18 @@ project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, pi_server, ORT_test_IORInterceptor.cpp server.cpp } - Source_Files { - ORT_testC.cpp - ORT_testS.cpp - ObjectReferenceFactoryC.cpp - } - IDL_Files { - } } project(Test_ORT_Client): taoclient, anytypecode, interceptors { - after += Test_ORT_IDL after += Test_ORT_Server - Source_Files { - client.cpp + IDL_Files { + ORT_test.idl } + Source_Files { ORT_testC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/Object_Loader/.cvsignore b/TAO/tests/Object_Loader/.cvsignore new file mode 100644 index 00000000000..e54525b1ee9 --- /dev/null +++ b/TAO/tests/Object_Loader/.cvsignore @@ -0,0 +1 @@ +driver diff --git a/TAO/tests/Object_Loader/Makefile.am b/TAO/tests/Object_Loader/Makefile.am deleted file mode 100644 index 6d2c20acc26..00000000000 --- a/TAO/tests/Object_Loader/Makefile.am +++ /dev/null @@ -1,130 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Object_Loader_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_LTLIBRARIES = libTest_DLL.la - -libTest_DLL_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DOLT_BUILD_DLL - -libTest_DLL_la_SOURCES = \ - Loader.cpp \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp - -noinst_HEADERS = \ - Loader.h \ - Test.idl \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ - Test_i.h - -endif BUILD_EXCEPTIONS - -## Makefile.Object_Loader_Driver.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = driver - -driver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -driver_SOURCES = \ - TestC.cpp \ - driver.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -driver_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Objref_Sequence_Test/.cvsignore b/TAO/tests/Objref_Sequence_Test/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Objref_Sequence_Test/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Objref_Sequence_Test/Makefile.am b/TAO/tests/Objref_Sequence_Test/Makefile.am deleted file mode 100644 index 45eddfc67f0..00000000000 --- a/TAO/tests/Objref_Sequence_Test/Makefile.am +++ /dev/null @@ -1,103 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Objref_Sequence_Test_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Objref_Sequence_Test_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Objref_Sequence_Test_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc index dbd009c2f59..650b6c70356 100644 --- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc +++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc @@ -1,35 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/OctetSeq/.cvsignore b/TAO/tests/OctetSeq/.cvsignore new file mode 100644 index 00000000000..25e07224e39 --- /dev/null +++ b/TAO/tests/OctetSeq/.cvsignore @@ -0,0 +1,3 @@ +OctetSeq +client +server diff --git a/TAO/tests/OctetSeq/Makefile.am b/TAO/tests/OctetSeq/Makefile.am deleted file mode 100644 index 53c6f2fd798..00000000000 --- a/TAO/tests/OctetSeq/Makefile.am +++ /dev/null @@ -1,137 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.OctetSeq_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.OctetSeq_Client.am - -if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_EXCEPTIONS - -## Makefile.OctetSeq_OctetSeq.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += OctetSeq - -OctetSeq_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -OctetSeq_SOURCES = \ - OctetSeq.cpp \ - testC.cpp \ - test_i.h \ - test_i.inl - -OctetSeq_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OctetSeq_Server.am - -if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc index ddad93f5747..4a526ffae60 100644 --- a/TAO/tests/OctetSeq/OctetSeq.mpc +++ b/TAO/tests/OctetSeq/OctetSeq.mpc @@ -1,44 +1,29 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver { avoids += ace_for_tao - after += *idl Source_Files { test_i.cpp server.cpp - testS.cpp - testC.cpp - } - IDL_Files { } } project(*Client): taoclient, anytypecode { avoids += ace_for_tao - after += *idl + after += *Server Source_Files { testC.cpp client.cpp } - IDL_Files { - } } project(*OctetSeq): taoclient, anytypecode { exename = OctetSeq - after += *idl + after += *Client Source_Files { testC.cpp OctetSeq.cpp } - IDL_Files { - } } + diff --git a/TAO/tests/Ondemand_Write/Makefile.am b/TAO/tests/Ondemand_Write/Makefile.am deleted file mode 100644 index b4ecf07defe..00000000000 --- a/TAO/tests/Ondemand_Write/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Ondemand_Write_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Ondemand_Write_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Ondemand_Write_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Ondemand_Write/Ondemand_Write.mpc b/TAO/tests/Ondemand_Write/Ondemand_Write.mpc index 066f4725953..9a1892855d9 100644 --- a/TAO/tests/Ondemand_Write/Ondemand_Write.mpc +++ b/TAO/tests/Ondemand_Write/Ondemand_Write.mpc @@ -1,37 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl + idlflags += -Sa -St Source_Files { Hello.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/Oneway_Buffering/.cvsignore b/TAO/tests/Oneway_Buffering/.cvsignore new file mode 100644 index 00000000000..5c0ae7e0d7e --- /dev/null +++ b/TAO/tests/Oneway_Buffering/.cvsignore @@ -0,0 +1,3 @@ +admin +client +server diff --git a/TAO/tests/Oneway_Buffering/Makefile.am b/TAO/tests/Oneway_Buffering/Makefile.am deleted file mode 100644 index 0811306207e..00000000000 --- a/TAO/tests/Oneway_Buffering/Makefile.am +++ /dev/null @@ -1,153 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Oneway_Buffering_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Oneway_Buffering_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Oneway_Buffering.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Oneway_Buffering.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Oneway_Buffering_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Oneway_Buffering.h \ - Oneway_Buffering_Admin.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Oneway_Buffering_Admin.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += admin - -admin_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -admin_SOURCES = \ - Oneway_Buffering_Admin.cpp \ - TestC.cpp \ - TestS.cpp \ - admin.cpp \ - Oneway_Buffering_Admin.h - -admin_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc index b2577e7317c..ee95112f143 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc @@ -1,53 +1,35 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): messaging, taoexe, portableserver { - after += *idl Source_Files { Oneway_Buffering.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } +// These next two projects depend on *Server (the above project) +// due to the possibility of parallelism for the GNUACE type. If +// -j 2 or more is used to build this project, multiple instances +// of tao_idl are invoked for Test.idl. They begin to overwrite the +// generated source files and cause problems for the processes that +// have gone on to build the generated files. By depending on *Server, +// only one process is allowed to compile Test.idl and thus the build +// succeeds. project(*Client): messaging, taoexe, portableserver { requires += corba_messaging - after += *idl after += *Server Source_Files { + TestC.cpp client.cpp } - Source_Files { - TestC.cpp - } - IDL_Files { - } } project(*Admin): messaging, taoexe, portableserver { - after += *idl after += *Client Source_Files { Oneway_Buffering_Admin.cpp admin.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Oneway_Timeouts/Makefile.am b/TAO/tests/Oneway_Timeouts/Makefile.am deleted file mode 100644 index 62acaa96f5d..00000000000 --- a/TAO/tests/Oneway_Timeouts/Makefile.am +++ /dev/null @@ -1,118 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.test_server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.test_client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - TestC.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Oneway_Timeouts/Test.idl b/TAO/tests/Oneway_Timeouts/Test.idl index 30a517bde36..d076114e7c6 100644 --- a/TAO/tests/Oneway_Timeouts/Test.idl +++ b/TAO/tests/Oneway_Timeouts/Test.idl @@ -1,5 +1,3 @@ -// $Id$ - interface Tester { oneway void test(in long id); long test2(in long id); diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp index 75a7042094e..8a3a74950d1 100644 --- a/TAO/tests/Oneway_Timeouts/client.cpp +++ b/TAO/tests/Oneway_Timeouts/client.cpp @@ -1,10 +1,9 @@ -// $Id$ - #include "TestS.h" #include "tao/Strategies/advanced_resource.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/TAOA.h" #include "tao/AnyTypeCode/Any.h" +#include "tao/IIOP_Connector.h" #include "ace/streams.h" #include "ace/High_Res_Timer.h" @@ -18,7 +17,7 @@ using namespace PortableServer; namespace { const char *non_existent_ior = "corbaloc:iiop:1.2@63.246.9.65:12345/test"; - const int TIME_THRESHOLD = 100; //ms + const int TIME_THRESHOLD = 50; //ms int request_timeout = 0; Messaging::SyncScope sync_scope; @@ -43,27 +42,16 @@ namespace bool retry_transients = false; bool retry_timeouts = false; - void print_usage (const char *argv0) + void print_usage () { - ACE_ERROR ((LM_ERROR, - "%s [-request_timeout ms=0] " - "[-connect_timeout ms=0] " - "[-request_interval ms=100] " - "[-run_orb_delay ms=0] " - "[-run_orb_time ms=0] " - "[-max_request_time ms=0] " - "[-num_requests n=10] " - "[-use_twoway] " - "[-retry_transients] " - "[-retry_timeouts] " - "[-use_sleep] " - "[-force_timeout] " - "[-force_connect] " - "[-buffer_count n=0]" - "[-buffer_bytes n=0] " - "[-buffer_timeout ms=0] " - "[-sync delayed|eager|none]\n", - argv0)); + cout << "client [-request_timeout ms=0] [-connect_timeout ms=0] " + "[-request_interval ms=100]\n\t[-run_orb_delay ms=0] " + "[-run_orb_time ms=0] [-max_request_time ms=0]\n" + "\t[-num_requests n=10] [-use_twoway] [-retry_transients] " + "[-retry_timeouts]\n" + "\t[-use_sleep] [-force_timeout] [-force_connect] [-buffer_count n=0]\n" + "\t[-buffer_bytes n=0] [-buffer_timeout ms=0] [-sync delayed|eager|none]" + << endl; } bool parse_command_line (int ac, char *av[]) @@ -186,7 +174,7 @@ namespace } else { - print_usage (av[0]); + print_usage (); return false; } @@ -194,9 +182,9 @@ namespace } else { - ACE_ERROR ((LM_ERROR, "Error: Unknown argument \"%s\"\n", - args.get_current ())); - print_usage (av[0]); + cerr << "Error: Unknown argument \"" + << args.get_current () << "\"" << endl; + print_usage (); return false; } @@ -205,6 +193,20 @@ namespace return true; } + + POA_ptr create_poa (ORB_ptr orb) + { + POA_var poa; + PolicyList pols; + Object_var obj = orb->resolve_initial_references ("RootPOA"); + POA_var root = POA::_narrow (obj.in ()); + ACE_ASSERT (! is_nil (root.in ())); + POAManager_var man = root->the_POAManager (); + poa = root->create_POA ("X", man.in (), pols); + return poa._retn (); + } + + Tester_ptr set_request_timeout (Tester_ptr tst, ORB_ptr orb) { if (request_timeout <= 0) @@ -326,7 +328,7 @@ int main (int ac, char *av[]) { tmp_tester = Tester::_narrow (obj.in ()); tmp_tester->test2 (-2); - ACE_DEBUG ((LM_DEBUG, "Connected...\n")); + cout << "Connected..." << endl; } else tmp_tester = Tester::_unchecked_narrow (obj.in ()); @@ -354,23 +356,21 @@ int main (int ac, char *av[]) } catch (CORBA::TRANSIENT&) { - ACE_DEBUG ((LM_DEBUG, - "Transient exception during test () invocation %d\n", - i)); - if (retry_transients) - ACE_DEBUG ((LM_DEBUG,"retrying\n")); - else - throw; + cerr << "Transient exception during test () invocation " << i << endl; + if (! retry_transients) + { + throw; + } + } catch (CORBA::TIMEOUT&) { - ACE_DEBUG ((LM_DEBUG, - "Timeout exception during test () invocation %d\n", - i)); - if (retry_timeouts) - ACE_DEBUG ((LM_DEBUG,"retrying\n")); - else - throw; + cerr << "Timeout exception during test () invocation " << i << endl; + if (! retry_timeouts) + { + throw; + } + } ++num_requests_sent; @@ -379,14 +379,13 @@ int main (int ac, char *av[]) if (max_request_time > 0 && (after - before).msec () > max_request_time) { - ACE_ERROR_RETURN ((LM_ERROR, - "Error: test() took %d ms, max is %d ms\n", - (after - before).msec (), max_request_time), - 1); + cerr << "Error : test () took " << (after - before).msec () + << endl; + return 1; } - ACE_DEBUG ((LM_DEBUG, "c%d\n", i)); + cout << 'c' << i << endl; if (request_interval > 0) { ACE_Time_Value tv (0, request_interval * 1000); @@ -408,8 +407,6 @@ int main (int ac, char *av[]) } } - ACE_DEBUG ((LM_DEBUG,"request loop complete\n")); - if (run_orb_delay > 0) { @@ -424,14 +421,8 @@ int main (int ac, char *av[]) orb->run (tv); } - ACE_DEBUG ((LM_DEBUG,"Sending synch request to shutdown server\n")); - if (force_timeout) - // we have one more invocation that may time out. - before = ACE_High_Res_Timer::gettimeofday_hr (); - use_twoway = true; - use_sync_scope = false; - // Let the server know we're finished. This will timeout if - // force_timeout is true. + + // Let the server know we're finished. tester->test2 (-1); orb->shutdown (1); @@ -440,18 +431,19 @@ int main (int ac, char *av[]) if (force_timeout) { - ACE_ERROR_RETURN ((LM_ERROR, - "Error: Connection did not time out.\n"), - 1); + cerr << "Error: Connection did not timeout." << endl; + return 1; } + return 0; + } - catch (CORBA::TRANSIENT &) + catch (CORBA::TRANSIENT &ex) { - ACE_DEBUG ((LM_DEBUG, "caught transient exception\n")); if (force_timeout) { + ACE_DEBUG ((LM_DEBUG, "caught exception\n")); ACE_Time_Value after = ACE_High_Res_Timer::gettimeofday_hr (); long ms = (after - before).msec (); if ( (use_twoway || !use_sync_scope) @@ -464,33 +456,30 @@ int main (int ac, char *av[]) { if (ms > TIME_THRESHOLD) { - ACE_ERROR_RETURN ((LM_ERROR, - "Error: Buffered request took %dms\n", - ms),1); + cerr << "Error: Buffered request took " << ms << endl; + return 1; } ms = num_requests_sent * request_interval; } - if (ms - connect_timeout > TIME_THRESHOLD || - connect_timeout - ms > TIME_THRESHOLD) + if (std::abs (static_cast<int>(ms - connect_timeout)) + > TIME_THRESHOLD) { - ACE_ERROR_RETURN ((LM_ERROR, - "Error: Timeout expected in %d ms, " - "but took %d ms\n", connect_timeout, ms), - 1); + cerr << "Error: Timeout expected in " << connect_timeout + << "ms, but took " << ms << "ms" << endl; + return 1; } return 0; } else { - ACE_ERROR_RETURN ((LM_ERROR, "Error: Unexpected\n"), 1); + cerr << "Error: Unexpected transient\n" << ex << endl; } } - catch (CORBA::TIMEOUT &) + catch (CORBA::TIMEOUT &ex) { - ACE_DEBUG ((LM_DEBUG, "caught timeout exception\n")); if (force_timeout) { ACE_Time_Value after = ACE_High_Res_Timer::gettimeofday_hr (); @@ -505,36 +494,36 @@ int main (int ac, char *av[]) { if (ms > TIME_THRESHOLD) { - ACE_ERROR_RETURN ((LM_ERROR, - "Error: Buffered request took %d ms\n", - ms),1); + cerr << "Error: Buffered request took " << ms << endl; + return 1; } ms = num_requests_sent * request_interval; } - if (ms - connect_timeout > TIME_THRESHOLD || - connect_timeout - ms > TIME_THRESHOLD) + if (std::abs (static_cast<int>(ms - connect_timeout)) + > TIME_THRESHOLD) { - ACE_ERROR_RETURN ((LM_ERROR, - "Error: Timeout expected in %d ms, " - "but took %d ms\n", connect_timeout, ms), - 1); + cerr << "Error: Timeout expected in " << connect_timeout + << "ms, but took " << ms << "ms" << endl; + return 1; } return 0; } else { - ACE_ERROR_RETURN ((LM_ERROR, "Error: Unexpected\n"), 1); + cerr << "Error: Unexpected timeout\n" << ex << endl; } } catch (Exception &ex) { - ACE_ERROR ((LM_ERROR, "client: %s\n\nLast operation took %d ms.\n", - ex._name(), - (ACE_High_Res_Timer::gettimeofday_hr () - before).msec ())); + cerr << "client: " << ex << endl; + cerr << "\nLast operation took " + << (ACE_High_Res_Timer::gettimeofday_hr () - before).msec () + << "ms" + << endl; } return 1; diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp index c84c0745c28..ac9e6dadee2 100644 --- a/TAO/tests/Oneway_Timeouts/server.cpp +++ b/TAO/tests/Oneway_Timeouts/server.cpp @@ -1,5 +1,3 @@ -// $Id$ - #include "TestS.h" #include "tao/Strategies/advanced_resource.h" @@ -23,12 +21,12 @@ int elapsed_min = 0; int first_min = 0; int first_max = 0; -class Tester_i +class Tester_i : public virtual POA_Tester , public virtual ACE_Event_Handler { public: - Tester_i (CORBA::ORB_ptr orb) + Tester_i (CORBA::ORB_ptr orb) : orb_ (orb) , id1_ (0) , id2_ (0) @@ -68,14 +66,14 @@ public: // Signals the end of a test run if (num_expected > 0 && count_ != num_expected) { - cerr << "Error: Expected " << num_expected + cerr << "Error: Expected " << num_expected << ", but received " << count_ << endl; this->failed_ = true; } long ms = (last_ - first_).msec (); if (elapsed_max > 0 && ms > elapsed_max) { - cerr << "Error: Expected < " << elapsed_max + cerr << "Error: Expected < " << elapsed_max << "ms, but was " << ms << "ms" << endl; this->failed_ = true; } @@ -88,7 +86,7 @@ public: ms = (first_ - start_).msec (); if (first_max > 0 && ms > first_max) { - cerr << "Error: Expected first < " << first_max + cerr << "Error: Expected first < " << first_max << "ms, but was " << ms << "ms" << endl; this->failed_ = true; } @@ -161,9 +159,9 @@ namespace { "\t[-expected n=0] [-elapsed_max ms=0] [-elapsed_min ms=0] " "[-first_min ms=0]\n" "\t[-first_max ms=0]\n" - "\tactivate_delay Millisecond delay before POAManager::activate.\n" - "\trun_delay Millisecond delay before ORB::run ().\n" - "\trequest_delay Millisecond delay within each servant request.\n" + "\tactivate_delay Millisecond delay before POAManager::activate.\n" + "\trun_delay Millisecond delay before ORB::run ().\n" + "\trequest_delay Millisecond delay within each servant request.\n" "\tabort_after abort () after N requests.\n" << endl; } diff --git a/TAO/tests/Oneway_Timeouts/test.mpc b/TAO/tests/Oneway_Timeouts/test.mpc index 2ff1d62ad2d..bc999788463 100644 --- a/TAO/tests/Oneway_Timeouts/test.mpc +++ b/TAO/tests/Oneway_Timeouts/test.mpc @@ -1,6 +1,3 @@ -// -*- MPC -*- -// $Id$ - project (*client) : taoexe, messaging, portableserver, strategies { exename = client after = *server @@ -15,7 +12,8 @@ project (*client) : taoexe, messaging, portableserver, strategies { } } -project (*server) : taoserver, messaging, strategies { +project (*server) : taoexe, messaging, portableserver, strategies { + exename = server source_files { server.cpp TestS.cpp diff --git a/TAO/tests/Oneways_Invoking_Twoways/.cvsignore b/TAO/tests/Oneways_Invoking_Twoways/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Oneways_Invoking_Twoways/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Oneways_Invoking_Twoways/Makefile.am b/TAO/tests/Oneways_Invoking_Twoways/Makefile.am deleted file mode 100644 index eeb22ae1d15..00000000000 --- a/TAO/tests/Oneways_Invoking_Twoways/Makefile.am +++ /dev/null @@ -1,115 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Oneways_Invoking_Twoways_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Oneways_Invoking_Twoways_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Sender_i.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Sender_i.h \ - Server_Task.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Oneways_Invoking_Twoways_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - Receiver_i.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - Receiver_i.h \ - Server_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc index 2f2b3a6e1c7..bd6dfbc4ff5 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc +++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc @@ -1,30 +1,15 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { Server_Task.cpp Sender_i.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoexe, portableserver { - after += *idl after += *Server Source_Files { Client_Task.cpp @@ -32,10 +17,5 @@ project(*Client): taoexe, portableserver { Receiver_i.cpp client.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Optimized_Connection/Makefile.am b/TAO/tests/Optimized_Connection/Makefile.am deleted file mode 100644 index 9b7015e2cf0..00000000000 --- a/TAO/tests/Optimized_Connection/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Optimized_Connection_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - oc_client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc index 91146f271ff..8bd676130d6 100644 --- a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc +++ b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(POA*): taoserver, minimum_corba { } diff --git a/TAO/tests/POA/Bug_2511_Regression/Makefile.am b/TAO/tests/POA/Bug_2511_Regression/Makefile.am deleted file mode 100644 index 06398d5da19..00000000000 --- a/TAO/tests/POA/Bug_2511_Regression/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_Bug_2511_Regression.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Current/.cvsignore b/TAO/tests/POA/Current/.cvsignore new file mode 100644 index 00000000000..d8a2b853f2c --- /dev/null +++ b/TAO/tests/POA/Current/.cvsignore @@ -0,0 +1 @@ +Current diff --git a/TAO/tests/POA/Current/Makefile.am b/TAO/tests/POA/Current/Makefile.am deleted file mode 100644 index ed1e544b1a9..00000000000 --- a/TAO/tests/POA/Current/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_Current.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Current - -Current_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Current_SOURCES = \ - Current.cpp - -Current_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Deactivate_Object/Makefile.am b/TAO/tests/POA/Deactivate_Object/Makefile.am deleted file mode 100644 index dcde647032c..00000000000 --- a/TAO/tests/POA/Deactivate_Object/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Deactivate_Object_Server.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Default_Servant/.cvsignore b/TAO/tests/POA/Default_Servant/.cvsignore new file mode 100644 index 00000000000..1a4929b3b80 --- /dev/null +++ b/TAO/tests/POA/Default_Servant/.cvsignore @@ -0,0 +1 @@ +Default_Servant diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.mpc b/TAO/tests/POA/Default_Servant/Default_Servant.mpc index 582c1f14733..c96018f073f 100644 --- a/TAO/tests/POA/Default_Servant/Default_Servant.mpc +++ b/TAO/tests/POA/Default_Servant/Default_Servant.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(POA Default Servant): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(POA Default Servant): taoserver, minimum_corba { exename = Default_Servant } diff --git a/TAO/tests/POA/Default_Servant/Makefile.am b/TAO/tests/POA/Default_Servant/Makefile.am deleted file mode 100644 index f55f9ec8940..00000000000 --- a/TAO/tests/POA/Default_Servant/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_Default_Servant.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Default_Servant - -Default_Servant_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Default_Servant_SOURCES = \ - Default_Servant.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Default_Servant_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc index a3db1635f9c..5411e0e656f 100644 --- a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc +++ b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc @@ -1,37 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { +project(*Server): taoserver, endpointpolicy, pi_server, minimum_corba { idlflags += -Sa -St - IDL_Files { - Test.idl - } - custom_only = 1 -} - -project(*Server): taoserver, endpointpolicy, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl Source_Files { Hello.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/POA/EndpointPolicy/Makefile.am b/TAO/tests/POA/EndpointPolicy/Makefile.am deleted file mode 100644 index c59078cc840..00000000000 --- a/TAO/tests/POA/EndpointPolicy/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.EndpointPolicy_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.EndpointPolicy_Server.am - -if BUILD_EXCEPTIONS - -bin_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_EndpointPolicy.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.EndpointPolicy_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Etherealization/.cvsignore b/TAO/tests/POA/Etherealization/.cvsignore new file mode 100644 index 00000000000..3e143a96f1d --- /dev/null +++ b/TAO/tests/POA/Etherealization/.cvsignore @@ -0,0 +1 @@ +Etherealization diff --git a/TAO/tests/POA/Etherealization/Etherealization.mpc b/TAO/tests/POA/Etherealization/Etherealization.mpc index 3aa46e5d4cf..5400bf85c9b 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.mpc +++ b/TAO/tests/POA/Etherealization/Etherealization.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(POA*): taoserver, minimum_corba { exename = Etherealization } diff --git a/TAO/tests/POA/Etherealization/Makefile.am b/TAO/tests/POA/Etherealization/Makefile.am deleted file mode 100644 index 7e48dfb8170..00000000000 --- a/TAO/tests/POA/Etherealization/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_Etherealization.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Etherealization - -Etherealization_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Etherealization_SOURCES = \ - Etherealization.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Etherealization_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/.cvsignore b/TAO/tests/POA/Excessive_Object_Deactivations/.cvsignore new file mode 100644 index 00000000000..2733a260597 --- /dev/null +++ b/TAO/tests/POA/Excessive_Object_Deactivations/.cvsignore @@ -0,0 +1 @@ +Excessive_Object_Deactivations diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc index 6136555334d..8b143029fd2 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver, avoids_corba_e_micro { +project(POA*): taoexe, portableserver { } diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am b/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am deleted file mode 100644 index 81a0191efed..00000000000 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_Excessive_Object_Deactivations.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Excessive_Object_Deactivations - -Excessive_Object_Deactivations_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Excessive_Object_Deactivations_SOURCES = \ - Excessive_Object_Deactivations.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Excessive_Object_Deactivations_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Identity/.cvsignore b/TAO/tests/POA/Identity/.cvsignore new file mode 100644 index 00000000000..58cf73e05e2 --- /dev/null +++ b/TAO/tests/POA/Identity/.cvsignore @@ -0,0 +1 @@ +Identity diff --git a/TAO/tests/POA/Identity/Identity.mpc b/TAO/tests/POA/Identity/Identity.mpc index be9b7edff28..8e2c99d1610 100644 --- a/TAO/tests/POA/Identity/Identity.mpc +++ b/TAO/tests/POA/Identity/Identity.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(POA*): taoserver, avoids_corba_e_micro { +project(POA*): taoserver { exename = Identity } diff --git a/TAO/tests/POA/Identity/Makefile.am b/TAO/tests/POA/Identity/Makefile.am deleted file mode 100644 index 0233b450a07..00000000000 --- a/TAO/tests/POA/Identity/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_Identity.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Identity - -Identity_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Identity_SOURCES = \ - Identity.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Identity_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/MT_Servant_Locator/.cvsignore b/TAO/tests/POA/MT_Servant_Locator/.cvsignore new file mode 100644 index 00000000000..3a06a6508b0 --- /dev/null +++ b/TAO/tests/POA/MT_Servant_Locator/.cvsignore @@ -0,0 +1 @@ +MT_Servant_Locator diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc index a2ddf365db4..6443ce82a36 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(POA*): taoexe, portableserver, minimum_corba { } diff --git a/TAO/tests/POA/MT_Servant_Locator/Makefile.am b/TAO/tests/POA/MT_Servant_Locator/Makefile.am deleted file mode 100644 index 5d7183bdbe1..00000000000 --- a/TAO/tests/POA/MT_Servant_Locator/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_MT_Servant_Locator.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = MT_Servant_Locator - -MT_Servant_Locator_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -MT_Servant_Locator_SOURCES = \ - MT_Servant_Locator.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -MT_Servant_Locator_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Makefile.am b/TAO/tests/POA/Makefile.am deleted file mode 100644 index baa8f3833d1..00000000000 --- a/TAO/tests/POA/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Bug_2511_Regression \ - Current \ - Deactivate_Object \ - Default_Servant \ - EndpointPolicy \ - Etherealization \ - Excessive_Object_Deactivations \ - Identity \ - MT_Servant_Locator \ - Nested_Non_Servant_Upcalls \ - Non_Servant_Upcalls \ - Object_Reactivation \ - POAManagerFactory \ - POA_Destruction \ - Persistent_ID \ - Policies \ - Reference_Counting \ - Single_Threaded_POA \ - wait_for_completion - diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/.cvsignore b/TAO/tests/POA/Nested_Non_Servant_Upcalls/.cvsignore new file mode 100644 index 00000000000..482d2468c35 --- /dev/null +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/.cvsignore @@ -0,0 +1 @@ +Nested_Non_Servant_Upcalls diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am deleted file mode 100644 index 09eb04269e5..00000000000 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_Nested_Non_Servant_Upcalls.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Nested_Non_Servant_Upcalls - -Nested_Non_Servant_Upcalls_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Nested_Non_Servant_Upcalls_SOURCES = \ - Nested_Non_Servant_Upcalls.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Nested_Non_Servant_Upcalls_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc index a2ddf365db4..6443ce82a36 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(POA*): taoexe, portableserver, minimum_corba { } diff --git a/TAO/tests/POA/Non_Servant_Upcalls/.cvsignore b/TAO/tests/POA/Non_Servant_Upcalls/.cvsignore new file mode 100644 index 00000000000..37d45be2816 --- /dev/null +++ b/TAO/tests/POA/Non_Servant_Upcalls/.cvsignore @@ -0,0 +1 @@ +Non_Servant_Upcalls diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am b/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am deleted file mode 100644 index 7e0bc5f933a..00000000000 --- a/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_Non_Servant_Upcalls.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Non_Servant_Upcalls - -Non_Servant_Upcalls_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Non_Servant_Upcalls_SOURCES = \ - Non_Servant_Upcalls.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Non_Servant_Upcalls_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Object_Reactivation/.cvsignore b/TAO/tests/POA/Object_Reactivation/.cvsignore new file mode 100644 index 00000000000..ccf778224c8 --- /dev/null +++ b/TAO/tests/POA/Object_Reactivation/.cvsignore @@ -0,0 +1 @@ +Object_Reactivation diff --git a/TAO/tests/POA/Object_Reactivation/Makefile.am b/TAO/tests/POA/Object_Reactivation/Makefile.am deleted file mode 100644 index 57ad776232c..00000000000 --- a/TAO/tests/POA/Object_Reactivation/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_Object_Reactivation.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Object_Reactivation - -Object_Reactivation_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Object_Reactivation_SOURCES = \ - Object_Reactivation.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Object_Reactivation_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc index 6136555334d..8b143029fd2 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver, avoids_corba_e_micro { +project(POA*): taoexe, portableserver { } diff --git a/TAO/tests/POA/POAManagerFactory/Makefile.am b/TAO/tests/POA/POAManagerFactory/Makefile.am deleted file mode 100644 index c2a1826f118..00000000000 --- a/TAO/tests/POA/POAManagerFactory/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_POAManagerFactory.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = POAManagerFactory - -POAManagerFactory_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -POAManagerFactory_SOURCES = \ - POAManagerFactory.cpp - -POAManagerFactory_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc index 10139dc0d5e..b6c6400e52f 100644 --- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc +++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(POA*): taoexe, portableserver, pi_server, minimum_corba { } diff --git a/TAO/tests/POA/POA_Destruction/.cvsignore b/TAO/tests/POA/POA_Destruction/.cvsignore new file mode 100644 index 00000000000..0b6ca378266 --- /dev/null +++ b/TAO/tests/POA/POA_Destruction/.cvsignore @@ -0,0 +1 @@ +POA_Destruction diff --git a/TAO/tests/POA/POA_Destruction/Makefile.am b/TAO/tests/POA/POA_Destruction/Makefile.am deleted file mode 100644 index 9a3da85c363..00000000000 --- a/TAO/tests/POA/POA_Destruction/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_POA_Destruction.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = POA_Destruction - -POA_Destruction_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -POA_Destruction_SOURCES = \ - POA_Destruction.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -POA_Destruction_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Persistent_ID/.cvsignore b/TAO/tests/POA/Persistent_ID/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/POA/Persistent_ID/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/POA/Persistent_ID/Makefile.am b/TAO/tests/POA/Persistent_ID/Makefile.am deleted file mode 100644 index d1ac453cd0c..00000000000 --- a/TAO/tests/POA/Persistent_ID/Makefile.am +++ /dev/null @@ -1,104 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.POA_IDL_Persistent_ID.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.POA_Server_Persistent_ID.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.POA_Client_Persistent_ID.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc index da50f0ec27f..de531ab3649 100644 --- a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc +++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc @@ -1,36 +1,16 @@ // -*- MPC -*- // $Id$ -project(POA_IDL*): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(POA_server*): taoserver, avoids_corba_e_micro { - after += POA_IDL* +project(POA_server*): taoserver { Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(POA_client*): taoserver { exename = client - after += POA_IDL* after += POA_server* Source_Files { client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/POA/Policies/.cvsignore b/TAO/tests/POA/Policies/.cvsignore new file mode 100644 index 00000000000..a5bf361f073 --- /dev/null +++ b/TAO/tests/POA/Policies/.cvsignore @@ -0,0 +1 @@ +Policies diff --git a/TAO/tests/POA/Policies/Makefile.am b/TAO/tests/POA/Policies/Makefile.am deleted file mode 100644 index 716682b4339..00000000000 --- a/TAO/tests/POA/Policies/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_Policies.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Policies - -Policies_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Policies_SOURCES = \ - Policies.cpp - -Policies_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp index 59db0b1e922..095c1dca356 100644 --- a/TAO/tests/POA/Policies/Policies.cpp +++ b/TAO/tests/POA/Policies/Policies.cpp @@ -60,7 +60,7 @@ main (int argc, char **argv) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) +#if (TAO_HAS_MINIMUM_POA == 0) { PortableServer::ThreadPolicy_var policy1 = @@ -156,7 +156,7 @@ main (int argc, char **argv) ACE_ASSERT (policy1->value () == policy2->value ()); } -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) +#if (TAO_HAS_MINIMUM_POA == 0) { PortableServer::ImplicitActivationPolicy_var policy1 = diff --git a/TAO/tests/POA/Policies/Policies.mpc b/TAO/tests/POA/Policies/Policies.mpc index 2ff338b723d..49fcc0fc6a3 100644 --- a/TAO/tests/POA/Policies/Policies.mpc +++ b/TAO/tests/POA/Policies/Policies.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver, pi_server, avoids_corba_e_micro { +project(POA*): taoexe, portableserver, pi_server { } diff --git a/TAO/tests/POA/Reference_Counting/Makefile.am b/TAO/tests/POA/Reference_Counting/Makefile.am deleted file mode 100644 index 7d254b6c7e2..00000000000 --- a/TAO/tests/POA/Reference_Counting/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Reference_Counting_Server.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -CLEANFILES = \ - Hello-stamp \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp - -Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Hello.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - HelloC.cpp \ - HelloS.cpp \ - test.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.h \ - HelloS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Single_Threaded_POA/.cvsignore b/TAO/tests/POA/Single_Threaded_POA/.cvsignore new file mode 100644 index 00000000000..e376b320c12 --- /dev/null +++ b/TAO/tests/POA/Single_Threaded_POA/.cvsignore @@ -0,0 +1 @@ +Single_Threaded_POA diff --git a/TAO/tests/POA/Single_Threaded_POA/Makefile.am b/TAO/tests/POA/Single_Threaded_POA/Makefile.am deleted file mode 100644 index d9745f895e2..00000000000 --- a/TAO/tests/POA/Single_Threaded_POA/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_Single_Threaded_POA.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Single_Threaded_POA - -Single_Threaded_POA_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Single_Threaded_POA_SOURCES = \ - Single_Threaded_POA.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Single_Threaded_POA_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc index a2ddf365db4..6443ce82a36 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(POA*): taoexe, portableserver, minimum_corba { } diff --git a/TAO/tests/POA/wait_for_completion/.cvsignore b/TAO/tests/POA/wait_for_completion/.cvsignore new file mode 100644 index 00000000000..8386b39bdc5 --- /dev/null +++ b/TAO/tests/POA/wait_for_completion/.cvsignore @@ -0,0 +1 @@ +wait_for_completion diff --git a/TAO/tests/POA/wait_for_completion/Makefile.am b/TAO/tests/POA/wait_for_completion/Makefile.am deleted file mode 100644 index 6aebb6f3cfa..00000000000 --- a/TAO/tests/POA/wait_for_completion/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.POA_Wait_For_Completion.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = wait_for_completion - -wait_for_completion_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -wait_for_completion_SOURCES = \ - testC.cpp \ - testS.cpp \ - wait_for_completion.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -wait_for_completion_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Parallel_Connect_Strategy/Makefile.am b/TAO/tests/Parallel_Connect_Strategy/Makefile.am deleted file mode 100644 index e80d891d217..00000000000 --- a/TAO/tests/Parallel_Connect_Strategy/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Parallel_Connect_Strategy_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Parallel_Connect_Strategy_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ - Test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Parallel_Connect_Strategy_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc index c81746d1e47..29d26448590 100644 --- a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc +++ b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, iortable { - after += *idl + idlflags += -Sa -St Source_Files { Test_i.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/Param_Test/.cvsignore b/TAO/tests/Param_Test/.cvsignore new file mode 100644 index 00000000000..3e5043763cd --- /dev/null +++ b/TAO/tests/Param_Test/.cvsignore @@ -0,0 +1,4 @@ +anyop +client +param_testA.cpp +server diff --git a/TAO/tests/Param_Test/Makefile.am b/TAO/tests/Param_Test/Makefile.am deleted file mode 100644 index 8fdd6cf3480..00000000000 --- a/TAO/tests/Param_Test/Makefile.am +++ /dev/null @@ -1,263 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Param_Test_Idl.am - -BUILT_SOURCES = \ - param_testC.cpp \ - param_testC.h \ - param_testC.inl \ - param_testS.cpp \ - param_testS.h \ - param_testS.inl - -CLEANFILES = \ - param_test-stamp \ - param_testC.cpp \ - param_testC.h \ - param_testC.inl \ - param_testS.cpp \ - param_testS.h \ - param_testS.inl - -param_testC.cpp param_testC.h param_testC.inl param_testS.cpp param_testS.h param_testS.inl: param_test-stamp - -param_test-stamp: $(srcdir)/param_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/param_test.idl - @touch $@ - -noinst_HEADERS = \ - param_test.idl - -## Makefile.Param_Test_Anyop.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += anyop - -anyop_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -anyop_SOURCES = \ - anyop.cpp \ - param_testC.cpp \ - any.h \ - bd_array_seq.h \ - bd_long_seq.h \ - bd_short_seq.h \ - bd_str_seq.h \ - bd_string.h \ - bd_struct_seq.h \ - bd_wstr_seq.h \ - bd_wstring.h \ - big_union.h \ - client.h \ - complex_any.h \ - driver.h \ - except.h \ - fixed_array.h \ - fixed_struct.h \ - helper.h \ - multdim_array.h \ - nested_struct.h \ - objref.h \ - objref_struct.h \ - options.h \ - param_test_i.h \ - recursive_struct.h \ - recursive_union.h \ - results.h \ - short.h \ - small_union.h \ - tests.h \ - typecode.h \ - ub_any_seq.h \ - ub_array_seq.h \ - ub_long_seq.h \ - ub_objref_seq.h \ - ub_short_seq.h \ - ub_str_seq.h \ - ub_string.h \ - ub_struct_seq.h \ - ub_wstr_seq.h \ - ub_wstring.h \ - ulonglong.h \ - var_array.h \ - var_struct.h - -anyop_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Param_Test_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - any.cpp \ - bd_array_seq.cpp \ - bd_long_seq.cpp \ - bd_short_seq.cpp \ - bd_str_seq.cpp \ - bd_string.cpp \ - bd_struct_seq.cpp \ - bd_wstr_seq.cpp \ - bd_wstring.cpp \ - big_union.cpp \ - client.cpp \ - complex_any.cpp \ - driver.cpp \ - except.cpp \ - fixed_array.cpp \ - fixed_struct.cpp \ - helper.cpp \ - multdim_array.cpp \ - nested_struct.cpp \ - objref.cpp \ - objref_struct.cpp \ - options.cpp \ - param_testC.cpp \ - recursive_struct.cpp \ - recursive_union.cpp \ - results.cpp \ - short.cpp \ - small_union.cpp \ - typecode.cpp \ - ub_any_seq.cpp \ - ub_array_seq.cpp \ - ub_long_seq.cpp \ - ub_objref_seq.cpp \ - ub_short_seq.cpp \ - ub_str_seq.cpp \ - ub_string.cpp \ - ub_struct_seq.cpp \ - ub_wstr_seq.cpp \ - ub_wstring.cpp \ - ulonglong.cpp \ - var_array.cpp \ - var_struct.cpp \ - any.h \ - bd_array_seq.h \ - bd_long_seq.h \ - bd_short_seq.h \ - bd_str_seq.h \ - bd_string.h \ - bd_struct_seq.h \ - bd_wstr_seq.h \ - bd_wstring.h \ - big_union.h \ - client.h \ - complex_any.h \ - driver.h \ - except.h \ - fixed_array.h \ - fixed_struct.h \ - helper.h \ - multdim_array.h \ - nested_struct.h \ - objref.h \ - objref_struct.h \ - options.h \ - recursive_struct.h \ - recursive_union.h \ - results.h \ - short.h \ - small_union.h \ - typecode.h \ - ub_any_seq.h \ - ub_array_seq.h \ - ub_long_seq.h \ - ub_objref_seq.h \ - ub_short_seq.h \ - ub_str_seq.h \ - ub_string.h \ - ub_struct_seq.h \ - ub_wstr_seq.h \ - ub_wstring.h \ - ulonglong.h \ - var_array.h \ - var_struct.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Param_Test_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - param_testC.cpp \ - param_testS.cpp \ - param_test_i.cpp \ - server.cpp \ - param_test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc index 26a4dfa50d7..4ad4fa1ba44 100644 --- a/TAO/tests/Param_Test/Param_Test.mpc +++ b/TAO/tests/Param_Test/Param_Test.mpc @@ -1,33 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - idlflags -= -Sa -St - param_test.idl - } - custom_only = 1 -} - -project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): taoserver, minimum_corba { Source_Files { param_test_i.cpp - param_testS.cpp - param_testC.cpp server.cpp } - IDL_Files { - } } -project(*Client): taoserver, avoids_minimum_corba, dynamicinterface { +project(*Client): taoserver, minimum_corba, dynamicinterface { avoids += ace_for_tao exename = client - after += *idl + after += *Server Source_Files { - param_testC.cpp any.cpp bd_array_seq.cpp bd_long_seq.cpp @@ -70,19 +56,15 @@ project(*Client): taoserver, avoids_minimum_corba, dynamicinterface { var_array.cpp var_struct.cpp } - IDL_Files { - } } -project(*Anyop): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*Anyop): taoserver, minimum_corba { exename = anyop - after += *idl + after += *Client Source_Files { param_testC.cpp anyop.cpp } - IDL_Files { - } } diff --git a/TAO/tests/Permanent_Forward/Makefile.am b/TAO/tests/Permanent_Forward/Makefile.am deleted file mode 100644 index 06863c3a49e..00000000000 --- a/TAO/tests/Permanent_Forward/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Permanent_Forward_StubTest.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = StubTest - -StubTest_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -StubTest_SOURCES = \ - StubTest.cpp - -StubTest_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc index ab5cf4db05d..ab5cf4db05d 100644..100755 --- a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc +++ b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc diff --git a/TAO/tests/Permanent_Forward/README b/TAO/tests/Permanent_Forward/README index 283aa20a87d..283aa20a87d 100644..100755 --- a/TAO/tests/Permanent_Forward/README +++ b/TAO/tests/Permanent_Forward/README diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp index 21fbd5409bd..21fbd5409bd 100644..100755 --- a/TAO/tests/Permanent_Forward/StubTest.cpp +++ b/TAO/tests/Permanent_Forward/StubTest.cpp diff --git a/TAO/tests/Policies/.cvsignore b/TAO/tests/Policies/.cvsignore new file mode 100644 index 00000000000..a3f7ddb3860 --- /dev/null +++ b/TAO/tests/Policies/.cvsignore @@ -0,0 +1 @@ +Manipulation diff --git a/TAO/tests/Policies/Makefile.am b/TAO/tests/Policies/Makefile.am deleted file mode 100644 index 5d4f420caa7..00000000000 --- a/TAO/tests/Policies/Makefile.am +++ /dev/null @@ -1,84 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Policies_Manipulation.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Manipulation - -Manipulation_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Manipulation_SOURCES = \ - Manipulation.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Manipulation_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/AMI/.cvsignore b/TAO/tests/Portable_Interceptors/AMI/.cvsignore new file mode 100644 index 00000000000..e17d953477e --- /dev/null +++ b/TAO/tests/Portable_Interceptors/AMI/.cvsignore @@ -0,0 +1,12 @@ +TestC.cpp +TestC.h +TestC.i +TestS.cpp +TestS.h +TestS.i +TestS_T.cpp +TestS_T.h +TestS_T.i +client +server +test.ior diff --git a/TAO/tests/Portable_Interceptors/AMI/Makefile.am b/TAO/tests/Portable_Interceptors/AMI/Makefile.am deleted file mode 100644 index 48385aeafc0..00000000000 --- a/TAO/tests/Portable_Interceptors/AMI/Makefile.am +++ /dev/null @@ -1,146 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.PI_AMI_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.PI_AMI_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Interceptor.cpp \ - Client_ORBInitializer.cpp \ - Echo_Handler.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Interceptor.h \ - Client_ORBInitializer.h \ - Echo_Handler.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.PI_AMI_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Echo.cpp \ - Server_Interceptor.cpp \ - Server_ORBInitializer.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Echo.h \ - Server_Interceptor.h \ - Server_ORBInitializer.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc index 2e1954944aa..f55237bc40f 100644 --- a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc +++ b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc @@ -1,33 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, ami { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Client) : taoserver, ami, pi, interceptors { exename = client - after += *idl source_files { client.cpp Client_Interceptor.cpp Client_ORBInitializer.cpp Echo_Handler.cpp } - source_files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*server) : taoserver, ami, pi_server, interceptors { exename = server - after += *idl after += *Client source_files { server.cpp @@ -35,10 +20,4 @@ project(*server) : taoserver, ami, pi_server, interceptors { Server_ORBInitializer.cpp Echo.cpp } - source_files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc index 375ecea5930..d53cfd5839c 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc +++ b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc @@ -6,7 +6,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*Server): taoserver, pi_server { +project(*Server): taoserver, pi_server, exceptions { after += *idl Source_Files { StateTransferS.cpp @@ -17,7 +17,7 @@ project(*Server): taoserver, pi_server { } } -project(*Client): taoclient { +project(*Client): taoclient, exceptions { after += *idl Source_Files { StateTransferC.cpp diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/Makefile.am b/TAO/tests/Portable_Interceptors/AdvSlot/Makefile.am deleted file mode 100644 index 00719a979a5..00000000000 --- a/TAO/tests/Portable_Interceptors/AdvSlot/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.AdvSlot_Idl.am - -BUILT_SOURCES = \ - StateTransferC.cpp \ - StateTransferC.h \ - StateTransferC.inl \ - StateTransferS.cpp \ - StateTransferS.h \ - StateTransferS.inl - -CLEANFILES = \ - StateTransfer-stamp \ - StateTransferC.cpp \ - StateTransferC.h \ - StateTransferC.inl \ - StateTransferS.cpp \ - StateTransferS.h \ - StateTransferS.inl - -StateTransferC.cpp StateTransferC.h StateTransferC.inl StateTransferS.cpp StateTransferS.h StateTransferS.inl: StateTransfer-stamp - -StateTransfer-stamp: $(srcdir)/StateTransfer.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/StateTransfer.idl - @touch $@ - -noinst_HEADERS = \ - StateTransfer.idl - -## Makefile.AdvSlot_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - StateTransferC.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.AdvSlot_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - StateTransferC.cpp \ - StateTransferS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc index 6956b78b5fe..0242f6d3360 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc +++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc @@ -6,7 +6,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*Server): taoserver, pi_server { +project(*Server): taoserver, pi_server, exceptions { after += *idl Source_Files { InvokeMeS.cpp @@ -17,7 +17,7 @@ project(*Server): taoserver, pi_server { } } -project(*Client): taoclient { +project(*Client): taoclient, exceptions { after += *idl Source_Files { InvokeMeC.cpp diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am deleted file mode 100644 index e9e8158026a..00000000000 --- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.AdvSlotDblCpy_Idl.am - -BUILT_SOURCES = \ - InvokeMeC.cpp \ - InvokeMeC.h \ - InvokeMeC.inl \ - InvokeMeS.cpp \ - InvokeMeS.h \ - InvokeMeS.inl - -CLEANFILES = \ - InvokeMe-stamp \ - InvokeMeC.cpp \ - InvokeMeC.h \ - InvokeMeC.inl \ - InvokeMeS.cpp \ - InvokeMeS.h \ - InvokeMeS.inl - -InvokeMeC.cpp InvokeMeC.h InvokeMeC.inl InvokeMeS.cpp InvokeMeS.h InvokeMeS.inl: InvokeMe-stamp - -InvokeMe-stamp: $(srcdir)/InvokeMe.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/InvokeMe.idl - @touch $@ - -noinst_HEADERS = \ - InvokeMe.idl - -## Makefile.AdvSlotDblCpy_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - InvokeMeC.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.AdvSlotDblCpy_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - InvokeMeC.cpp \ - InvokeMeS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc index 375ecea5930..d53cfd5839c 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc +++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc @@ -6,7 +6,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*Server): taoserver, pi_server { +project(*Server): taoserver, pi_server, exceptions { after += *idl Source_Files { StateTransferS.cpp @@ -17,7 +17,7 @@ project(*Server): taoserver, pi_server { } } -project(*Client): taoclient { +project(*Client): taoclient, exceptions { after += *idl Source_Files { StateTransferC.cpp diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/Makefile.am b/TAO/tests/Portable_Interceptors/AdvSlotExt/Makefile.am deleted file mode 100644 index d4d07600bf8..00000000000 --- a/TAO/tests/Portable_Interceptors/AdvSlotExt/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.AdvSlotExt_Idl.am - -BUILT_SOURCES = \ - StateTransferC.cpp \ - StateTransferC.h \ - StateTransferC.inl \ - StateTransferS.cpp \ - StateTransferS.h \ - StateTransferS.inl - -CLEANFILES = \ - StateTransfer-stamp \ - StateTransferC.cpp \ - StateTransferC.h \ - StateTransferC.inl \ - StateTransferS.cpp \ - StateTransferS.h \ - StateTransferS.inl - -StateTransferC.cpp StateTransferC.h StateTransferC.inl StateTransferS.cpp StateTransferS.h StateTransferS.inl: StateTransfer-stamp - -StateTransfer-stamp: $(srcdir)/StateTransfer.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/StateTransfer.idl - @touch $@ - -noinst_HEADERS = \ - StateTransfer.idl - -## Makefile.AdvSlotExt_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - StateTransferC.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.AdvSlotExt_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - StateTransferC.cpp \ - StateTransferS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Benchmark/.cvsignore b/TAO/tests/Portable_Interceptors/Benchmark/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Benchmark/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Makefile.am b/TAO/tests/Portable_Interceptors/Benchmark/Makefile.am deleted file mode 100644 index e3ae964d33b..00000000000 --- a/TAO/tests/Portable_Interceptors/Benchmark/Makefile.am +++ /dev/null @@ -1,130 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.PI_Benchmark_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_Benchmark_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Interceptor_Type.cpp \ - Server_ORBInitializer.cpp \ - marker.cpp \ - server.cpp \ - server_interceptors.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Interceptor_Type.h \ - Server_ORBInitializer.h \ - marker.h \ - server_interceptors.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_Benchmark_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - Interceptor_Type.cpp \ - client.cpp \ - client_interceptors.cpp \ - marker.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - Interceptor_Type.h \ - client_interceptors.h \ - marker.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc index 0604ee09b21..59737568104 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc +++ b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc @@ -1,17 +1,7 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - idlflags -= -Sa -St - - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, pi_server, interceptors { - after += *idl Source_Files { test_i.cpp server_interceptors.cpp @@ -20,27 +10,17 @@ project(*Server): taoserver, pi_server, interceptors { Interceptor_Type.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, pi, interceptors { - after += *idl after += *Server Source_Files { + testC.cpp client_interceptors.cpp marker.cpp Client_ORBInitializer.cpp Interceptor_Type.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/.cvsignore b/TAO/tests/Portable_Interceptors/Bug_1559/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Bug_1559/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc index e631e5a425a..2e992878fcb 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc @@ -1,40 +1,22 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, pi_server, interceptors { - after += *idl Source_Files { test_i.cpp Server_ORBInitializer.cpp server_interceptor.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, pi, interceptors { - after += *idl after += *Server Source_Files { + testC.cpp Client_ORBInitializer.cpp client_interceptor.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_1559/Makefile.am deleted file mode 100644 index 28ac6654edf..00000000000 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Makefile.am +++ /dev/null @@ -1,122 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_1559_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Bug_1559_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - server.cpp \ - server_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Bug_1559_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - client_interceptor.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - client_interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_2088/Makefile.am deleted file mode 100644 index 4ecbd165473..00000000000 --- a/TAO/tests/Portable_Interceptors/Bug_2088/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2088_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - Client_ORBInitializer.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc index f1de1f0c531..faffbc6078a 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc @@ -1,41 +1,22 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, pi_server, interceptors { - after += *idl Source_Files { test_i.cpp server.cpp server_interceptor.cpp Server_ORBInitializer.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, pi, interceptors { - after += *idl after += *Server Source_Files { + testC.cpp Client_ORBInitializer.cpp client_interceptor.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am deleted file mode 100644 index f3f7397ed1d..00000000000 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am +++ /dev/null @@ -1,122 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_2510_Regression_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Bug_2510_Regression_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - server.cpp \ - server_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2510_Regression_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - client_interceptor.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - client_interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl index f2f1ff2ea50..ab6c039dcd1 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl @@ -1,4 +1,4 @@ -// $Id$ +// test.idl,v 1.1 2003/08/27 22:43:35 edwardgt Exp module Test_Interceptors { diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/.cvsignore b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/.cvsignore new file mode 100644 index 00000000000..307259b4b57 --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/.cvsignore @@ -0,0 +1 @@ +Collocated_Test diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am deleted file mode 100644 index 70a6732b77f..00000000000 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am +++ /dev/null @@ -1,93 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.PI_Dynamic_Collocated.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Collocated_Test - -Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Echo_Collocated_ORBInitializer.cpp \ - Server_Task.cpp \ - interceptors.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Client_Task.h \ - Echo_Collocated_ORBInitializer.h \ - Server_Task.h \ - interceptors.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -Collocated_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Collocated/Makefile.am b/TAO/tests/Portable_Interceptors/Collocated/Makefile.am deleted file mode 100644 index 18a11126170..00000000000 --- a/TAO/tests/Portable_Interceptors/Collocated/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Dynamic \ - Service_Context_Manipulation - diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.cvsignore b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.cvsignore new file mode 100644 index 00000000000..9b04cc7c341 --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.cvsignore @@ -0,0 +1 @@ +collocated diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am deleted file mode 100644 index 87bf1432baa..00000000000 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am +++ /dev/null @@ -1,93 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.PI_Svc_Context_Manip_Collocated.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = collocated - -collocated_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -collocated_SOURCES = \ - Client_Task.cpp \ - Collocated_ORBInitializer.cpp \ - Collocated_Test.cpp \ - Server_Task.cpp \ - interceptors.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Client_Task.h \ - Collocated_ORBInitializer.h \ - Server_Task.h \ - interceptors.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -collocated_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Dynamic/.cvsignore b/TAO/tests/Portable_Interceptors/Dynamic/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Dynamic/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Makefile.am b/TAO/tests/Portable_Interceptors/Dynamic/Makefile.am deleted file mode 100644 index e1c0ea0ba38..00000000000 --- a/TAO/tests/Portable_Interceptors/Dynamic/Makefile.am +++ /dev/null @@ -1,122 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.PI_Dynamic_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_Dynamic_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Echo_Server_ORBInitializer.cpp \ - server.cpp \ - server_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Echo_Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_Dynamic_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Echo_Client_ORBInitializer.cpp \ - client.cpp \ - client_interceptor.cpp \ - testC.cpp \ - Echo_Client_ORBInitializer.h \ - client_interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc index 05a373172fb..a55faf91bbf 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc +++ b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc @@ -1,42 +1,22 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - idlflags -= -Sa -St - - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, pi_server, interceptors { - after += *idl Source_Files { test_i.cpp server_interceptor.cpp Echo_Server_ORBInitializer.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, pi, interceptors { - after += *idl after += *Server Source_Files { + testC.cpp client_interceptor.cpp Echo_Client_ORBInitializer.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/.cvsignore b/TAO/tests/Portable_Interceptors/ForwardRequest/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.am b/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.am deleted file mode 100644 index 04a079929aa..00000000000 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.am +++ /dev/null @@ -1,126 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.PI_ForwardRequest_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_ForwardRequest_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_ForwardRequest_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - Client_Request_Interceptor.cpp \ - client.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - Client_Request_Interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc index 4c941060cd3..57393219165 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc @@ -1,15 +1,7 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, valuetype, pi, pi_server, interceptors { - after += *idl Source_Files { test_i.cpp @@ -17,27 +9,16 @@ project(*Server): taoserver, valuetype, pi, pi_server, interceptors { Server_Request_Interceptor.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, valuetype, pi, pi_server, interceptors { - after += *idl after += *Server Source_Files { + testC.cpp Client_ORBInitializer.cpp Client_Request_Interceptor.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/.cvsignore b/TAO/tests/Portable_Interceptors/IORInterceptor/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.am b/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.am deleted file mode 100644 index e1f580ff532..00000000000 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.am +++ /dev/null @@ -1,124 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.PI_IORInterceptor_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_IORInterceptor_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - FOO_IORInterceptor.cpp \ - FOO_IORInterceptor_ORBInitializer.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - FOO_IORInterceptor.h \ - FOO_IORInterceptor_ORBInitializer.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_IORInterceptor_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - FOO_ClientRequestInterceptor.cpp \ - FOO_Client_ORBInitializer.cpp \ - client.cpp \ - testC.cpp \ - FOO_ClientRequestInterceptor.h \ - FOO_Client_ORBInitializer.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc index 260a73794bd..fddc7298207 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc @@ -1,40 +1,22 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, iorinterceptor, interceptors { - after += *idl Source_Files { test_i.cpp FOO_IORInterceptor_ORBInitializer.cpp FOO_IORInterceptor.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, pi, interceptors { - after += *idl after += *Server Source_Files { + testC.cpp FOO_Client_ORBInitializer.cpp FOO_ClientRequestInterceptor.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl b/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl index 88d843a1a96..d6c417c48cb 100755 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # -*- perl -*- # $Id$ -use lib "$ENV{ACE_ROOT}/bin"; +use lib '../../../../bin'; use PerlACE::Run_Test; $status = 0; diff --git a/TAO/tests/Portable_Interceptors/Makefile.am b/TAO/tests/Portable_Interceptors/Makefile.am deleted file mode 100644 index bd17fa3898d..00000000000 --- a/TAO/tests/Portable_Interceptors/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - AMI \ - AdvSlot \ - AdvSlotDblCpy \ - AdvSlotExt \ - Benchmark \ - Bug_1559 \ - Bug_2088 \ - Bug_2510_Regression \ - Collocated \ - Dynamic \ - ForwardRequest \ - IORInterceptor \ - ORB_Shutdown \ - PICurrent \ - PolicyFactory \ - Processing_Mode_Policy \ - Recursive_ORBInitializer \ - Redirection \ - Register_Initial_References \ - Request_Interceptor_Flow \ - Service_Context_Manipulation \ - Slot - diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/.cvsignore b/TAO/tests/Portable_Interceptors/ORB_Shutdown/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am deleted file mode 100644 index 31f1515f381..00000000000 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.PI_ORB_Shutdown_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_ORB_Shutdown_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.PI_ORB_Shutdown_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc index c7da0da2ba0..600ba5c118b 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc @@ -1,33 +1,22 @@ // -*- MPC -*- +// // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, pi_server, interceptors { - after += *idl Source_Files { test_i.cpp - testS.cpp - testC.cpp Server_ORBInitializer.cpp Server_Request_Interceptor.cpp server.cpp } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl + after += *Server + Source_Files { testC.cpp client.cpp } - IDL_Files { - } } + diff --git a/TAO/tests/Portable_Interceptors/PICurrent/.cvsignore b/TAO/tests/Portable_Interceptors/PICurrent/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Portable_Interceptors/PICurrent/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Portable_Interceptors/PICurrent/Makefile.am b/TAO/tests/Portable_Interceptors/PICurrent/Makefile.am deleted file mode 100644 index 3f20b1f4671..00000000000 --- a/TAO/tests/Portable_Interceptors/PICurrent/Makefile.am +++ /dev/null @@ -1,124 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.PI_PICurrent_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_PICurrent_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ClientRequestInterceptor2.cpp \ - ServerORBInitializer.cpp \ - ServerRequestInterceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - ClientRequestInterceptor2.h \ - ServerORBInitializer.h \ - ServerRequestInterceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_PICurrent_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ClientORBInitializer.cpp \ - ClientRequestInterceptor.cpp \ - client.cpp \ - testC.cpp \ - ClientORBInitializer.h \ - ClientRequestInterceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc index c638d946a1a..39a60cd5c75 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc +++ b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc @@ -1,15 +1,7 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, pi_server, interceptors { - after += *idl Source_Files { test_i.cpp ServerORBInitializer.cpp @@ -17,25 +9,15 @@ project(*Server): taoserver, pi_server, interceptors { ClientRequestInterceptor2.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, pi, interceptors { - after += *idl after += *Server Source_Files { + testC.cpp ClientORBInitializer.cpp ClientRequestInterceptor.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index 2cd36a5cd9c..4d98648a2ac 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -1,7 +1,6 @@ // -*- C++ -*- #include "ace/Get_Opt.h" -#include "ace/OS_NS_unistd.h" #include "testC.h" #include "ClientORBInitializer.h" @@ -116,28 +115,6 @@ main (int argc, char *argv[]) 1); } - // BUG 2656 testing - _get_policy_overrides() should return an empty - // sequence rather than nill. - CORBA::PolicyTypeSeq types; - CORBA::PolicyList_var policies = server->_get_policy_overrides(types); - - if (policies.ptr () == 0) - { - ACE_ERROR ((LM_ERROR, - "(%P|%t) _get_policy_overrides returned nill pointer\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); - } - else - { - CORBA::ULong const list_size = policies->length(); - if (list_size != 0) - { - ACE_ERROR ((LM_ERROR, - "(%P|%t) _get_policy_overrides returned list with size not equal 0\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); - } - } - server->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -172,7 +149,6 @@ main (int argc, char *argv[]) server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_OS::sleep(1); orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl b/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl index 64932b1e51d..8c021fc59c4 100755 --- a/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl +++ b/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl @@ -5,71 +5,46 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # -*- perl -*- # $Id$ -use lib "$ENV{ACE_ROOT}/bin"; +use lib '../../../../bin'; use PerlACE::Run_Test; $status = 0; $file = PerlACE::LocalFile ("test.ior"); -$cvsfile= PerlACE::LocalFile ("svc.conf"); -unlink $cvsfile; -sub DoTest -{ - $status = 0; - - if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-o test.ior"); - } - else { - $SV = new PerlACE::Process ("server", "-o $file"); - } - $CL = new PerlACE::Process ("client", "-k file://$file"); - - print STDERR "\n\n==== Running PICurrent test\n"; +unlink $file; - unlink $file; - $SV->Spawn (); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $file"); +} +$CL = new PerlACE::Process ("client", "-k file://$file"); - if (PerlACE::waitforfile_timed ($file, 15) == -1) { - print STDERR "ERROR: cannot find file <$file>\n"; - $SV->Kill (); - return 1; - } +print STDERR "\n\n==== Running PICurrent test\n"; - $client = $CL->SpawnWaitKill (60); +$SV->Spawn (); - if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; - $status = 1; - } +if (PerlACE::waitforfile_timed ($file, 15) == -1) { + print STDERR "ERROR: cannot find file <$file>\n"; + $SV->Kill (); + exit 1; +} - $serverexit = $SV->WaitKill (20); +$client = $CL->SpawnWaitKill (60); - if ($serverexit != 0) { - print STDERR "ERROR: server returned $serverexit\n"; - $status = $serverexit; - } - - return $status; +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; } -print STDERR "\n\n==== Without svc.conf (single-threaded)\n"; -$status= DoTest(); -if (0 != $status) { - exit $status -} +$server = $SV->WaitKill (5); -$line= "static Server_Strategy_Factory \"-ORBConcurrency thread-per-connection\"\n"; -open ($fh, '>', $cvsfile); -syswrite ($fh, $line); -close ($fh); -print STDERR "\n\n==== With svc.conf (thread-per-connection)\n"; -$status= DoTest(); -if (0 != $status) { - exit $status +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; } unlink $file; -unlink $cvsfile; exit $status; diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp index 46f5cde72a1..3e0b650480f 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp @@ -1,7 +1,6 @@ // -*- C++ -*- #include "ace/Get_Opt.h" -#include "ace/OS_NS_unistd.h" #include "test_i.h" #include "ServerORBInitializer.h" @@ -145,7 +144,6 @@ main (int argc, char *argv[]) orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_OS::sleep(1); orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/.cvsignore b/TAO/tests/Portable_Interceptors/PolicyFactory/.cvsignore new file mode 100644 index 00000000000..254defddb53 --- /dev/null +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/.cvsignore @@ -0,0 +1 @@ +server diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Makefile.am b/TAO/tests/Portable_Interceptors/PolicyFactory/Makefile.am deleted file mode 100644 index 842cae5254b..00000000000 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Makefile.am +++ /dev/null @@ -1,90 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.PI_PolicyFactory_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - IORInterceptor.cpp \ - Policy.cpp \ - PolicyFactory.cpp \ - Server_ORBInitializer.cpp \ - server.cpp \ - testC.cpp \ - IORInterceptor.h \ - Policy.h \ - PolicyFactory.h \ - Server_ORBInitializer.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl b/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl index c82b4816ef0..58fa821c094 100755 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl @@ -6,7 +6,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # # $Id$ -use lib "$ENV{ACE_ROOT}/bin"; +use lib '../../../../bin'; use PerlACE::Run_Test; $status = 0; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am deleted file mode 100644 index f82da09602d..00000000000 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am +++ /dev/null @@ -1,93 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.PI_ProcMode_Collocated_Collocated.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = PI_ProcMode_Collocated_Test - -PI_ProcMode_Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -PI_ProcMode_Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Echo_Collocated_ORBInitializer.cpp \ - Server_Task.cpp \ - interceptors.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Client_Task.h \ - Echo_Collocated_ORBInitializer.h \ - Server_Task.h \ - interceptors.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -PI_ProcMode_Collocated_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am deleted file mode 100644 index 40e67c75e8c..00000000000 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Collocated \ - Remote - diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am deleted file mode 100644 index 2cda399ffa0..00000000000 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am +++ /dev/null @@ -1,127 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.PI_ProcMode_Remote_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_ProcMode_Remote_RemoteServer.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += PI_ProcMode_Remote_TestServer - -PI_ProcMode_Remote_TestServer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -PI_ProcMode_Remote_TestServer_SOURCES = \ - Echo_Server_ORBInitializer.cpp \ - Server_Task.cpp \ - server_interceptor.cpp \ - server_main.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Echo_Server_ORBInitializer.h \ - Server_Task.h \ - server_interceptor.h \ - test_i.h - -PI_ProcMode_Remote_TestServer_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_ProcMode_Remote_RemoteClient.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += PI_ProcMode_Remote_TestClient - -PI_ProcMode_Remote_TestClient_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -PI_ProcMode_Remote_TestClient_SOURCES = \ - Client_Task.cpp \ - Echo_Client_ORBInitializer.cpp \ - client_interceptor.cpp \ - client_main.cpp \ - testC.cpp \ - Client_Task.h \ - Echo_Client_ORBInitializer.h \ - client_interceptor.h - -PI_ProcMode_Remote_TestClient_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB 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..deab03af74f 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,45 +1,26 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - idlflags -= -St - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*RemoteServer): taoserver, pi_server, interceptors { exename = PI_ProcMode_Remote_TestServer - after += *idl Source_Files { + testC.cpp + testS.cpp test_i.cpp server_interceptor.cpp Echo_Server_ORBInitializer.cpp server_main.cpp Server_Task.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*RemoteClient): taoclient, portableserver, pi, interceptors { exename = PI_ProcMode_Remote_TestClient - after += *idl - after += *RemoteServer Source_Files { + testC.cpp client_interceptor.cpp Echo_Client_ORBInitializer.cpp client_main.cpp Client_Task.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp index 9889379c63d..a1928755bec 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp @@ -154,6 +154,8 @@ Echo_Server_Request_Interceptor::send_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { + ++server_interceptor_check_; + CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -168,15 +170,6 @@ Echo_Server_Request_Interceptor::send_exception ( ACE_CHECK; CORBA::TypeCode_var type = any->type (); - if (0 == type.in()) - { - ACE_DEBUG ((LM_DEBUG, - "No TypeCode information available; perhaps the user IDL\n" - " has been compiled with TAO_IDL \"-St -Sa\" options?\n")); - ACE_THROW (CORBA::NO_IMPLEMENT ()); - } - - ++server_interceptor_check_; const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am deleted file mode 100644 index bffd8a890b0..00000000000 --- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Register_ORBInitializer_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - Client_ORBInitializer.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp deleted file mode 100644 index 9633a8d5413..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// -*- C++ -*- - -#include "Client_ORBInitializer.h" - -ACE_RCSID (Redirection, - Client_ORBInitializer, - "$Id$") - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "Client_Request_Interceptor.h" -#include "tao/StringSeqC.h" -#include "tao/ORB_Constants.h" -#include "ace/OS_NS_string.h" - -void -Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -void -Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - CORBA::StringSeq_var args = info->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - CORBA::String_var forward_str; - - // Extract the last forward reference from the argument list. - CORBA::ULong args_len = args->length (); - for (CORBA::ULong i = 0; i < args_len; ++i) - if (ACE_OS::strcmp ("-s", args[i]) == 0 - && i < (args_len - 1)) - forward_str = args[i + 1]; - - PortableInterceptor::ClientRequestInterceptor_ptr interceptor = - PortableInterceptor::ClientRequestInterceptor::_nil (); - - // Install the client request interceptor. - ACE_NEW_THROW_EX (interceptor, - Client_Request_Interceptor (orb_id.in (), - forward_str.in ()), - CORBA::NO_MEMORY ( - CORBA::SystemException::_tao_minor_code ( - TAO::VMCID, - ENOMEM), - CORBA::COMPLETED_NO)); - ACE_CHECK; - - PortableInterceptor::ClientRequestInterceptor_var - client_interceptor = interceptor; - - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - -} - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h deleted file mode 100644 index dde588fb113..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h +++ /dev/null @@ -1,50 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#ifndef TAO_CLIENT_ORB_INITIALIZER_H -#define TAO_CLIENT_ORB_INITIALIZER_H - -#include /**/ "ace/pre.h" - -#include "tao/PI/PI.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "tao/LocalObject.h" - -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -/// Client side ORB initializer. -class Client_ORBInitializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object -{ -public: - - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); -}; - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CLIENT_ORB_INITIALIZER_H */ diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp deleted file mode 100644 index 9cf394aa5b5..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp +++ /dev/null @@ -1,84 +0,0 @@ -// -*- C++ -*- - -#include "Client_Request_Interceptor.h" -#include "testC.h" -#include "ace/Log_Msg.h" - -ACE_RCSID (Redirection, - Client_Request_Interceptor, - "$Id$") - -Client_Request_Interceptor::Client_Request_Interceptor ( - const char *orb_id, - const char *forward_str) - : orb_id_ (CORBA::string_dup (orb_id)), - orb_ (), - request_count_ (0), - forward_str_ (CORBA::string_dup (forward_str)) -{ -} - -char * -Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return CORBA::string_dup ("Client_Request_Interceptor"); -} - -void -Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -void -Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) -{ - ++this->request_count_; -} - -void -Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -void -Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -void -Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) -{ - if (CORBA::is_nil (this->orb_.in ())) - { - int argc = 0; - this->orb_ = CORBA::ORB_init (argc, - 0, - this->orb_id_.in ()); - } - - CORBA::Object_var forward = - this->orb_->string_to_object (this->forward_str_.in ()); - - // Notice that this is not a permanent forward. - ACE_THROW (PortableInterceptor::ForwardRequest (forward.in ())); -} - -void -Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) -{ -} diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h deleted file mode 100644 index fc6786cc224..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h +++ /dev/null @@ -1,97 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#ifndef CLIENT_REQUEST_INTERCEPTOR_H -#define CLIENT_REQUEST_INTERCEPTOR_H - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PI/PI.h" -#include "tao/PortableInterceptorC.h" -#include "tao/LocalObject.h" -#include "tao/ORB.h" -#include "tao/CORBA_String.h" - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -/** - * @class Client_Request_Interceptor - */ -class Client_Request_Interceptor - : public virtual PortableInterceptor::ClientRequestInterceptor, - public virtual TAO_Local_RefCounted_Object -{ -public: - - /// Constructor. - Client_Request_Interceptor (const char *orb_id, - const char *forward_str); - - /** - * @name Methods Required by the Client Request Interceptor - * Interface - * - * These are methods that must be implemented since they are pure - * virtual in the abstract base class. They are the canonical - * methods required for all client request interceptors. - */ - //@{ - /// Return the name of this ClientRequestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); - - virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); - - virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); - //@} - -private: - - ///The ID of the ORB this interceptor is registered with. - CORBA::String_var orb_id_; - - /// Pseudo-reference to the ORB this interceptor is registered - /// with. - CORBA::ORB_var orb_; - - /// The number of requests intercepted by this interceptor. - CORBA::ULong request_count_; - - CORBA::String_var forward_str_; - -}; - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#endif /* CLIENT_REQUEST_INTERCEPTOR_H */ diff --git a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp b/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp deleted file mode 100644 index 3a0f5ad82ac..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp +++ /dev/null @@ -1,6 +0,0 @@ -// author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// $Id$ - -#include "CrashPoint.h" - -short crash_point = 0; diff --git a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h b/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h deleted file mode 100644 index a3729431834..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h +++ /dev/null @@ -1,18 +0,0 @@ -// author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// $Id$ - -#ifndef CRASH_POINT_H -#define CRASH_POINT_H - -// Valid crash-point values: -// -// 0 no crash (default) -// -// 1 crash before logging the reply -// -// 2 crash after logging the reply but before replying to the client -// - -extern short crash_point; - -#endif // CRASH_POINT_H diff --git a/TAO/tests/Portable_Interceptors/Redirection/Makefile.am b/TAO/tests/Portable_Interceptors/Redirection/Makefile.am deleted file mode 100644 index 658dfa945ad..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/Makefile.am +++ /dev/null @@ -1,128 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.PI_Redirection_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_Redirection_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - Client_Request_Interceptor.cpp \ - client.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - Client_Request_Interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_Redirection_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - CrashPoint.cpp \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - CrashPoint.h \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc b/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc deleted file mode 100644 index 2609cbc8946..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc +++ /dev/null @@ -1,44 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): taoserver, valuetype, pi, pi_server, interceptors { - after += *idl - - Source_Files { - test_i.cpp - Server_ORBInitializer.cpp - Server_Request_Interceptor.cpp - CrashPoint.cpp - server.cpp - } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } -} - -project(*Client): taoclient, valuetype, pi, pi_server, interceptors { - after += *idl - - Source_Files { - testC.cpp - Client_ORBInitializer.cpp - Client_Request_Interceptor.cpp - client.cpp - } - Source_Files { - testC.cpp - } - IDL_Files { - } -} - diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp deleted file mode 100644 index 822a351436d..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// -*- C++ -*- - -#include "Server_ORBInitializer.h" - -ACE_RCSID (Redirection, - Server_ORBInitializer, - "$Id$") - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "Server_Request_Interceptor.h" -#include "tao/ORB_Constants.h" - -Server_ORBInitializer::Server_ORBInitializer (void) -{ -} - -void -Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -void -Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - PortableInterceptor::ServerRequestInterceptor_ptr interceptor; - ACE_NEW_THROW_EX (interceptor, - Server_Request_Interceptor, - CORBA::NO_MEMORY ( - CORBA::SystemException::_tao_minor_code ( - TAO::VMCID, - ENOMEM), - CORBA::COMPLETED_NO)); - ACE_CHECK; - - info->add_server_request_interceptor (interceptor - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h deleted file mode 100644 index fffd3e7b89c..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h +++ /dev/null @@ -1,57 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#ifndef TAO_SERVER_ORB_INITIALIZER_H -#define TAO_SERVER_ORB_INITIALIZER_H - -#include /**/ "ace/pre.h" - -#include "tao/PI/PI.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "tao/LocalObject.h" - -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -// Forward declaration. -class Server_Request_Interceptor; - -/// Server side ORB initializer. -class Server_ORBInitializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object -{ -public: - - /// Constructor. - Server_ORBInitializer (void); - - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - -}; - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - -#include /**/ "ace/post.h" - -#endif /* TAO_SERVER_ORB_INITIALIZER_H */ diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp deleted file mode 100644 index 9ab80aa7110..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- - -#include "Server_Request_Interceptor.h" -#include "tao/ORB_Constants.h" -#include "ace/Log_Msg.h" -#include "CrashPoint.h" - -ACE_RCSID (Redirection, - Server_Request_Interceptor, - "$Id$") - -Server_Request_Interceptor::Server_Request_Interceptor (void) - : request_count_ (0) -{ -} - -Server_Request_Interceptor::~Server_Request_Interceptor (void) -{ -} - -char * -Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return CORBA::string_dup ("Server_Request_Interceptor"); -} - -void -Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -void -Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) -{ - this->request_count_++; -} - -void -Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) -{ -} - -void -Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (crash_point == 1 && this->request_count_ == 2) ACE_OS::exit (1); -} - -void -Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) -{ -} - -void -Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) -{ -} diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h deleted file mode 100644 index 4dc535962a1..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h +++ /dev/null @@ -1,97 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#ifndef SERVER_REQUEST_INTERCEPTOR_H -#define SERVER_REQUEST_INTERCEPTOR_H - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "testC.h" -#include "tao/LocalObject.h" -#include "tao/PortableInterceptorC.h" -#include "tao/PI_Server/PI_Server.h" - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -/** - * @class Server_Request_Interceptor - */ -class Server_Request_Interceptor - : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object -{ -public: - - /// Constructor. - Server_Request_Interceptor (void); - - /** - * @name Methods Required by the Server Request Interceptor - * Interface - * - * These are methods that must be implemented since they are pure - * virtual in the abstract base class. They are the canonical - * methods required for all server request interceptors. - */ - //@{ - /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); - - virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); - - virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); - - virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); - //@} - -protected: - - /// Destructor. - ~Server_Request_Interceptor (void); - -private: - - /// The number of requests intercepted by this interceptor. - CORBA::ULong request_count_; - -}; - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#endif /* SERVER_REQUEST_INTERCEPTOR_H */ diff --git a/TAO/tests/Portable_Interceptors/Redirection/client.cpp b/TAO/tests/Portable_Interceptors/Redirection/client.cpp deleted file mode 100644 index 8da1c03c45b..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/client.cpp +++ /dev/null @@ -1,126 +0,0 @@ -// -*- C++ -*- - -#include "ace/Get_Opt.h" -#include "testC.h" -#include "Client_ORBInitializer.h" -#include "tao/ORBInitializer_Registry.h" - -ACE_RCSID (Redirection, - client, - "$Id$") - -const char *ior1 = 0; -const char *ior2 = 0; - -int -parse_args (int argc, char *argv[]) -{ - if (argc != 5) // foo -p IOR_1 -s IOR_2 - ACE_ERROR_RETURN ((LM_ERROR, - "Wrong number of arguments.\n"), - -1); - - ACE_Get_Opt get_opts (argc, argv, "p:s:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'p': - ior1 = get_opts.opt_arg (); - break; - case 's': - ior2 = get_opts.opt_arg (); - break; - default: - ACE_ERROR_RETURN ((LM_ERROR, - "Usage: %s " - "-p IOR_1 -s IOR_2\n", - argv[0]), - -1); - } - - return 0; -} - -int -main (int argc, char *argv[]) -{ - int status = 0; - - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { -#if TAO_HAS_INTERCEPTORS == 1 - PortableInterceptor::ORBInitializer_ptr temp_initializer = - PortableInterceptor::ORBInitializer::_nil (); - - ACE_NEW_RETURN (temp_initializer, - Client_ORBInitializer, - -1); // No exceptions yet! - PortableInterceptor::ORBInitializer_var orb_initializer = - temp_initializer; - - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - "Client ORB" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (::parse_args (argc, argv) != 0) - return -1; - - CORBA::Object_var object = - orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - RedirectionTest::test_var server = - RedirectionTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (server.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", - ior1), - 1); - } - - CORBA::Short number = 0; - for (int i = 1; i <= 4; ++i) - { - ACE_DEBUG ((LM_INFO, - "CLIENT: Issuing request %d.\n", - i)); - - number = server->number (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_INFO, - "CLIENT: Request %d handled by object %d.\n", - i, - number)); - } - - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); - return -1; - } - ACE_ENDTRY; - - if (status != -1) - ACE_DEBUG ((LM_INFO, - "PortableInterceptor::Redirection test passed.\n")); - - return status; -} diff --git a/TAO/tests/Portable_Interceptors/Redirection/run_test.pl b/TAO/tests/Portable_Interceptors/Redirection/run_test.pl deleted file mode 100755 index 024921a57cd..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/run_test.pl +++ /dev/null @@ -1,75 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- -# -# $Id$ - - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; - -$file1 = PerlACE::LocalFile ("test1.ior"); -$file2 = PerlACE::LocalFile ("test2.ior"); - -unlink $file1; -unlink $file2; - -$SV1 = new PerlACE::Process ("server", "-o $file1 -c 1 -n 1"); -$SV2 = new PerlACE::Process ("server", "-o $file2 -n 2"); -$CL = new PerlACE::Process ("client", "-p file://$file1 -s file://$file2"); - -$status = 0; - -print STDERR "\n\n==== Running PortableInterceptor::Redirection test\n"; - -$SV1->Spawn (); -$SV2->Spawn (); - -if (PerlACE::waitforfile_timed ($file1, 15) == -1) { - print STDERR "ERROR: cannot find file <$file1>\n"; - $SV1->Kill (); - exit 1; -} - -if (PerlACE::waitforfile_timed ($file2, 15) == -1) { - print STDERR "ERROR: cannot find file <$file2>\n"; - $SV2->Kill (); - exit 1; -} - -$client = $CL->SpawnWaitKill (60); - -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; - $status = 1; -} - -$server1 = $SV1->WaitKill (5); - -# The first server will crash by design and in such instance it will -# return the magic number 1. The test must not interpret it as an -# error. - -if ($server1 != 0) { - if ($server1 != 1) { - print STDERR "ERROR: server1 returned $server1\n"; - $status = 1; - } - else { - print STDERR "INFO: server1 commited suicide as expected\n"; - } -} - -$server2 = $SV2->WaitKill (5); - -if ($server2 != 0) { - print STDERR "ERROR: server2 returned $server2\n"; - $status = 1; -} - -unlink $file1; -unlink $file2; - -exit $status; diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp deleted file mode 100644 index 6ea299edcb3..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp +++ /dev/null @@ -1,138 +0,0 @@ -// -*- C++ -*- - -#include "ace/Get_Opt.h" -#include "test_i.h" -#include "Server_ORBInitializer.h" -#include "Server_Request_Interceptor.h" -#include "tao/ORBInitializer_Registry.h" -#include "ace/OS_NS_stdio.h" -#include "CrashPoint.h" - -ACE_RCSID (Redirection, - server, - "$Id$") - -const char *ior_file = 0; -int number = 0; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "o:c:n:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'o': - ior_file = get_opts.opt_arg (); - break; - case 'c': - crash_point = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'n': - number = ACE_OS::atoi (get_opts.opt_arg ()); - break; - default: - ACE_ERROR_RETURN ((LM_ERROR, - "Usage: %s " - "-o <IOR> " - "-c <CrashPoint> " - "-n <server number> \n", - argv[0]), - -1); - } - - return 0; -} - -int -main (int argc, char *argv[]) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { -#if TAO_HAS_INTERCEPTORS == 1 - Server_ORBInitializer *temp_initializer = 0; - ACE_NEW_RETURN (temp_initializer, - Server_ORBInitializer, - -1); // No exceptions yet! - PortableInterceptor::ORBInitializer_var orb_initializer = - temp_initializer; - - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - 1); - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (::parse_args (argc, argv) != 0) - return -1; - - test_i *test_impl; - ACE_NEW_RETURN (test_impl, test_i (number, orb.in ()), 1); - PortableServer::ServantBase_var owner_transfer (test_impl); - - RedirectionTest::test_var test = - test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::String_var ior = - orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - FILE *output_file= ACE_OS::fopen (ior_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file <%s> for writing " - "IOR: %s", - ior.in ()), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); - return -1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/tests/Portable_Interceptors/Redirection/test.idl b/TAO/tests/Portable_Interceptors/Redirection/test.idl deleted file mode 100644 index 8a89326b9c9..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/test.idl +++ /dev/null @@ -1,17 +0,0 @@ -// -*- IDL -*- -// $Id$ - -#include "tao/PI_Server/PI_Server_include.pidl" - -module RedirectionTest -{ - interface test - { - /// Return the number assigned to the current object. For - /// example, object one will return "1," and object two will - /// return "2." - short number (); - - oneway void shutdown (); - }; -}; diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp deleted file mode 100644 index 631d5a349e1..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// -*- C++ -*- - -#include "test_i.h" - -ACE_RCSID (Redirection, - test_i, - "$Id$") - -test_i::test_i (CORBA::Short num, - CORBA::ORB_ptr orb) - : number_ (num), - orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -test_i::~test_i (void) -{ -} - -CORBA::Short -test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return this->number_; -} - -void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_DEBUG ((LM_DEBUG, - "Server is shutting down via object %d.\n", - this->number_)); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h deleted file mode 100644 index 643fb36e3c7..00000000000 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h +++ /dev/null @@ -1,46 +0,0 @@ -// -*- C++ -*- - -#ifndef TEST_I_H -#define TEST_I_H - -#include "testS.h" - -/** - * @class test_i - * - * @brief Simple test class. - * - * This class implements the "test" interface used in this test. - * - * $Id$ - */ -class test_i : public virtual POA_RedirectionTest::test -{ -public: - - /// Constructor. - test_i (CORBA::Short num, - CORBA::ORB_ptr orb); - - /// Destructor. - ~test_i (void); - - /// Return the number assigned to this object. - virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - -private: - - /// The number assigned to this object. - CORBA::Short number_; - - /// Pseudo-reference to the ORB. - CORBA::ORB_var orb_; - -}; - -#endif /* TEST_I_H */ diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Makefile.am b/TAO/tests/Portable_Interceptors/Register_Initial_References/Makefile.am deleted file mode 100644 index 7df0c9c93ac..00000000000 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Makefile.am +++ /dev/null @@ -1,86 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Register_ORBInitializer_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp index 87e209cd234..ccbc8aefdca 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp @@ -4,9 +4,8 @@ // #include "Server_ORBInitializer.h" -#include "test_i.h" #include "tao/ORBInitializer_Registry.h" -#include "tao/ORB_Constants.h" +#include "test_i.h" ACE_RCSID (Recursive_ORBInitializer, Server_ORBInitializer, @@ -89,7 +88,7 @@ Server_ORBInitializer::pre_init ( } ACE_CATCH (CORBA::BAD_PARAM , ex) { - if (ex.minor () == (CORBA::OMGVMCID | 27)) + if ((ex.minor() & 0xFFFU) == 27) { invalid_object = true; } @@ -101,7 +100,7 @@ Server_ORBInitializer::pre_init ( if (!invalid_object) ACE_ERROR ((LM_ERROR, "ERROR: Registering with a nil object to ORBInitInfo " - "doesn't throw bad param with OMG minor code 27\n")); + "doesn't throw bad param with minor code 27\n")); } void diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/.cvsignore b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am deleted file mode 100644 index 16342607c04..00000000000 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am +++ /dev/null @@ -1,126 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.PI_Request_Interceptor_Flow_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_Request_Interceptor_Flow_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Request_Interceptor.cpp \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Request_Interceptor.h \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_Request_Interceptor_Flow_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - Client_Request_Interceptor.cpp \ - Request_Interceptor.cpp \ - client.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - Client_Request_Interceptor.h \ - Request_Interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc index a93b7879472..ee81ede8553 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc @@ -1,16 +1,7 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - idlflags -= -St - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, pi_server, interceptors { - after += *idl Source_Files { test_i.cpp Server_ORBInitializer.cpp @@ -18,26 +9,16 @@ project(*Server): taoserver, pi_server, interceptors { Request_Interceptor.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, pi, interceptors { - after += *idl after += *Server Source_Files { + testC.cpp Client_ORBInitializer.cpp Client_Request_Interceptor.cpp Request_Interceptor.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl index b81cef5bf37..162acd63c17 100755 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # -*- perl -*- # $Id$ -use lib "$ENV{ACE_ROOT}/bin"; +use lib '../../../../bin'; use PerlACE::Run_Test; $status = 0; diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/.cvsignore b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am deleted file mode 100644 index bb542e1d16f..00000000000 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am +++ /dev/null @@ -1,122 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.PI_Svc_Context_Manip_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_Svc_Context_Manip_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - server.cpp \ - server_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_Svc_Context_Manip_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - client_interceptor.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - client_interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc index 495f722563e..2e992878fcb 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc @@ -1,39 +1,22 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, pi_server, interceptors { - after += *idl Source_Files { test_i.cpp Server_ORBInitializer.cpp server_interceptor.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, pi, interceptors { after += *Server Source_Files { + testC.cpp Client_ORBInitializer.cpp client_interceptor.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Portable_Interceptors/Slot/Makefile.am b/TAO/tests/Portable_Interceptors/Slot/Makefile.am deleted file mode 100644 index 5e0d16c1a6d..00000000000 --- a/TAO/tests/Portable_Interceptors/Slot/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.PI_Slot_Driver.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS = driver - -driver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -driver_SOURCES = \ - driver.cpp - -driver_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/QtTests/.cvsignore b/TAO/tests/QtTests/.cvsignore new file mode 100644 index 00000000000..51933fcff4f --- /dev/null +++ b/TAO/tests/QtTests/.cvsignore @@ -0,0 +1,8 @@ +client +client +client_moc.cpp +client_moc.cpp +server +server +test_i_moc.cpp +test_i_moc.cpp diff --git a/TAO/tests/QtTests/Makefile.am b/TAO/tests/QtTests/Makefile.am deleted file mode 100644 index cce58b2f718..00000000000 --- a/TAO/tests/QtTests/Makefile.am +++ /dev/null @@ -1,178 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.QtTests_Server.am - -if BUILD_ACE_QTREACTOR -if BUILD_EXCEPTIONS -if BUILD_QT -if BUILD_TAO_QTRESOURCE - -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -BUILT_SOURCES += \ - test_i_moc.cpp - -CLEANFILES += \ - test_i_moc.cpp - -test_i_moc.cpp: $(srcdir)/test_i.h - $(QTDIR)/bin/moc $(srcdir)/test_i.h -o test_i_moc.cpp - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_QT_CPPFLAGS) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i_moc.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -server_LDFLAGS = \ - $(ACE_QT_LDFLAGS) - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_QtResource.la \ - $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_QT_LIBS) - -endif BUILD_TAO_QTRESOURCE -endif BUILD_QT -endif BUILD_EXCEPTIONS -endif BUILD_ACE_QTREACTOR - -## Makefile.QtTests_Client.am - -if BUILD_ACE_QTREACTOR -if BUILD_EXCEPTIONS -if BUILD_QT -if BUILD_TAO_QTRESOURCE - -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -BUILT_SOURCES += \ - client_moc.cpp - -CLEANFILES += \ - client_moc.cpp - -client_moc.cpp: $(srcdir)/client.h - $(QTDIR)/bin/moc $(srcdir)/client.h -o client_moc.cpp - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_QT_CPPFLAGS) - -client_SOURCES = \ - client.cpp \ - client_moc.cpp \ - testC.cpp \ - client.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_LDFLAGS = \ - $(ACE_QT_LDFLAGS) - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_QtResource.la \ - $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_QT_LIBS) - -endif BUILD_TAO_QTRESOURCE -endif BUILD_QT -endif BUILD_EXCEPTIONS -endif BUILD_ACE_QTREACTOR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index 0139cdf6672..0139cdf6672 100644..100755 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h index e4b50c40a70..e4b50c40a70 100644..100755 --- a/TAO/tests/QtTests/client.h +++ b/TAO/tests/QtTests/client.h diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index 68ed428b4b6..68ed428b4b6 100644..100755 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp diff --git a/TAO/tests/QtTests/test.idl b/TAO/tests/QtTests/test.idl index 1dc08b44be6..1dc08b44be6 100644..100755 --- a/TAO/tests/QtTests/test.idl +++ b/TAO/tests/QtTests/test.idl diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp index 0d961989108..0d961989108 100644..100755 --- a/TAO/tests/QtTests/test_i.cpp +++ b/TAO/tests/QtTests/test_i.cpp diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h index ac04d36afc9..ac04d36afc9 100644..100755 --- a/TAO/tests/QtTests/test_i.h +++ b/TAO/tests/QtTests/test_i.h diff --git a/TAO/tests/Queued_Message_Test/.cvsignore b/TAO/tests/Queued_Message_Test/.cvsignore new file mode 100644 index 00000000000..ef1558284ab --- /dev/null +++ b/TAO/tests/Queued_Message_Test/.cvsignore @@ -0,0 +1 @@ +Queued_Message_Test diff --git a/TAO/tests/Queued_Message_Test/Makefile.am b/TAO/tests/Queued_Message_Test/Makefile.am deleted file mode 100644 index f7e4ca76e66..00000000000 --- a/TAO/tests/Queued_Message_Test/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Queued_Message_Test.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Queued_Message_Test - -Queued_Message_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Queued_Message_Test_SOURCES = \ - Queued_Message_Test.cpp - -Queued_Message_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/.cvsignore b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/.cvsignore new file mode 100644 index 00000000000..9daeafb9864 --- /dev/null +++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/.cvsignore @@ -0,0 +1 @@ +test diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am deleted file mode 100644 index caf5740f1d4..00000000000 --- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am +++ /dev/null @@ -1,84 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.AO_Multiple_ORBs.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - test.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Banded_Connections/.cvsignore b/TAO/tests/RTCORBA/Banded_Connections/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Banded_Connections/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Banded_Connections/Makefile.am b/TAO/tests/RTCORBA/Banded_Connections/Makefile.am deleted file mode 100644 index a6440b36851..00000000000 --- a/TAO/tests/RTCORBA/Banded_Connections/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_Banded_Conn_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_Banded_Conn_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Banded_Conn_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc index b0b7fbf765a..b62ff14a3d9 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc +++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc @@ -1,35 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): rt_server { - after += *idl Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): rt_client { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/RTCORBA/Client_Propagated/.cvsignore b/TAO/tests/RTCORBA/Client_Propagated/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Client_Propagated/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Client_Propagated/Makefile.am b/TAO/tests/RTCORBA/Client_Propagated/Makefile.am deleted file mode 100644 index 9502ecee8a8..00000000000 --- a/TAO/tests/RTCORBA/Client_Propagated/Makefile.am +++ /dev/null @@ -1,122 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_Client_Propagated_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_Client_Propagated_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Client_ORBInitializer.h \ - interceptors.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Client_Propagated_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - interceptors.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - interceptors.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc index 083f7252710..9f0ce92c6ea 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc +++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc @@ -1,21 +1,9 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): rt_server { - after += *idl Source_Files { server.cpp - testS.cpp - testC.cpp - } - IDL_Files { } } @@ -27,6 +15,5 @@ project(*Client): rt_client, interceptors { Client_ORBInitializer.cpp client.cpp } - IDL_Files { - } } + diff --git a/TAO/tests/RTCORBA/Client_Protocol/.cvsignore b/TAO/tests/RTCORBA/Client_Protocol/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Client_Protocol/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Client_Protocol/Makefile.am b/TAO/tests/RTCORBA/Client_Protocol/Makefile.am deleted file mode 100644 index 3d0b9e87f71..00000000000 --- a/TAO/tests/RTCORBA/Client_Protocol/Makefile.am +++ /dev/null @@ -1,116 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_Client_Protocol_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_Client_Protocol_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Client_Protocol_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc index 768b49acf2f..e51a077e7fe 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc +++ b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc @@ -1,35 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): strategies, rt_server { - after += *idl Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): strategies, rt_client { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/RTCORBA/Collocation/.cvsignore b/TAO/tests/RTCORBA/Collocation/.cvsignore new file mode 100644 index 00000000000..bee89094a99 --- /dev/null +++ b/TAO/tests/RTCORBA/Collocation/.cvsignore @@ -0,0 +1 @@ +Collocation diff --git a/TAO/tests/RTCORBA/Collocation/Makefile.am b/TAO/tests/RTCORBA/Collocation/Makefile.am deleted file mode 100644 index 2b6d3de3509..00000000000 --- a/TAO/tests/RTCORBA/Collocation/Makefile.am +++ /dev/null @@ -1,84 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.RTCORBA_Collocation_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Collocation - -Collocation_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocation_SOURCES = \ - Collocation.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Collocation_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/.cvsignore b/TAO/tests/RTCORBA/Destroy_Thread_Pool/.cvsignore new file mode 100644 index 00000000000..507a06df4d9 --- /dev/null +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/.cvsignore @@ -0,0 +1 @@ +Destroy_Thread_Pool diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.am b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.am deleted file mode 100644 index 0244903c9e5..00000000000 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.RTCORBA_Destroy_Thread_Pool_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = Destroy_Thread_Pool - -Destroy_Thread_Pool_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Destroy_Thread_Pool_SOURCES = \ - Destroy_Thread_Pool.cpp - -Destroy_Thread_Pool_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Diffserv/.cvsignore b/TAO/tests/RTCORBA/Diffserv/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Diffserv/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Diffserv/Makefile.am b/TAO/tests/RTCORBA/Diffserv/Makefile.am deleted file mode 100644 index 8f22594f947..00000000000 --- a/TAO/tests/RTCORBA/Diffserv/Makefile.am +++ /dev/null @@ -1,119 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_Diffserv_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_Diffserv_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Custom_Network_Priority_Mapping.cpp \ - client.cpp \ - testC.cpp \ - Custom_Network_Priority_Mapping.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Diffserv_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Custom_Network_Priority_Mapping.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Custom_Network_Priority_Mapping.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc index 91b149ffd7a..85cadf3219a 100644 --- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc +++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc @@ -1,37 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*client) : taoexe, portableserver, rtcorba, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*client) : taoexe, portableserver, rtcorba, minimum_corba { source_files { client.cpp Custom_Network_Priority_Mapping.cpp } - source_files { - testC.cpp - } - IDL_Files { - } } -project(*server) : taoexe, rtportableserver, rtcorba, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*server) : taoexe, rtportableserver, rtcorba, minimum_corba { after += *client source_files { server.cpp Custom_Network_Priority_Mapping.cpp } - source_files { - testC.cpp - testS.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am deleted file mode 100644 index c01d8f58cfb..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am +++ /dev/null @@ -1,119 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RT_Dynamic_Thread_Pool_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RT_Dynamic_Thread_Pool_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RT_Dynamic_Thread_Pool_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc index b5e0ed23f6d..ebf79370785 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): strategies, rt_server, minimum_corba { Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): strategies, rt_client, minimum_corba { after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/RTCORBA/Explicit_Binding/.cvsignore b/TAO/tests/RTCORBA/Explicit_Binding/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Explicit_Binding/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Explicit_Binding/Makefile.am b/TAO/tests/RTCORBA/Explicit_Binding/Makefile.am deleted file mode 100644 index e7b995445be..00000000000 --- a/TAO/tests/RTCORBA/Explicit_Binding/Makefile.am +++ /dev/null @@ -1,116 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_Explicit_Binding_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_Explicit_Binding_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Explicit_Binding_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc index 9cd33a6af63..a77351b5090 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc +++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc @@ -1,36 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - Source_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): strategies, rt_server, minimum_corba { Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): strategies, rt_client, minimum_corba { after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/RTCORBA/Linear_Priority/.cvsignore b/TAO/tests/RTCORBA/Linear_Priority/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Linear_Priority/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Linear_Priority/Makefile.am b/TAO/tests/RTCORBA/Linear_Priority/Makefile.am deleted file mode 100644 index 4f061caddbe..00000000000 --- a/TAO/tests/RTCORBA/Linear_Priority/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_Linear_Priority_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_Linear_Priority_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Linear_Priority_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc index 1aa4e9117dd..87178218057 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc +++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc @@ -1,35 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): rt_server, minimum_corba { Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): rt_client, minimum_corba { after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/.cvsignore b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/.cvsignore new file mode 100644 index 00000000000..7f6ba2d23d8 --- /dev/null +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/.cvsignore @@ -0,0 +1,3 @@ +client +server +test_run.data diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am deleted file mode 100644 index ab33bc2b948..00000000000 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am +++ /dev/null @@ -1,116 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_MT_Client_Proto_Prio_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_MT_Client_Proto_Prio_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_MT_Client_Proto_Prio_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc index 7c92380ae57..a77351b5090 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc @@ -1,35 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - Source_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): strategies, rt_server, minimum_corba { Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): strategies, rt_client, minimum_corba { after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/RTCORBA/Makefile.am b/TAO/tests/RTCORBA/Makefile.am deleted file mode 100644 index 568e309829e..00000000000 --- a/TAO/tests/RTCORBA/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Activate_Object_Multiple_ORBs \ - Banded_Connections \ - Client_Propagated \ - Client_Protocol \ - Collocation \ - Destroy_Thread_Pool \ - Diffserv \ - Dynamic_Thread_Pool \ - Explicit_Binding \ - Linear_Priority \ - MT_Client_Protocol_Priority \ - ORB_init \ - Persistent_IOR \ - Policies \ - Policy_Combinations \ - Priority_Inversion_With_Bands \ - Private_Connection \ - Profile_And_Endpoint_Selection \ - RTMutex \ - Server_Declared \ - Server_Protocol \ - Thread_Pool - diff --git a/TAO/tests/RTCORBA/ORB_init/.cvsignore b/TAO/tests/RTCORBA/ORB_init/.cvsignore new file mode 100644 index 00000000000..c32f7b71039 --- /dev/null +++ b/TAO/tests/RTCORBA/ORB_init/.cvsignore @@ -0,0 +1 @@ +ORB_init diff --git a/TAO/tests/RTCORBA/ORB_init/Makefile.am b/TAO/tests/RTCORBA/ORB_init/Makefile.am deleted file mode 100644 index 3b87ae65eeb..00000000000 --- a/TAO/tests/RTCORBA/ORB_init/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.ORB_init_RT.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = ORB_init - -ORB_init_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ORB_init_SOURCES = \ - ORB_init.cpp - -ORB_init_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Persistent_IOR/.cvsignore b/TAO/tests/RTCORBA/Persistent_IOR/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Persistent_IOR/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Persistent_IOR/Makefile.am b/TAO/tests/RTCORBA/Persistent_IOR/Makefile.am deleted file mode 100644 index 900b459b6af..00000000000 --- a/TAO/tests/RTCORBA/Persistent_IOR/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_Persistent_IOR_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_Persistent_IOR_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Persistent_IOR_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc index 1aa4e9117dd..87178218057 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc +++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc @@ -1,35 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): rt_server, minimum_corba { Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): rt_client, minimum_corba { after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/RTCORBA/Policies/.cvsignore b/TAO/tests/RTCORBA/Policies/.cvsignore new file mode 100644 index 00000000000..a5bf361f073 --- /dev/null +++ b/TAO/tests/RTCORBA/Policies/.cvsignore @@ -0,0 +1 @@ +Policies diff --git a/TAO/tests/RTCORBA/Policies/Makefile.am b/TAO/tests/RTCORBA/Policies/Makefile.am deleted file mode 100644 index ab5b6b9cbb4..00000000000 --- a/TAO/tests/RTCORBA/Policies/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.RTCORBA_Policies_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = Policies - -Policies_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Policies_SOURCES = \ - Policies.cpp - -Policies_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc index 4daa7ba8db6..1e97eefaee4 100644 --- a/TAO/tests/RTCORBA/Policies/Policies.mpc +++ b/TAO/tests/RTCORBA/Policies/Policies.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(RTCORBA Policies Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(RTCORBA Policies Server): rt_server, minimum_corba { } diff --git a/TAO/tests/RTCORBA/Policy_Combinations/.cvsignore b/TAO/tests/RTCORBA/Policy_Combinations/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Policy_Combinations/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Policy_Combinations/Makefile.am b/TAO/tests/RTCORBA/Policy_Combinations/Makefile.am deleted file mode 100644 index 974eddb7ca1..00000000000 --- a/TAO/tests/RTCORBA/Policy_Combinations/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_Policy_Combinations_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_Policy_Combinations_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Policy_Combinations_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc index 4ac469e8021..c7a5f0c3229 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc +++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc @@ -1,35 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): rt_server, minimum_corba { Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): rt_client { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/.cvsignore b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am deleted file mode 100644 index edf7aa93fe0..00000000000 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am +++ /dev/null @@ -1,119 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Priority_Inversion_With_Bands_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Priority_Inversion_With_Bands_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.Priority_Inversion_With_Bands_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc index b5e0ed23f6d..ebf79370785 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): strategies, rt_server, minimum_corba { Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): strategies, rt_client, minimum_corba { after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/RTCORBA/Private_Connection/.cvsignore b/TAO/tests/RTCORBA/Private_Connection/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Private_Connection/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Private_Connection/Makefile.am b/TAO/tests/RTCORBA/Private_Connection/Makefile.am deleted file mode 100644 index 9793748bc8d..00000000000 --- a/TAO/tests/RTCORBA/Private_Connection/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_Private_Connection_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_Private_Connection_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Private_Connection_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc index 21db1ec8e87..87178218057 100644 --- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc +++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc @@ -1,36 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): rt_server, minimum_corba { Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): rt_client, minimum_corba { after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/.cvsignore b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am deleted file mode 100644 index 1c41ae685cc..00000000000 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.PaE_Selection_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PaE_Selection_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.PaE_Selection_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc index d467c773e74..4d9a96b12f0 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc @@ -1,33 +1,13 @@ // $Id$ - -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} -project(*Server): rt_server, strategies, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): rt_server, strategies, portableserver, minimum_corba { Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): rt_client, strategies, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): rt_client, strategies, portableserver, minimum_corba { after += *Server Source_Files { client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/RTCORBA/RTMutex/.cvsignore b/TAO/tests/RTCORBA/RTMutex/.cvsignore new file mode 100644 index 00000000000..254defddb53 --- /dev/null +++ b/TAO/tests/RTCORBA/RTMutex/.cvsignore @@ -0,0 +1 @@ +server diff --git a/TAO/tests/RTCORBA/RTMutex/Makefile.am b/TAO/tests/RTCORBA/RTMutex/Makefile.am deleted file mode 100644 index 1890acac35f..00000000000 --- a/TAO/tests/RTCORBA/RTMutex/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.RTCORBA_RTMutex_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Server_Declared/.cvsignore b/TAO/tests/RTCORBA/Server_Declared/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Server_Declared/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Server_Declared/Makefile.am b/TAO/tests/RTCORBA/Server_Declared/Makefile.am deleted file mode 100644 index 575d097568d..00000000000 --- a/TAO/tests/RTCORBA/Server_Declared/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_Server_Declared_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_Server_Declared_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Server_Declared_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc index b0b7fbf765a..b62ff14a3d9 100644 --- a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc +++ b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc @@ -1,35 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): rt_server { - after += *idl Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): rt_client { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/RTCORBA/Server_Protocol/.cvsignore b/TAO/tests/RTCORBA/Server_Protocol/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Server_Protocol/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Server_Protocol/Makefile.am b/TAO/tests/RTCORBA/Server_Protocol/Makefile.am deleted file mode 100644 index 6a7e503310a..00000000000 --- a/TAO/tests/RTCORBA/Server_Protocol/Makefile.am +++ /dev/null @@ -1,116 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_Server_Protocol_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_Server_Protocol_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Server_Protocol_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc index 276def8a366..a77351b5090 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc +++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc @@ -1,35 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only =1 -} - -project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): strategies, rt_server, minimum_corba { Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): strategies, rt_client, minimum_corba { after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/RTCORBA/Thread_Pool/.cvsignore b/TAO/tests/RTCORBA/Thread_Pool/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/RTCORBA/Thread_Pool/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/RTCORBA/Thread_Pool/Makefile.am b/TAO/tests/RTCORBA/Thread_Pool/Makefile.am deleted file mode 100644 index a34d2c779ef..00000000000 --- a/TAO/tests/RTCORBA/Thread_Pool/Makefile.am +++ /dev/null @@ -1,119 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTCORBA_Thread_Pool_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.RTCORBA_Thread_Pool_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Thread_Pool_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc index b5e0ed23f6d..ebf79370785 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc +++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Server): strategies, rt_server, minimum_corba { Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { - after += *idl +project(*Client): strategies, rt_client, minimum_corba { after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/RTScheduling/Current/.cvsignore b/TAO/tests/RTScheduling/Current/.cvsignore new file mode 100644 index 00000000000..d8a2b853f2c --- /dev/null +++ b/TAO/tests/RTScheduling/Current/.cvsignore @@ -0,0 +1 @@ +Current diff --git a/TAO/tests/RTScheduling/Current/Makefile.am b/TAO/tests/RTScheduling/Current/Makefile.am deleted file mode 100644 index adf84014b02..00000000000 --- a/TAO/tests/RTScheduling/Current/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Current.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = Current - -Current_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Current_SOURCES = \ - ../Scheduler.cpp \ - Thread_Task.cpp \ - test.cpp \ - ../Scheduler.h \ - Thread_Task.h - -Current_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTScheduling/DT_Spawn/.cvsignore b/TAO/tests/RTScheduling/DT_Spawn/.cvsignore new file mode 100644 index 00000000000..6d033fa4b68 --- /dev/null +++ b/TAO/tests/RTScheduling/DT_Spawn/.cvsignore @@ -0,0 +1 @@ +DT_Spawn diff --git a/TAO/tests/RTScheduling/DT_Spawn/Makefile.am b/TAO/tests/RTScheduling/DT_Spawn/Makefile.am deleted file mode 100644 index d83080144ba..00000000000 --- a/TAO/tests/RTScheduling/DT_Spawn/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.DT_Spawn.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = DT_Spawn - -DT_Spawn_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -DT_Spawn_SOURCES = \ - ../Scheduler.cpp \ - test.cpp \ - ../Scheduler.h - -DT_Spawn_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTScheduling/Makefile.am b/TAO/tests/RTScheduling/Makefile.am deleted file mode 100644 index 7e300b181e6..00000000000 --- a/TAO/tests/RTScheduling/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Current \ - DT_Spawn \ - Scheduling_Interceptor \ - Thread_Cancel \ - VoidData - diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/.cvsignore b/TAO/tests/RTScheduling/Scheduling_Interceptor/.cvsignore new file mode 100644 index 00000000000..641465098f5 --- /dev/null +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/.cvsignore @@ -0,0 +1,2 @@ +Scheduler_Interceptor_Client +Scheduler_Interceptor_Server diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am b/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am deleted file mode 100644 index 0d5fcfb4440..00000000000 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.am +++ /dev/null @@ -1,123 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Scheduler_Interceptor_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Scheduler_Interceptor_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += Scheduler_Interceptor_Server - -Scheduler_Interceptor_Server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Scheduler_Interceptor_Server_SOURCES = \ - ../Scheduler.cpp \ - testC.cpp \ - testS.cpp \ - test_server.cpp \ - ../Scheduler.h - -Scheduler_Interceptor_Server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.Scheduler_Interceptor_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += Scheduler_Interceptor_Client - -Scheduler_Interceptor_Client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Scheduler_Interceptor_Client_SOURCES = \ - ../Scheduler.cpp \ - testC.cpp \ - test_client.cpp \ - ../Scheduler.h - -Scheduler_Interceptor_Client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc index 63e7ef77111..a9fce2cd532 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc @@ -1,40 +1,21 @@ // $Id$ - -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): rtscheduling_server { - after += *idl Source_Files { ../Scheduler.cpp test_server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } exename = Scheduler_Interceptor_Server } project(*Client) : rtscheduling_client { - after += *idl after += *Server Source_Files { ../Scheduler.cpp - test_client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + test_client.cpp } exename = Scheduler_Interceptor_Client } + diff --git a/TAO/tests/RTScheduling/Thread_Cancel/.cvsignore b/TAO/tests/RTScheduling/Thread_Cancel/.cvsignore new file mode 100644 index 00000000000..08071dd183b --- /dev/null +++ b/TAO/tests/RTScheduling/Thread_Cancel/.cvsignore @@ -0,0 +1 @@ +Thread_Cancel diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Makefile.am b/TAO/tests/RTScheduling/Thread_Cancel/Makefile.am deleted file mode 100644 index e1a77bdb23b..00000000000 --- a/TAO/tests/RTScheduling/Thread_Cancel/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Thread_Cancel.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = Thread_Cancel - -Thread_Cancel_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Thread_Cancel_SOURCES = \ - ../Scheduler.cpp \ - Thread_Task.cpp \ - test.cpp \ - ../Scheduler.h \ - Thread_Task.h - -Thread_Cancel_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/RTScheduling/VoidData/.cvsignore b/TAO/tests/RTScheduling/VoidData/.cvsignore new file mode 100644 index 00000000000..64bcca2ae7e --- /dev/null +++ b/TAO/tests/RTScheduling/VoidData/.cvsignore @@ -0,0 +1 @@ +VoidData diff --git a/TAO/tests/RTScheduling/VoidData/Makefile.am b/TAO/tests/RTScheduling/VoidData/Makefile.am deleted file mode 100644 index 660b00ebf3a..00000000000 --- a/TAO/tests/RTScheduling/VoidData/Makefile.am +++ /dev/null @@ -1,82 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.VoidData.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = VoidData - -VoidData_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -VoidData_SOURCES = \ - testC.cpp \ - test_client.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -VoidData_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Reliable_Oneways/.cvsignore b/TAO/tests/Reliable_Oneways/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Reliable_Oneways/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Reliable_Oneways/Makefile.am b/TAO/tests/Reliable_Oneways/Makefile.am deleted file mode 100644 index 748c5ed0957..00000000000 --- a/TAO/tests/Reliable_Oneways/Makefile.am +++ /dev/null @@ -1,120 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Reliable_Oneways_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Reliable_Oneways_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Oneway_Receiver.cpp \ - Shutdown_Helper.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Oneway_Receiver.h \ - Shutdown_Helper.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Reliable_Oneways_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc index ddd2850b59d..2141f3040f5 100644 --- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc +++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc @@ -1,43 +1,19 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver, messaging { - after += *idl Source_Files { Oneway_Receiver.cpp Shutdown_Helper.cpp server.cpp } - Header_Files { - Oneway_Receiver.h - Shutdown_Helper.h - } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): messaging, taoexe, portableserver { - after += *idl after += *Server Source_Files { - client.cpp - } - Header_Files { - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Sequence_Unit_Tests/.cvsignore b/TAO/tests/Sequence_Unit_Tests/.cvsignore new file mode 100644 index 00000000000..906e9b13aff --- /dev/null +++ b/TAO/tests/Sequence_Unit_Tests/.cvsignore @@ -0,0 +1,4 @@ +Bounded_Simple_Types +Bounded_String +Unbounded_Simple_Types +Unbounded_String diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp index 0b230c0558d..8f0bc9e45ef 100644 --- a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp +++ b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp @@ -8,11 +8,11 @@ * * @author Carlos O'Ryan */ -#include "tao/Bounded_Basic_String_Sequence_T.h" +#include "tao/Bounded_String_Sequence_T.h" #include "tao/CORBA_String.h" CORBA::ULong const MAXIMUM = 42; -typedef TAO::bounded_basic_string_sequence<char, MAXIMUM> s_sequence; +typedef TAO::bounded_string_sequence<MAXIMUM> s_sequence; int main(int,char*[]) { diff --git a/TAO/tests/Sequence_Unit_Tests/Makefile.am b/TAO/tests/Sequence_Unit_Tests/Makefile.am deleted file mode 100644 index fe4accdd028..00000000000 --- a/TAO/tests/Sequence_Unit_Tests/Makefile.am +++ /dev/null @@ -1,694 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Sequence_Unit_Tests_B_Obj_Ref_Seq.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += bounded_object_reference_sequence_ut - -bounded_object_reference_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -bounded_object_reference_sequence_ut_SOURCES = \ - bounded_object_reference_sequence_ut.cpp \ - mock_reference.cpp \ - mock_reference.hpp - -bounded_object_reference_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -bounded_object_reference_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_B_Sequence_CDR.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += bounded_sequence_cdr_ut - -bounded_sequence_cdr_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -bounded_sequence_cdr_ut_SOURCES = \ - bounded_sequence_cdr_ut.cpp \ - mock_reference.cpp \ - mock_reference.hpp - -bounded_sequence_cdr_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -bounded_sequence_cdr_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_B_Simple_Types.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Bounded_Simple_Types - -Bounded_Simple_Types_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Bounded_Simple_Types_SOURCES = \ - Bounded_Simple_Types.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -Bounded_Simple_Types_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Sequence_Unit_Tests_B_String_Seq.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += bounded_string_sequence_ut - -bounded_string_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -bounded_string_sequence_ut_SOURCES = \ - bounded_string_sequence_ut.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -bounded_string_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -bounded_string_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_B_Value_Sequence.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += bounded_value_sequence_ut - -bounded_value_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -bounded_value_sequence_ut_SOURCES = \ - bounded_value_sequence_ut.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -bounded_value_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -bounded_value_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_Bounded_String.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Bounded_String - -Bounded_String_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Bounded_String_SOURCES = \ - Bounded_String.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -Bounded_String_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Sequence_Unit_Tests_Obj_Ref_Seq_Elem.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += object_reference_sequence_element_ut - -object_reference_sequence_element_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -object_reference_sequence_element_ut_SOURCES = \ - mock_reference.cpp \ - object_reference_sequence_element_ut.cpp \ - mock_reference.hpp - -object_reference_sequence_element_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -object_reference_sequence_element_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_String_Seq_Elem.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += string_sequence_element_ut - -string_sequence_element_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -string_sequence_element_ut_SOURCES = \ - string_sequence_element_ut.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -string_sequence_element_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -string_sequence_element_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_Test_Alloc_Traits.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += testing_allocation_traits_ut - -testing_allocation_traits_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -testing_allocation_traits_ut_SOURCES = \ - testing_allocation_traits_ut.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -testing_allocation_traits_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -testing_allocation_traits_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Fwd_Ob_Ref_Seq.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_fwd_object_reference_sequence_ut - -unbounded_fwd_object_reference_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_fwd_object_reference_sequence_ut_SOURCES = \ - fwd_mock_reference.cpp \ - unbounded_fwd_object_reference_sequence_ut.cpp \ - fwd_mock_reference.hpp - -unbounded_fwd_object_reference_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_fwd_object_reference_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Obj_Ref_Seq.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_object_reference_sequence_ut - -unbounded_object_reference_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_object_reference_sequence_ut_SOURCES = \ - mock_reference.cpp \ - unbounded_object_reference_sequence_ut.cpp \ - mock_reference.hpp - -unbounded_object_reference_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_object_reference_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Oct_Seq_No_Cpy.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_octet_sequence_no_copy_ut - -unbounded_octet_sequence_no_copy_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_octet_sequence_no_copy_ut_SOURCES = \ - mock_reference.cpp \ - unbounded_octet_sequence_nocopy_ut.cpp \ - mock_reference.hpp - -unbounded_octet_sequence_no_copy_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_octet_sequence_no_copy_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Octet_Sequence.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_octet_sequence_ut - -unbounded_octet_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_octet_sequence_ut_SOURCES = \ - mock_reference.cpp \ - unbounded_octet_sequence_ut.cpp \ - mock_reference.hpp - -unbounded_octet_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_octet_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Sequence_CDR.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_sequence_cdr_ut - -unbounded_sequence_cdr_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_sequence_cdr_ut_SOURCES = \ - mock_reference.cpp \ - unbounded_sequence_cdr_ut.cpp \ - mock_reference.hpp - -unbounded_sequence_cdr_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_sequence_cdr_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Simple_Types.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Unbounded_Simple_Types - -Unbounded_Simple_Types_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Unbounded_Simple_Types_SOURCES = \ - Unbounded_Simple_Types.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -Unbounded_Simple_Types_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Sequence_Unit_Tests_UB_String_Seq.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_string_sequence_ut - -unbounded_string_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_string_sequence_ut_SOURCES = \ - unbounded_string_sequence_ut.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -unbounded_string_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_string_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Value_Sequence.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_value_sequence_ut - -unbounded_value_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_value_sequence_ut_SOURCES = \ - unbounded_value_sequence_ut.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -unbounded_value_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_value_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_Unbounded_Octet.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Unbounded_Octet - -Unbounded_Octet_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Unbounded_Octet_SOURCES = \ - Unbounded_Octet.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -Unbounded_Octet_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Sequence_Unit_Tests_Unbounded_String.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Unbounded_String - -Unbounded_String_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Unbounded_String_SOURCES = \ - Unbounded_String.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -Unbounded_String_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp b/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp index 02cccf4ba2a..246c46f7e85 100644 --- a/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp +++ b/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp @@ -8,10 +8,10 @@ * * @author Carlos O'Ryan */ -#include "tao/Unbounded_Basic_String_Sequence_T.h" +#include "tao/Unbounded_String_Sequence_T.h" #include "tao/CORBA_String.h" -typedef TAO::unbounded_basic_string_sequence<char> s_sequence; +typedef TAO::unbounded_string_sequence s_sequence; int main(int,char*[]) { diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp index 7a09816a5f2..3ac1584a6e4 100644 --- a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp @@ -16,7 +16,7 @@ #include "tao/Bounded_Object_Reference_Sequence_T.h" #include "tao/Bounded_Value_Sequence_T.h" -#include "tao/Bounded_Basic_String_Sequence_T.h" +#include "tao/Bounded_String_Sequence_T.h" #include "tao/Bounded_Array_Sequence_T.h" #include "tao/Bounded_Sequence_CDR_T.h" #include "tao/CDR.h" diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp index f7a4a1d15df..e493adadce1 100644 --- a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp @@ -14,7 +14,8 @@ #include "tao/String_Traits_T.h" #include "testing_allocation_traits.hpp" -#include "tao/Bounded_Basic_String_Sequence_T.h" +#include "tao/Bounded_String_Sequence_T.h" +#include "tao/Bounded_Wstring_Sequence_T.h" #include "tao/CORBA_String.h" #include "string_sequence_tester.hpp" @@ -96,7 +97,7 @@ struct Tester expected_calls f(tested_allocation_traits::freebuf_calls); expected_calls r(tested_element_traits::release_calls); { - tested_sequence a(4, buffer, false); + tested_sequence a(4, buffer); BOOST_CHECK_EQUAL(CORBA::ULong(MAXIMUM), a.maximum()); BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length()); BOOST_CHECK_EQUAL(buffer, a.get_buffer()); @@ -120,7 +121,7 @@ struct Tester expected_calls f(tested_allocation_traits::freebuf_calls); expected_calls r(tested_element_traits::release_calls); { - tested_sequence a(4, buffer, false); + tested_sequence a(4, buffer); BOOST_CHECK_EQUAL(CORBA::ULong(MAXIMUM), a.maximum()); BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length()); BOOST_CHECK_EQUAL(buffer, a.get_buffer()); @@ -374,14 +375,14 @@ init_unit_test_suite(int, char*[]) BOOST_TEST_SUITE("bounded string sequence unit test"); { - typedef TAO::bounded_basic_string_sequence<char, MAXIMUM> s_sequence; + typedef TAO::bounded_string_sequence<MAXIMUM> s_sequence; typedef Tester<s_sequence> nTester; boost::shared_ptr<nTester> tester(nTester::allocate()); tester->add_all(ts); } { - typedef TAO::bounded_basic_string_sequence<CORBA::WChar, MAXIMUM> w_sequence; + typedef TAO::bounded_wstring_sequence<MAXIMUM> w_sequence; typedef Tester<w_sequence> wTester; boost::shared_ptr<wTester> tester(wTester::allocate()); tester->add_all(ts); diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp index 14790752df5..53c722247c6 100644 --- a/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp @@ -16,7 +16,7 @@ #include "tao/Unbounded_Value_Sequence_T.h" #include "tao/Unbounded_Object_Reference_Sequence_T.h" -#include "tao/Unbounded_Basic_String_Sequence_T.h" +#include "tao/Unbounded_String_Sequence_T.h" #include "tao/Unbounded_Sequence_CDR_T.h" #include "tao/CDR.h" diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp index 53f0941275c..0cbb69be858 100644 --- a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp @@ -12,7 +12,9 @@ #include "testing_allocation_traits.hpp" #include "testing_range_checking.hpp" -#include "tao/Unbounded_Basic_String_Sequence_T.h" +#include "tao/Unbounded_String_Sequence_T.h" +#include "tao/Unbounded_Wstring_Sequence_T.h" +#include "tao/Unbounded_Wstring_Sequence_T.h" #include "tao/CORBA_String.h" #include "string_sequence_tester.hpp" @@ -234,7 +236,7 @@ struct Tester expected_calls f(tested_allocation_traits::freebuf_calls); expected_calls r(tested_element_traits::release_calls); { - tested_sequence a(8, 4, buffer, false); + tested_sequence a(8, 4, buffer); BOOST_CHECK_EQUAL(CORBA::ULong(8), a.maximum()); BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length()); BOOST_CHECK_EQUAL(buffer, a.get_buffer()); @@ -419,7 +421,7 @@ struct Tester expected_calls f(tested_allocation_traits::freebuf_calls); expected_calls r(tested_element_traits::release_calls); { - tested_sequence a(8, 4, buffer, false); + tested_sequence a(8, 4, buffer); BOOST_CHECK_EQUAL(CORBA::ULong(8), a.maximum()); BOOST_CHECK_EQUAL(CORBA::ULong(4), a.length()); BOOST_CHECK_EQUAL(buffer, a.get_buffer()); @@ -526,13 +528,13 @@ init_unit_test_suite(int, char*[]) BOOST_TEST_SUITE("unbounded string sequence unit test"); { - typedef Tester<unbounded_basic_string_sequence <char> > nTester; + typedef Tester<unbounded_string_sequence> nTester; boost::shared_ptr<nTester> tester(nTester::allocate()); tester->add_all(ts); } { - typedef Tester<unbounded_basic_string_sequence <CORBA::WChar> > wTester; + typedef Tester<unbounded_wstring_sequence> wTester; boost::shared_ptr<wTester> tester(wTester::allocate()); tester->add_all(ts); } diff --git a/TAO/tests/Servant_To_Reference_Test/.cvsignore b/TAO/tests/Servant_To_Reference_Test/.cvsignore new file mode 100644 index 00000000000..254defddb53 --- /dev/null +++ b/TAO/tests/Servant_To_Reference_Test/.cvsignore @@ -0,0 +1 @@ +server diff --git a/TAO/tests/Servant_To_Reference_Test/Makefile.am b/TAO/tests/Servant_To_Reference_Test/Makefile.am deleted file mode 100644 index afe2163e43b..00000000000 --- a/TAO/tests/Servant_To_Reference_Test/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Servant_To_Reference_Server.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ - Test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc index 981d22d2ab1..9c240b72452 100644 --- a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc +++ b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*Server): taoexe, portableserver, minimum_corba { Source_Files { server.cpp Test_i.cpp diff --git a/TAO/tests/Server_Connection_Purging/.cvsignore b/TAO/tests/Server_Connection_Purging/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Server_Connection_Purging/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Server_Connection_Purging/Makefile.am b/TAO/tests/Server_Connection_Purging/Makefile.am deleted file mode 100644 index f877143fc9c..00000000000 --- a/TAO/tests/Server_Connection_Purging/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Server_Connection_Purging_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Server_Connection_Purging_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ - Test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Server_Connection_Purging_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc index ccd43fa8b3a..a50eda03b14 100644 --- a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc +++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only =1 -} - project(*Server): taoserver { - after += *idl Source_Files { Test_i.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Server_Leaks/.cvsignore b/TAO/tests/Server_Leaks/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Server_Leaks/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Server_Leaks/Makefile.am b/TAO/tests/Server_Leaks/Makefile.am deleted file mode 100644 index 280e3b90445..00000000000 --- a/TAO/tests/Server_Leaks/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Server_Leaks_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Server_Leaks_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Ping_Service.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Ping_Service.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Server_Leaks_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Ping_Service.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc index 53fb1e76d71..4517bde0f91 100644 --- a/TAO/tests/Server_Leaks/Server_Leaks.mpc +++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { Ping_Service.cpp server.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { TestC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Server_Port_Zero/.cvsignore b/TAO/tests/Server_Port_Zero/.cvsignore new file mode 100644 index 00000000000..254defddb53 --- /dev/null +++ b/TAO/tests/Server_Port_Zero/.cvsignore @@ -0,0 +1 @@ +server diff --git a/TAO/tests/Server_Port_Zero/Makefile.am b/TAO/tests/Server_Port_Zero/Makefile.am deleted file mode 100644 index 2c12f5f51a3..00000000000 --- a/TAO/tests/Server_Port_Zero/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - - -## Makefile.Server_Port_Zero_Server.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Single_Read/.cvsignore b/TAO/tests/Single_Read/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Single_Read/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Single_Read/Makefile.am b/TAO/tests/Single_Read/Makefile.am deleted file mode 100644 index 56bc35ebd15..00000000000 --- a/TAO/tests/Single_Read/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Single_Read_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Single_Read_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Single_Read_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc index 574cb13c894..bfb96e8b536 100644 --- a/TAO/tests/Single_Read/Single_Read.mpc +++ b/TAO/tests/Single_Read/Single_Read.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Smart_Proxies/.cvsignore b/TAO/tests/Smart_Proxies/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Smart_Proxies/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Smart_Proxies/Benchmark/.cvsignore b/TAO/tests/Smart_Proxies/Benchmark/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Smart_Proxies/Benchmark/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Smart_Proxies/Benchmark/Makefile.am b/TAO/tests/Smart_Proxies/Benchmark/Makefile.am deleted file mode 100644 index 22d34bb9a70..00000000000 --- a/TAO/tests/Smart_Proxies/Benchmark/Makefile.am +++ /dev/null @@ -1,111 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.SP_Benchmark_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Benchmark_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Smart_Proxy_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Benchmark_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc index 99fe5efed3b..ea8e6a3a0d7 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc +++ b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc @@ -1,36 +1,16 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, smart_proxies { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): taoserver, smart_proxies { - after += *idl +project(*Server): taoexe, portableserver, smart_proxies { Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, smart_proxies { - after += *idl - after += *Server +project(*Client): taoexe, portableserver, smart_proxies { Source_Files { client.cpp Smart_Proxy_Impl.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Smart_Proxies/Collocation/.cvsignore b/TAO/tests/Smart_Proxies/Collocation/.cvsignore new file mode 100644 index 00000000000..ba2906d0666 --- /dev/null +++ b/TAO/tests/Smart_Proxies/Collocation/.cvsignore @@ -0,0 +1 @@ +main diff --git a/TAO/tests/Smart_Proxies/Collocation/Makefile.am b/TAO/tests/Smart_Proxies/Collocation/Makefile.am deleted file mode 100644 index 18920bf27cb..00000000000 --- a/TAO/tests/Smart_Proxies/Collocation/Makefile.am +++ /dev/null @@ -1,133 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_LTLIBRARIES = -noinst_HEADERS = - -## Makefile.SP_Collocation_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - DiamondC.cpp \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.cpp \ - DiamondS.h \ - DiamondS.inl - -CLEANFILES = \ - Diamond-stamp \ - DiamondC.cpp \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.cpp \ - DiamondS.h \ - DiamondS.inl - -DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp - -Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd $(srcdir)/Diamond.idl - @touch $@ - -noinst_HEADERS += \ - Diamond.idl - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Collocation_TestStubsLib.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libColl_Test_Stubs.la - -libColl_Test_Stubs_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DMY_STUB_BUILD_DLL - -libColl_Test_Stubs_la_SOURCES = \ - DiamondC.cpp \ - Smart_Proxy_Impl.cpp - -noinst_HEADERS += \ - Smart_Proxy_Impl.h - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Collocation_DiamondLib.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libDiamond.la - -libDiamond_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DDIAMOND_BUILD_DLL - -libDiamond_la_SOURCES = \ - DiamondS.cpp \ - Diamond_i.cpp - -noinst_HEADERS += \ - Diamond_i.h - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Collocation_Test.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -main_SOURCES = \ - Coll_Tester.cpp \ - main.cpp \ - Coll_Tester.h - -main_LDADD = \ - libColl_Test_Stubs.la \ - libDiamond.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc b/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc index 765052118d0..f98a8de4eb9 100644 --- a/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc +++ b/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc @@ -1,54 +1,36 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, smart_proxies { - idlflags += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd - - IDL_Files { - Diamond.idl - } - custom_only = 1 -} - project(*TestStubsLib): taolib_with_idl, smart_proxies { - after += *idl - sharedname = Coll_Test_Stubs dynamicflags += MY_STUB_BUILD_DLL - + idlflags += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd Source_Files { DiamondC.cpp Smart_Proxy_Impl.cpp } - IDL_Files { - } } project(*DiamondLib) : taolib_with_idl, smart_proxies, portableserver { - after += *idl - after += *TestStubsLib - sharedname = Diamond - dynamicflags += DIAMOND_BUILD_DLL - + after += *TestStubsLib libs += Coll_Test_Stubs - + dynamicflags += DIAMOND_BUILD_DLL + idlflags += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd Source_Files { Diamond_i.cpp DiamondS.cpp } - IDL_Files { - } } project(*Test): taoexe, smart_proxies, portableserver, strategies { - after += *idl after += *TestStubsLib *DiamondLib libs += Coll_Test_Stubs Diamond Source_Files { Coll_Tester.cpp main.cpp } - IDL_Files { + idl_files { } } + diff --git a/TAO/tests/Smart_Proxies/Makefile.am b/TAO/tests/Smart_Proxies/Makefile.am deleted file mode 100644 index 1a5794d6175..00000000000 --- a/TAO/tests/Smart_Proxies/Makefile.am +++ /dev/null @@ -1,119 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -SUBDIRS = \ - . \ - Benchmark \ - Collocation \ - On_Demand \ - Policy \ - dtor - -noinst_PROGRAMS = - -## Makefile.Smart_Proxies_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Smart_Proxies_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Smart_Proxy_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Smart_Proxies_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Smart_Proxies/On_Demand/.cvsignore b/TAO/tests/Smart_Proxies/On_Demand/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Smart_Proxies/On_Demand/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Smart_Proxies/On_Demand/Makefile.am b/TAO/tests/Smart_Proxies/On_Demand/Makefile.am deleted file mode 100644 index 5f0141abcd9..00000000000 --- a/TAO/tests/Smart_Proxies/On_Demand/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.SP_On_Demand_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.SP_On_Demand_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Smart_Proxy_Impl.h \ - Smart_Test_Factory.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.SP_On_Demand_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - Smart_Test_Factory.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h \ - Smart_Test_Factory.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc index dfa4bfcc30c..d286b8421d7 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc +++ b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc @@ -1,37 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, smart_proxies { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, smart_proxies { - after += *idl Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, smart_proxies { - after += *idl - after += *Server +project(*Client): taoexe, portableserver, smart_proxies { Source_Files { client.cpp Smart_Proxy_Impl.cpp Smart_Test_Factory.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Smart_Proxies/Policy/.cvsignore b/TAO/tests/Smart_Proxies/Policy/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Smart_Proxies/Policy/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Smart_Proxies/Policy/Makefile.am b/TAO/tests/Smart_Proxies/Policy/Makefile.am deleted file mode 100644 index 0890285a505..00000000000 --- a/TAO/tests/Smart_Proxies/Policy/Makefile.am +++ /dev/null @@ -1,111 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.SP_Policy_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Policy_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Smart_Proxy_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Policy_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc index 99fe5efed3b..907dac72774 100644 --- a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc +++ b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc @@ -1,36 +1,16 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, smart_proxies { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, smart_proxies { - after += *idl Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, smart_proxies { - after += *idl - after += *Server +project(*Client): taoclient, portableserver, smart_proxies { Source_Files { client.cpp Smart_Proxy_Impl.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc index bc4e7c42743..473bc9b4087 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc +++ b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, smart_proxies { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, smart_proxies { - after += *idl Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, smart_proxies { - after += *idl +project(*Client): taoclient, portableserver, smart_proxies { after += *Server Source_Files { + testC.cpp Smart_Proxy_Impl.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } + diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp index b2bd94142ee..b49a86973b1 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp @@ -2,8 +2,6 @@ #include "Smart_Proxy_Impl.h" -ACE_CString Smart_Test_Proxy::fake_ior_ ("This_is_my_fake_ior"); - Smart_Test_Factory::Smart_Test_Factory (void) { ACE_DEBUG ((LM_DEBUG, @@ -29,22 +27,6 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) { } -bool -Smart_Test_Proxy::can_convert_to_ior (void) const -{ - // Even though a smart proxy is local, this one can be stringified - return true; -} - -char* -Smart_Test_Proxy::convert_to_ior (bool, - const char*) const -{ - // If this implementation wasn't provided, the ORB would provide - // a stringified representation of this object. - return CORBA::string_dup (fake_ior_.c_str ()); -} - CORBA::Short Smart_Test_Proxy::method (CORBA::Short boo ACE_ENV_ARG_DECL) @@ -71,9 +53,3 @@ Smart_Test_Proxy::method (CORBA::Short boo return retval; } - -const ACE_CString& -Smart_Test_Proxy::fake_ior (void) -{ - return fake_ior_; -} diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h index 76d38be6245..a61d96be76d 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h @@ -1,7 +1,6 @@ // $Id$ #include "testC.h" -#include "ace/SString.h" class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory { @@ -19,21 +18,12 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base public: Smart_Test_Proxy (Test_ptr proxy); - virtual bool can_convert_to_ior (void) const; - - virtual char* convert_to_ior (bool use_omg_ior_format, - const char* ior_prefix) const; - virtual CORBA::Short method (CORBA::Short boo ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); // "Smartify" the method call! - static const ACE_CString& fake_ior (void); - // Don't need to add any extra functionality into <shutdown>, hence // we don't define it. -private: - static ACE_CString fake_ior_; }; diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp index 2fc36491398..74b28effab2 100644 --- a/TAO/tests/Smart_Proxies/client.cpp +++ b/TAO/tests/Smart_Proxies/client.cpp @@ -54,7 +54,6 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - int status = 0; ACE_TRY_NEW_ENV { CORBA::ORB_var orb = @@ -97,26 +96,6 @@ main (int argc, char *argv[]) ior), 1); - try - { - CORBA::String_var sm_ior = orb->object_to_string (server.in ()); - if (Smart_Test_Proxy::fake_ior () != sm_ior.in ()) - { - status = 1; - ACE_ERROR ((LM_ERROR, - "ERROR: The Smart Proxy IOR is:\n%s\n" - "but should have been: %s\n", - sm_ior.in (), - Smart_Test_Proxy::fake_ior ().c_str ())); - } - } - catch (const CORBA::MARSHAL& ex) - { - status = 1; - ACE_PRINT_EXCEPTION (ex, - "Unexpected MARSHAL exception:"); - } - server->method (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -136,9 +115,9 @@ main (int argc, char *argv[]) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client-side exception:"); - status = 1; + return 1; } ACE_ENDTRY; - return status; + return 0; } diff --git a/TAO/tests/Smart_Proxies/dtor/.cvsignore b/TAO/tests/Smart_Proxies/dtor/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Smart_Proxies/dtor/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Smart_Proxies/dtor/Makefile.am b/TAO/tests/Smart_Proxies/dtor/Makefile.am deleted file mode 100644 index 8db55984659..00000000000 --- a/TAO/tests/Smart_Proxies/dtor/Makefile.am +++ /dev/null @@ -1,112 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.dtor_idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Dtor_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Smart_Proxy_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Dtor_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Smart_Proxies/dtor/dtor.mpc b/TAO/tests/Smart_Proxies/dtor/dtor.mpc index 9feea5cd714..bfbcbe61031 100644 --- a/TAO/tests/Smart_Proxies/dtor/dtor.mpc +++ b/TAO/tests/Smart_Proxies/dtor/dtor.mpc @@ -1,35 +1,15 @@ //$Id$ -project(*idl): taoidldefaults, smart_proxies { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver, smart_proxies { - after += *idl Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode, smart_proxies { - after += *idl - after += *Server Source_Files { + testC.cpp Smart_Proxy_Impl.cpp client.cpp } - Source_Files { - testC.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Smart_Proxies/run_test.pl b/TAO/tests/Smart_Proxies/run_test.pl index 6cc94538d96..83d5dba52cf 100755 --- a/TAO/tests/Smart_Proxies/run_test.pl +++ b/TAO/tests/Smart_Proxies/run_test.pl @@ -34,14 +34,14 @@ if (PerlACE::waitforfile_timed ($iorfile, $client = $CL->SpawnWaitKill (60); -if ($client != 0) { +if ($client == -1) { print STDERR "ERROR: client returned $client\n"; $status = 1; } $server = $SV->WaitKill (10); -if ($server != 0) { +if ($server == -1) { print STDERR "ERROR: server returned $server\n"; $status = 1; } diff --git a/TAO/tests/Stack_Recursion/.cvsignore b/TAO/tests/Stack_Recursion/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Stack_Recursion/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Stack_Recursion/Makefile.am b/TAO/tests/Stack_Recursion/Makefile.am deleted file mode 100644 index 92977a684e5..00000000000 --- a/TAO/tests/Stack_Recursion/Makefile.am +++ /dev/null @@ -1,109 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Stack_Recursion_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Stack_Recursion_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Sender.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Sender.h \ - Server_Task.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Stack_Recursion_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc index 960ceb8a921..ce10971c433 100644 --- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc +++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc @@ -1,39 +1,22 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { + TestC.cpp + TestS.cpp server.cpp Server_Task.cpp Sender.cpp } - Source_Files { - TestC.cpp - TestS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { + TestC.cpp client.cpp Client_Task.cpp } - Source_Files { - TestC.cpp - } - IDL_Files { - } } diff --git a/TAO/tests/Strategies/.cvsignore b/TAO/tests/Strategies/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Strategies/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Strategies/Makefile.am b/TAO/tests/Strategies/Makefile.am deleted file mode 100644 index b6589fb7ac6..00000000000 --- a/TAO/tests/Strategies/Makefile.am +++ /dev/null @@ -1,123 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Strategies_Idl.am - -BUILT_SOURCES = \ - simple_testC.cpp \ - simple_testC.h \ - simple_testC.inl \ - simple_testS.cpp \ - simple_testS.h \ - simple_testS.inl - -CLEANFILES = \ - simple_test-stamp \ - simple_testC.cpp \ - simple_testC.h \ - simple_testC.inl \ - simple_testS.cpp \ - simple_testS.h \ - simple_testS.inl - -simple_testC.cpp simple_testC.h simple_testC.inl simple_testS.cpp simple_testS.h simple_testS.inl: simple_test-stamp - -simple_test-stamp: $(srcdir)/simple_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple_test.idl - @touch $@ - -noinst_HEADERS = \ - simple_test.idl - -## Makefile.Strategies_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - simple_testC.cpp \ - simple_testS.cpp \ - simple_test_i.cpp \ - simple_test_i.h \ - simple_test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Strategies_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - simple_testC.cpp \ - simple_test_i.h \ - simple_test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc index 86d4366c856..77ac8271640 100644 --- a/TAO/tests/Strategies/Strategies.mpc +++ b/TAO/tests/Strategies/Strategies.mpc @@ -1,36 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - simple_test.idl - } - custom_only = 1 -} - project(*Server): strategies, messaging, taoserver { - after += *idl Source_Files { simple_test_i.cpp server.cpp } - Source_Files { - simple_testC.cpp - simple_testS.cpp - } - IDL_Files { - } } project(*Client): strategies, messaging, taoexe, portableserver { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { simple_testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Timed_Buffered_Oneways/.cvsignore b/TAO/tests/Timed_Buffered_Oneways/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Timed_Buffered_Oneways/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Timed_Buffered_Oneways/Makefile.am b/TAO/tests/Timed_Buffered_Oneways/Makefile.am deleted file mode 100644 index 93cbe585f74..00000000000 --- a/TAO/tests/Timed_Buffered_Oneways/Makefile.am +++ /dev/null @@ -1,119 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Timed_Buffered_Oneways_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Timed_Buffered_Oneways_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Timed_Buffered_Oneways_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc index 7dbf0e839ef..1bd7978c70a 100644 --- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc +++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc @@ -1,37 +1,18 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): messaging, taoexe, portableserver { - after += *idl Source_Files { test_i.cpp server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*Client): messaging, taoexe, portableserver { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/Timeout/.cvsignore b/TAO/tests/Timeout/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Timeout/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Timeout/Makefile.am b/TAO/tests/Timeout/Makefile.am deleted file mode 100644 index 489c6a1350b..00000000000 --- a/TAO/tests/Timeout/Makefile.am +++ /dev/null @@ -1,113 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Timeout_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Timeout_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Timeout_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc index e42705f179e..5826c607d6e 100644 --- a/TAO/tests/Timeout/Timeout.mpc +++ b/TAO/tests/Timeout/Timeout.mpc @@ -1,23 +1,11 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { test_i.cpp - testS.cpp - testC.cpp server.cpp } - IDL_Files { - } } project(*Client): taoclient, messaging { @@ -26,6 +14,5 @@ project(*Client): taoclient, messaging { testC.cpp client.cpp } - IDL_Files { - } } + diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp deleted file mode 100644 index 63ed4f9c5ef..00000000000 --- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp +++ /dev/null @@ -1,169 +0,0 @@ -// -*- C++ -*- - -#include "tao/TransportCurrent/TCC.h" - -#include "Current_Test_Impl.h" - -ACE_RCSID (Transport_Current, - Current_Test_Impl, - "$Id$") - - Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - int do_collocated_calls) - : orb_ (CORBA::ORB::_duplicate (orb)) - , poa_ (PortableServer::POA::_duplicate (poa)) - , do_collocated_calls_ (do_collocated_calls) -{ -} - -Current_Test_Impl::~Current_Test_Impl (void) -{ -} - -::CORBA::Long -Current_Test_Impl::self_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((::CORBA::SystemException)) -{ - return 0; -} - -void -Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - Testing access to Transport Current ...\n"))); - } - - CORBA::Object_var tcobject = - orb_->resolve_initial_references ("TAO::Transport::Current" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - TAO::Transport::Current_var tc = - TAO::Transport::Current::_narrow (tcobject.in () - ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - if (TAO_debug_level >= 1) - { - ::CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - ::TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - ::TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - ::TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - ::TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Current_Test_Impl (%P|%t) Transport [%q] - Sent/Received [bytes=%q/%q, messages=%q/%q]\n"), - (ACE_UINT64)id, - (ACE_UINT64)bs, - (ACE_UINT64)br, - (ACE_UINT64)rs, - (ACE_UINT64)rr)); - } - - if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - Successfully accessed Transport Current\n"))); - } -} - -void -Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_TRY - { - this->invoked_by_client_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCH (TAO::Transport::NoContext, ex) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) server - Caught a Transport::NoContext exception\n"))); - } - ACE_CATCH (CORBA::SystemException, ex1) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) server - Caught a CORBA::SystemException exception\n"))); - } - ACE_ENDTRY; -} - -void -Current_Test_Impl::invoked_by_client_i (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, TAO::Transport::NoContext)) -{ - if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - Testing inside an upcall\n"))); - } - - this->test_transport_current (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - if (this->do_collocated_calls_) - { - CORBA::Object_var selfobject = - poa_->servant_to_reference (this - ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - Test::Transport::CurrentTest_var self = - Test::Transport::CurrentTest::_narrow (selfobject.in () - ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - if (TAO_debug_level >= 1) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - Testing a collocated call\n"))); - } - self->invoked_during_upcall (ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - else - { - if (TAO_debug_level >= 1) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - Skipping the collocated call test\n"))); - } - } -} - -void -Current_Test_Impl::invoked_during_upcall (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - Test method invoked ") - ACE_TEXT ("by the server during upcall.\n"))); - } - -} - -void -Current_Test_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - shutting down.\n"))); - } - - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/tests/TransportCurrent/Framework/Framework.mpc b/TAO/tests/TransportCurrent/Framework/Framework.mpc deleted file mode 100644 index aa3e0ce65d0..00000000000 --- a/TAO/tests/TransportCurrent/Framework/Framework.mpc +++ /dev/null @@ -1,40 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(*Server): taoserver, tc, pi_server { - - after += Current_Test_Lib_Client Current_Test_Lib_Server - - includes += . ../lib - - libs += Current_Test_Lib_Client Current_Test_Lib_Server - libpaths += ../lib - - Source_Files { - server.cpp - Current_Test_Impl.cpp - Tester.cpp - Server_Main.cpp - } - - IDL_Files { - } -} - -project(*Client): taoclient, tc, dynamicinterface { - - after += *Server Current_Test_Lib_Client Current_Test_Lib_Server - - includes += . ../lib - - libs += Current_Test_Lib_Client Current_Test_Lib_Server - libpaths += ../lib - - Source_Files { - client.cpp - Tester.cpp - } - - IDL_Files { - } -} diff --git a/TAO/tests/TransportCurrent/Framework/Makefile.am b/TAO/tests/TransportCurrent/Framework/Makefile.am deleted file mode 100644 index 1e83dc49b65..00000000000 --- a/TAO/tests/TransportCurrent/Framework/Makefile.am +++ /dev/null @@ -1,118 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Framework_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I. \ - -I../lib - -server_SOURCES = \ - Current_Test_Impl.cpp \ - Server_Main.cpp \ - Tester.cpp \ - server.cpp - -../lib: - mkdir -p ../lib - - -server_DEPENDENCIES = \ - ../lib - -server_LDFLAGS = \ - -L../lib - -server_LDADD = \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_TC.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Framework_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I. \ - -I../lib - -client_SOURCES = \ - Tester.cpp \ - client.cpp - -../lib: - mkdir -p ../lib - - -client_DEPENDENCIES = \ - ../lib - -client_LDFLAGS = \ - -L../lib - -client_LDADD = \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO_TC.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/TransportCurrent/Framework/README b/TAO/tests/TransportCurrent/Framework/README deleted file mode 100644 index 4ca496c01a5..00000000000 --- a/TAO/tests/TransportCurrent/Framework/README +++ /dev/null @@ -1,22 +0,0 @@ -This test intents to show the usage and the expected behavior of the -Transport Current framework. The topology is the same as in the basic -Hello test: a client invokes a method on the server and then shuts it -down and exits. The special features of the test is that it attempts -to obtain Transport Traits information, using the Transport Current. - -There are four basic contexts in which a Transport information can be -requested, by definition: - - * on the client side, outside client-side interceptor; - * client side, inside an interceptor; - * server side, inside an up-call; - * server side, inside an interceptor; - -The test implements the client and the server side interceptors that -simply call a test method when invoked. A simple interception count -serves to validate the expected behavior. - -By default, the client and server will each have only one thread. Use -"-t N" parameter to override that. The "-n N" client-side parameter -determines how many times a particular client thread will call the -server. The default is 1. diff --git a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp deleted file mode 100644 index 21c1227fbf3..00000000000 --- a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// -*- C++ -*- - -// $Id$ - -#include "Server_Request_Interceptor.h" - -/// Prototype -int server_main (int argc, - ACE_TCHAR *argv[], - Test::Server_Request_Interceptor *cri); - -int -test_transport_current (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::UserException)); - -int -ACE_TMAIN (int argc, - ACE_TCHAR *argv[]) -{ - Test::Server_Request_Interceptor cri ("test_orb", test_transport_current); - return server_main (argc, argv, &cri); -} diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp deleted file mode 100644 index eef52de80fa..00000000000 --- a/TAO/tests/TransportCurrent/Framework/Tester.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// $Id$ - -#include "tao/TransportCurrent/Transport_Current.h" - -using namespace TAO; - - -/// Test referencing the TC data outside of the context of an upcall, -/// or a client-side interceptor - -int -test_transport_current (Transport::Current_ptr tc - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::UserException)) -{ - CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Tester (%P|%t) Transport [%q] - Sent/Received [bytes=%q/%q, messages=%q/%q]\n"), - (ACE_UINT64)id, - (ACE_UINT64)bs, - (ACE_UINT64)br, - (ACE_UINT64)rs, - (ACE_UINT64)rr)); - - return 0; -} - -int -test_transport_current (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::UserException)) -{ - // Get the Current object. - CORBA::Object_var tcobject = - orb->resolve_initial_references ("TAO::Transport::Current" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Transport::Current_var tc = - Transport::Current::_narrow (tcobject.in () - ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - if (CORBA::is_nil (tc.in ())) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) client - ERROR: Could not resolve ") - ACE_TEXT ("TAOTransportCurrent object.\n"))); - - ACE_TRY_THROW (CORBA::INTERNAL ()); - } - - return test_transport_current (tc.in ()); -} diff --git a/TAO/tests/TransportCurrent/Framework/client-static.conf b/TAO/tests/TransportCurrent/Framework/client-static.conf deleted file mode 100644 index 0f63cfe7965..00000000000 --- a/TAO/tests/TransportCurrent/Framework/client-static.conf +++ /dev/null @@ -1 +0,0 @@ -static TAO_Transport_Current_Loader "" diff --git a/TAO/tests/TransportCurrent/Framework/client.conf b/TAO/tests/TransportCurrent/Framework/client.conf deleted file mode 100644 index aecb1923f83..00000000000 --- a/TAO/tests/TransportCurrent/Framework/client.conf +++ /dev/null @@ -1 +0,0 @@ -dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() "" diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp deleted file mode 100644 index 12207234dd4..00000000000 --- a/TAO/tests/TransportCurrent/Framework/client.cpp +++ /dev/null @@ -1,303 +0,0 @@ -// -*- C++ -*- - -#include "ace/Get_Opt.h" -#include "ace/Task.h" - -#include "tao/DynamicInterface/Request.h" -#include "tao/ORBInitializer_Registry.h" - -#include "tao/TransportCurrent/Transport_Current.h" - -#include "Client_Request_Interceptor.h" -#include "Current_TestC.h" - -#include "Client_ORBInitializer.h" - -ACE_RCSID (PICurrent, - client, - "$Id$") - -// Prototype - -int -test_transport_current (CORBA::ORB_ptr - ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::UserException)); - -using namespace TAO; - -const ACE_TCHAR* CLIENT_ORB_ID = ACE_TEXT ("client orb"); -const ACE_TCHAR* ior = "file://server.ior"; - -int nthreads = 1; -int niterations = 1; -int use_dii = 1; - - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "yt:n:k:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'y': - use_dii = 0; // Do not use DII - break; - case 'k': - ior = get_opts.opt_arg (); - break; - case 't': - nthreads = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'n': - niterations = ACE_OS::atoi (get_opts.opt_arg ()); - break; - default: - ACE_ERROR_RETURN ((LM_ERROR, - "Usage: %s " - "-k IOR " - "-t threads " - "-n iterations " - "-y " - "\n", - argv[0]), - -1); - } - return 0; -} - - -/// A helper class to encapsulate a task - -class Worker : public ACE_Task_Base -{ -public: - Worker (Test::Transport::CurrentTest_ptr server, int niterations, int use_dii_too); - virtual int svc (void); - -private: - // The server. - Test::Transport::CurrentTest_var server_; - - // The number of iterations on each client thread. - int niterations_; - - // Whether to use DII in addition to SII - int use_dii_too_; -}; - - -/// Ctor - -Worker::Worker (Test::Transport::CurrentTest_ptr server, - int niterations, - int use_dii_too) - : server_ (Test::Transport::CurrentTest::_duplicate (server)) - , niterations_ (niterations) - , use_dii_too_ (use_dii_too) -{ -} - - -/// Test referencing the TC data *inside* the context of a client-side -/// interceptor - -int -Worker::svc (void) -{ - ACE_TRY_NEW_ENV - { - - for (int i = 0; i < this->niterations_; ++i) - { - - // Minimum CORBA does not define Object::_request, so we're just - // skipping the DII part in those cases. -#if (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) - - if (this->use_dii_too_) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via DII\n"))); - - CORBA::Request_var request = - this->server_->_request ("invoked_by_client" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - request->set_return_type (CORBA::_tc_void); - - request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - } - -#endif /* (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) */ - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via SII\n"))); - - this->server_->invoked_by_client (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (TAO_debug_level > 0 && i % 100 == 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Iteration = %d\n"), - i)); - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client: exception raised"); - } - ACE_ENDTRY; - return 0; -} - - -/// The main driver -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - Test::Client_Request_Interceptor cri (CLIENT_ORB_ID, test_transport_current); - - PortableInterceptor::ORBInitializer_ptr temp_initializer = - PortableInterceptor::ORBInitializer::_nil (); - - ACE_NEW_RETURN (temp_initializer, - Test::Client_ORBInitializer (&cri), - -1); - - PortableInterceptor::ORBInitializer_var orb_initializer = - temp_initializer; - - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - CLIENT_ORB_ID - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Client (%P|%t) Failure to parse the command line.\n"), - ior), - -1); - - - ACE_TRY - { - test_transport_current (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Client (%P|%t) ERROR: ") - ACE_TEXT ("TC invocation, outside of ") - ACE_TEXT ("interceptor context is undefined.") - ACE_TEXT (" Expected exception was not thrown\n")), - -1); - } - ACE_CATCH (Transport::NoContext, ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Client (%P|%t) Expected exception occured when trying ") - ACE_TEXT ("to access traits outside the ") - ACE_TEXT ("interceptor or upcall context.\n"))); - } - ACE_ENDTRY; - - // Resolve the target object - CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Transport::CurrentTest_var server = - Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (server.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Client (%P|%t) The server object reference <%s> is nil.\n"), - ior), - -1); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Spawning %d threads\n"), nthreads)); - - // Spawn a number of clients doing the same thing for a - // predetermined number of times - Worker client (server.in (), niterations, use_dii); - -#if defined (ACE_HAS_THREADS) - if (client.activate (THR_NEW_LWP | THR_JOINABLE, - nthreads) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Client (%P|%t) Cannot activate %d client threads\n"), - nthreads), - -1); - client.thr_mgr ()->wait (); -#else - if (nthreads > 1) - ACE_ERROR ((LM_WARNING, - ACE_TEXT ("Client (%P|%t) Cannot use threads other than ") - ACE_TEXT ("the only one available.\n"))); - client.svc (); -#endif - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Collected any threads\n"))); - - CORBA::Long result = 0; - - // Verify enough interception points have been triggered - if (cri.interceptions () != 2 * // request & response - niterations * // iterations - nthreads * // threads - (2*use_dii)) // sii and dii, if needed - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Client (%P|%t) Expected %d client-side interceptions, but detected %d\n"), - 2 * niterations * nthreads * (2*use_dii), - cri.interceptions ())); - } - else - { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n"))); - - // Self-test the server side - result = server->self_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (result != 0) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Client (%P|%t) Server self-test reported failure\n"))); - } - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking oneway server->shutdown()\n"))); - - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("Client (%P|%t) Completed %s\n"), - ((result == 0) ? ACE_TEXT ("successfuly") : ACE_TEXT ("with failure")))); - return result; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Client: Transport Current test (client-side) failed:")); - return -1; - } - ACE_ENDTRY; -} diff --git a/TAO/tests/TransportCurrent/Framework/run_test.pl b/TAO/tests/TransportCurrent/Framework/run_test.pl deleted file mode 100755 index c53fce33033..00000000000 --- a/TAO/tests/TransportCurrent/Framework/run_test.pl +++ /dev/null @@ -1,89 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use Config; -use PerlACE::Run_Test; - -sub add_path { - my($name) = shift; - my($value) = shift; - if (defined $ENV{$name}) { - $ENV{$name} .= $Config{'path_sep'} . $value - } - else { - $ENV{$name} = $value; - } -} - -# Set the library path for the client to be able to load -# the commom library. -add_path('LD_LIBRARY_PATH', '../lib'); -add_path('LIBPATH', '../lib'); -add_path('SHLIB_PATH', '../lib'); -add_path('PATH', '../lib'); -add_path('DYLD_LIBRARY_PATH', '../lib'); - -my $status = 0; -my $confmod = ""; - -my $mode = shift (@ARGV); -if ( $mode =~ /-dynamic/) { -} -elsif ( $mode =~ /-static/) { - $confmod = "-static"; -} -else { - print STDERR "Unknown $mode. Specify -static or -dynamic\n"; - exit 1; -} - -my $iorfile = PerlACE::LocalFile ("server.ior"); -my $confserver = PerlACE::LocalFile ("server$confmod.conf"); -my $confclient = PerlACE::LocalFile ("client$confmod.conf"); -unlink $iorfile; - -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", - "@ARGV -ORBSvcConf server.conf -o server.ior"); -} -else { - $SV = new PerlACE::Process ("server", - "@ARGV -ORBSvcConf $confserver -o $iorfile"); -} - -$CL = new PerlACE::Process ("client", - "@ARGV -n 1 -ORBSvcConf $confclient -k file://$iorfile"); - -print STDERR $SV->CommandLine()."\n"; -$SV->Spawn (); - -if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "$0: ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} - -print STDERR $CL->CommandLine()."\n"; -$client = $CL->SpawnWaitKill (300); - -if ($client != 0) { - print STDERR "$0: ERROR: client returned $client\n"; - $status = 1; -} - -$server = $SV->WaitKill (10); - -if ($server != 0) { - print STDERR "$0: ERROR: server returned $server\n"; - $status = 1; -} - -unlink $iorfile; - -exit $status; diff --git a/TAO/tests/TransportCurrent/Framework/server-static.conf b/TAO/tests/TransportCurrent/Framework/server-static.conf deleted file mode 100644 index 0f63cfe7965..00000000000 --- a/TAO/tests/TransportCurrent/Framework/server-static.conf +++ /dev/null @@ -1 +0,0 @@ -static TAO_Transport_Current_Loader "" diff --git a/TAO/tests/TransportCurrent/Framework/server.conf b/TAO/tests/TransportCurrent/Framework/server.conf deleted file mode 100644 index aecb1923f83..00000000000 --- a/TAO/tests/TransportCurrent/Framework/server.conf +++ /dev/null @@ -1 +0,0 @@ -dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() "" diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp deleted file mode 100644 index 579f11d7726..00000000000 --- a/TAO/tests/TransportCurrent/Framework/server.cpp +++ /dev/null @@ -1,242 +0,0 @@ -// -*- C++ -*- - -#include "ace/Get_Opt.h" -#include "ace/OS_NS_stdio.h" -#include "ace/Task.h" - -#include "tao/ORBInitializer_Registry.h" - -#include "Current_Test_Impl.h" -#include "Server_Request_Interceptor.h" -#include "Server_ORBInitializer.h" - - -ACE_RCSID (Transport_Current, - server, - "$Id$") - -const char *ior_output_file = "server.ior"; -int nthreads = 1; -int use_collocated_call = 1; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "t:o:n:c:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'c': - use_collocated_call = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'o': - ior_output_file = get_opts.opt_arg (); - break; - case 't': - nthreads = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'n': // Does nothing. Added just for symetry with the client. - break; - default: - ACE_ERROR_RETURN ((LM_ERROR, - "Usage: %s " - "-o <iorfile>" - "-t threads " - "-n n (ignored, if provided) " - "-c make_collocated_calls " - "\n", - argv[0]), - -1); - } - - // Indicates sucessful parsing of the command line - return 0; -} - - - -/// A helper class to encapsulate a task - -class Worker : public ACE_Task_Base -{ -public: - Worker (CORBA::ORB_ptr); - virtual int svc (void); - -private: - // The ORB - CORBA::ORB_var orb_; -}; - - -/// Ctor - -Worker::Worker (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - - -/// Test referencing the TC data *inside* the context of a client-side -/// interceptor - -int -Worker::svc (void) -{ - ACE_TRY_NEW_ENV - { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Server: exception raised"); - } - ACE_ENDTRY; - return 0; -} - - - -/// Main driver - -int -server_main (int argc, - ACE_TCHAR *argv[], - Test::Server_Request_Interceptor *cri) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - PortableInterceptor::ORBInitializer_ptr temp_initializer = - PortableInterceptor::ORBInitializer::_nil (); - - ACE_NEW_RETURN (temp_initializer, - Test::Server_ORBInitializer (cri), - -1); // No exceptions yet! - - PortableInterceptor::ORBInitializer_var orb_initializer = - temp_initializer; - - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ACE_TEXT ("test_orb") - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (root_poa.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Server (%P|%t) Unable to obtain") - ACE_TEXT (" RootPOA reference.\n")), - -1); - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return -1; - - Current_Test_Impl server_impl (orb.in (), - root_poa.in (), - use_collocated_call); - - obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Transport::CurrentTest_var server = - Test::Transport::CurrentTest::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (server.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Server (%P|%t) Unable to obtain ") - ACE_TEXT ("reference to CurrentTest object.\n")), - -1); - - CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // If the ior_output_file exists, output the IOR to it. - if (ior_output_file != 0) - { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Server (%P|%t) Cannot write " - "IOR: %s - %m", - ior_output_file), - -1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - } - - // Spawn a number of clients doing the same thing for a - // predetermined number of times - Worker worker (orb.in ()); - -#if defined (ACE_HAS_THREADS) - if (worker.activate (THR_NEW_LWP | THR_JOINABLE, - nthreads) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Server (%P|%t) Cannot activate %d threads\n"), - nthreads), - -1); - worker.thr_mgr ()->wait (); -#else - if (nthreads > 1) - ACE_ERROR ((LM_WARNING, - ACE_TEXT ("Server (%P|%t) Cannot use threads other than ") - ACE_TEXT ("the only one available.\n"))); - worker.svc (); -#endif - - if (TAO_debug_level >= 1) - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Event loop finished.\n"))); - - if (!cri->self_test ()) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Server (%P|%t) ERROR: Interceptor self_test failed\n"))); - - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Server (%P|%t) ERROR: ")); - - return -1; - } - ACE_ENDTRY; - - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Completed successfuly.\n"))); - return 0; -} diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp deleted file mode 100644 index 2b945f788c1..00000000000 --- a/TAO/tests/TransportCurrent/Framework/simple.cpp +++ /dev/null @@ -1,88 +0,0 @@ -// -*- C++ -*- - -#include "tao/ORB.h" -#include "tao/Object.h" - -#include "ace/Service_Config.h" -#include "ace/Dynamic_Service.h" - -ACE_RCSID (Transport_Current, - simple, - "$Id$") - -int -testCurrentORBInitializer (int argc, char *argv[]) -{ - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - - if (orb.in () == 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to create orb\n")), -1); - - CORBA::Object_var obj = - orb->resolve_initial_references ("TAO::Transport::Current" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if (obj.in () == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Unable to get the Transport Current\n")), -1); - - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("testCurrentORBInitializer: OK\n"))); - return 0; -} - - -int -testCurrentLoader (int, char *[]) -{ - - ACE_Service_Object *factory = 0; - - factory = ACE_Dynamic_Service<ACE_Service_Object>::instance - (ACE_TEXT ("TAO_Transport_Current_Loader")); - - int done = -#if defined (TAO_AS_STATIC_LIBS) - true; -#else - (factory != 0); -#endif /* TAO_AS_STATIC_LIBS */ - - if (factory == 0) - { - if (done) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Unable to instantiate TAO::Transport::Current_Factory\n")), - -1); - else - { - -#if !defined (TAO_AS_STATIC_LIBS) - int ret = ACE_Service_Config::process_directive - (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader", - "TAO_Transport_Current", - "_make_TAO_Transport_Current_Loader", - "")); - ACE_ASSERT (ret == 0); - - factory = ACE_Dynamic_Service<ACE_Service_Object>::instance - (ACE_TEXT ("TAO_Transport_Current_Loader")); - -#endif /* !TAO_AS_STATIC_LIBS */ - } - } - - // ACE_ASSERT (factory != 0); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("testCurrentLoader: OK\n"))); - return 0; - -} - - -int -main (int argc, char *argv[]) -{ - return testCurrentLoader (argc, argv) - || testCurrentORBInitializer (argc, argv); -} diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp deleted file mode 100644 index 8687263dbc3..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp +++ /dev/null @@ -1,139 +0,0 @@ -// -*- C++ -*- - -#include "tao/TransportCurrent/TC_IIOPC.h" -#include "tao/TransportCurrent/TCC.h" - -#include "Current_Test_Impl.h" - -ACE_RCSID (Transport_Current, - Current_Test_Impl, - "$Id$") - - -Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - int do_collocated_calls) - : orb_ (CORBA::ORB::_duplicate (orb)) - , poa_ (PortableServer::POA::_duplicate (poa)) - , do_collocated_calls_ (do_collocated_calls) -{ -} - -Current_Test_Impl::~Current_Test_Impl (void) -{ -} - -::CORBA::Long -Current_Test_Impl::self_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((::CORBA::SystemException)) -{ - return 0; -} - -void -Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - Testing access to IIOP Transport Current ...\n"))); - } - - CORBA::Object_var tcobject = - this->orb_->resolve_initial_references ("TAO::Transport::IIOP::Current" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - TAO::Transport::IIOP::Current_var tc = - TAO::Transport::IIOP::Current::_narrow (tcobject.in () - ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - if (CORBA::is_nil (tc.in())) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to narrow down to TAO::Transport::IIOP::Current\n"))); - ACE_THROW (CORBA::INTERNAL ()); - } - - CORBA::String_var rhost (tc->remote_host ()); - CORBA::String_var lhost (tc->local_host ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - [%s:%d] -> [%s:%d]\n"), - rhost.in (), tc->remote_port (), - lhost.in (), tc->local_port ())); - - if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - Successfully accessed IIOP Transport Current\n"))); - } -} - - - -void -Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (TAO_debug_level >= 1) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - Test method invoked by client.\n"))); - } - - this->test_transport_current (ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - if (this->do_collocated_calls_) - { - CORBA::Object_var selfobject = - poa_->servant_to_reference (this - ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - Test::Transport::CurrentTest_var self = - Test::Transport::CurrentTest::_narrow (selfobject.in () - ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - if (TAO_debug_level >= 1) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - Making a collocated invocation to invoked_during_upcall().\n"))); - } - self->invoked_during_upcall (ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - else - { - if (TAO_debug_level >= 1) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - skipping collocated calls\n"))); - } - - } - -} - -void -Current_Test_Impl::invoked_during_upcall (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - Test method invoked ") - ACE_TEXT ("by the server during upcall.\n"))); - } -} - -void -Current_Test_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server - shutting down.\n"))); - } - - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc deleted file mode 100644 index 49b2d839f38..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc +++ /dev/null @@ -1,47 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(*Server): taoserver, tc_iiop, pi_server { - after += Curren_Test_Lib_Client Current_Test_Lib_Server - libs += Current_Test_Lib_Client Current_Test_Lib_Server - - specific (automake) { - includes += $(srcdir) $(srcdir)/../lib - libpaths += $(srcdir)/../lib - } else { - includes += . ../lib - libpaths += ../lib - } - - Source_Files { - server.cpp - Current_Test_Impl.cpp - IIOP_Server_Request_Interceptor.cpp - IIOP_Server_Main.cpp - IIOP_Tester.cpp - } - - IDL_Files { - } -} - -project(*Client): taoclient, tc_iiop, dynamicinterface { - after += *Server Current_Test_Lib_Client Current_Test_Lib_Server - libs += Current_Test_Lib_Client Current_Test_Lib_Server - - specific (automake) { - includes += $(srcdir) $(srcdir)/../lib - libpaths += $(srcdir)/../lib - } else { - includes += . ../lib - libpaths += ../lib - } - - Source_Files { - client.cpp - IIOP_Tester.cpp - } - - IDL_Files { - } -} diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp deleted file mode 100644 index cce444d8662..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// -*- C++ -*- - -// $Id$ - -#include "IIOP_Server_Request_Interceptor.h" - -/// Prototype -int server_main (int argc, - ACE_TCHAR *argv[], - Test::Server_Request_Interceptor *cri); - -int -test_transport_current (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::UserException)); - -int -ACE_TMAIN (int argc, - ACE_TCHAR *argv[]) -{ - Test::IIOP_Server_Request_Interceptor cri ("test_orb", test_transport_current); - return server_main (argc, argv, &cri); -} diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp deleted file mode 100644 index f51936d5d35..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp +++ /dev/null @@ -1,352 +0,0 @@ -// -*- C++ -*- - -#include "ace/Log_Msg.h" -#include "tao/ORB_Constants.h" -#include "tao/TransportCurrent/TC_IIOPC.h" - -ACE_RCSID (ForwardRequest, - Server_Request_Interceptor, - "$Id$") - -#include "IIOP_Server_Request_Interceptor.h" - -namespace Test { - - using namespace TAO; - - IIOP_Server_Request_Interceptor::IIOP_Server_Request_Interceptor (const char* orbid, TEST test) - : Server_Request_Interceptor (orbid, test) - , iiop_test_successful_ (true) - , mult_thr_test_successful_ (true) - { - } - - IIOP_Server_Request_Interceptor::~IIOP_Server_Request_Interceptor (void) - { - } - - char * - IIOP_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) - { - return CORBA::string_dup ("II SRI"); - } - - /// - TAO::Transport::IIOP::Current_ptr - IIOP_Server_Request_Interceptor::resolve_iiop_transport_current (const char* orbid - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) - { - CORBA::String_var name (this->name ()); - - int tmpargc = 0; - CORBA::ORB_var orb = CORBA::ORB_init (tmpargc, - 0, - orbid - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - CORBA::Object_var tcobject = - orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current") - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - return TAO::Transport::IIOP::Current::_narrow (tcobject.in () - ACE_ENV_ARG_PARAMETER); - } - - /// On every request, a client-supplied (via the context) id is used - /// as index in an array, where we store the endpoint - void - IIOP_Server_Request_Interceptor::push_request_info (size_t requestID - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) - { - CORBA::String_var name (this->name ()); - - TAO::Transport::IIOP::Current_var tc = - resolve_iiop_transport_current (this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); - - CORBA::String_var host (tc->remote_host()); - EndPoint ep (tc->remote_port(), host.in ()); - - if (requestID < sizeof (this->endPoints_) / sizeof (*this->endPoints_)) - { - endPoints_[requestID] = ep; - - if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s (%P|%t) ") - ACE_TEXT ("push_request_info: %d ...\n"), - name.in (), - requestID)); - } - else - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s (%P|%t) ") - ACE_TEXT ("push_request_info: Can't track that many requests %d\n"), - name.in (), - requestID)); - - } - - void - IIOP_Server_Request_Interceptor::pop_request_info (size_t requestID) - { - static EndPoint dummy; - CORBA::String_var name (this->name ()); - - if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s (%P|%t) ") - ACE_TEXT ("pop_request_info: %d ...\n"), - name.in (), - requestID)); - - if (requestID >= sizeof (this->endPoints_) / sizeof (*this->endPoints_)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s (%P|%t) ") - ACE_TEXT ("pop_request_info: Can't track that many requests %d\n"), - name.in (), - requestID)); - return; - } - - - ACE_TRY - { - TAO::Transport::IIOP::Current_var tc = - resolve_iiop_transport_current (this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); - - CORBA::String_var host (tc->remote_host()); - EndPoint ep (tc->remote_port(), host.in ()); - - if (ep != endPoints_[requestID]) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s (%P|%t) ") - ACE_TEXT ("pop_request_info: The expected host and port don't match for request %d\n"), - name.in (), - requestID)); - return; - } - } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) - { - // Last reply after the orb has been shut down. Calling - // resolve_iiop_transport_current in this case will cause - // BAD_INV_ORDER, so instead we swallow the exception and bid - // goodbye. - } - ACE_ENDTRY; - - endPoints_[requestID] = dummy; - } - - - /// Checks if all the endpoints, encountered on the way in have been - /// cleaned on the way out of the interception point - bool - IIOP_Server_Request_Interceptor::self_test (void) - { - CORBA::String_var name (this->name ()); - bool has_remaining_endpoints = false; - for (size_t count = 0; - count < (sizeof (this->endPoints_) / sizeof (*this->endPoints_)); - count ++) - { - if (endPoints_[count].port_ != 0) - { - has_remaining_endpoints = true; - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s (%P|%t) Endpoint at ") - ACE_TEXT ("index=%d has not been removed yet\n"), - name.in (), - count)); - } - } - - return Server_Request_Interceptor::self_test () - && iiop_test_successful_ - && !has_remaining_endpoints; - } - - - - void - IIOP_Server_Request_Interceptor::inbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) - { - CORBA::String_var name (this->name ()); - CORBA::String_var op (ri->operation(ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; - - if (TAO_debug_level >=1) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("%s (%P|%t) Intercepted operation %s ()\n"), - name.in (), - op.in ())); - - ACE_TRY - { - IOP::ServiceId id = Test::Transport::CurrentTest::ContextTag; - IOP::ServiceContext_var sc = - ri->get_request_service_context (id - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - const char *buf = - reinterpret_cast <const char *> (sc->context_data.get_buffer ()); - - long requestID = ACE_OS::atoi (buf); - - this->push_request_info (requestID); - } - ACE_CATCHANY - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s (%P|%t) Service context") - ACE_TEXT (" is unavailable when invoking %s (). ") - ACE_TEXT ("A colocated invocation would have ") - ACE_TEXT ("no service context.\n"), - name.in (), - op.in ())); - } - ACE_ENDTRY; - - } - - void - IIOP_Server_Request_Interceptor::outbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) - { - IOP::ServiceId id = Test::Transport::CurrentTest::ContextTag; - - IOP::ServiceContext_var sc = - ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - const char *buf = - reinterpret_cast <const char *> (sc->context_data.get_buffer ()); - - this->pop_request_info (ACE_OS::atoi (buf)); - } - - - - - - - void - IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) - { - ACE_TRY - { - inbound_process_context (ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - CORBA::String_var name (this->name ()); - ACE_ERROR ((LM_ERROR, - ACE_TEXT("%s (%P|%t) Inbound_process_context failed in ") - ACE_TEXT(" receive_request_service_contexts.\n"), - name.in ())); - } - ACE_ENDTRY; - - Server_Request_Interceptor::receive_request_service_contexts (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - } - - - void - IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) - { - ACE_TRY - { - outbound_process_context (ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - } - ACE_CATCHANY - { - CORBA::String_var name (this->name ()); - ACE_ERROR ((LM_ERROR, - ACE_TEXT("%s (%P|%t) Outbound_process_context failed in ") - ACE_TEXT("send_reply.\n"), - name.in ())); - } - ACE_ENDTRY; - - Server_Request_Interceptor::send_reply (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - } - - void - IIOP_Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) - { - ACE_TRY - { - outbound_process_context (ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - - } - ACE_CATCHANY - { - CORBA::String_var name (this->name ()); - ACE_ERROR ((LM_ERROR, - ACE_TEXT("%s (%P|%t) Outbound_process_context failed in ") - ACE_TEXT("send_exception.\n"), - name.in ())); - - } - ACE_ENDTRY; - - Server_Request_Interceptor::send_exception (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - - void - IIOP_Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) - { - ACE_TRY - { - outbound_process_context (ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - CORBA::String_var name (this->name ()); - ACE_ERROR ((LM_ERROR, - ACE_TEXT("%s (%P|%t) Outbound_process_context failed in ") - ACE_TEXT("send_other.\n"), - name.in ())); - } - ACE_ENDTRY; - - Server_Request_Interceptor::send_other (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - -} diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h deleted file mode 100644 index 00cd81bdb31..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h +++ /dev/null @@ -1,154 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file IIOP_Server_Request_Interceptor.h - * - * $Id$ - * - * Implementation header for the server request interceptor for the - * IIOP_Threading test. - * - * @author Iliyan Jeliazkov <iliyan@ociweb.com> - * @author Ciju John <johnc@ociweb.com> - */ -//============================================================================= - -#ifndef ISERVER_REQUEST_INTERCEPTOR_H -#define ISERVER_REQUEST_INTERCEPTOR_H - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/TransportCurrent/IIOP_Transport_Current.h" - -#include "Server_Request_Interceptor.h" - -namespace Test -{ - - class IIOP_Server_Request_Interceptor - : public virtual Test::Server_Request_Interceptor - , public virtual TAO_Local_RefCounted_Object - { - public: - - /// Constructor. - IIOP_Server_Request_Interceptor (const char* orbid, TEST test); - - /// Destructor. - virtual ~IIOP_Server_Request_Interceptor (); - - /// queries the status of the test - virtual bool self_test (); - - /** - * @name Methods Required by the Server Request Interceptor - * Interface - * - * These are methods that must be implemented since they are pure - * virtual in the abstract base class. They are the canonical - * methods required for all server request interceptors. - */ - //@{ - /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// incomming interception point - virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); - - /// outgoing interception point - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// outgoing interception point - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); - - /// outgoing interception point - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); - //@} - - protected: - - /// process incomming requests context - void inbound_process_context - (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// process outgoing requests context - void outbound_process_context - (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// saves the incomming request info - void push_request_info (size_t requestID - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// clears the outgoing request info - void pop_request_info (size_t requestID); - - TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - private: - - /// transport ID dtata structure - typedef struct EP { - CORBA::UShort port_; - CORBA::String_var host_; - - EP () - : port_(0) - , host_ () - {}; - - EP (CORBA::UShort port, const char* host) - : port_(port) - , host_ (host) - {}; - - bool operator== (const struct EP &ep) const - { - return (this->port_ == ep.port_) && - (strcmp (this->host_.in (), ep.host_.in ()) == 0); - }; - bool operator!= (const struct EP &ep) const - { - return !(this->operator== (ep)); - }; - - } EndPoint; - - private: - - /// IIOPTraits test status - bool iiop_test_successful_; - - /// Multi-threaded test status - bool mult_thr_test_successful_; - - /// Endpoints hash table - EndPoint endPoints_[1001]; - }; - -} // namespace Test - -#endif /* ISERVER_REQUEST_INTERCEPTOR_H */ diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp deleted file mode 100644 index 7e94ff502e5..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp +++ /dev/null @@ -1,92 +0,0 @@ -// -*- C++ -*- - -// $Id$ - -#include "tao/TransportCurrent/IIOP_Transport_Current.h" - -#if defined (TAO_AS_STATIC_LIBS) -#include "tao/TransportCurrent/IIOP_Current_Loader.h" - -// Create an object that will insert the <Current_Loader> into the -// list of statically linked services that the <ACE_Service_Config> -// will initialize at run-time. -ACE_STATIC_SVC_REQUIRE (TAO_Transport_Current_Loader) -ACE_STATIC_SVC_REQUIRE (TAO_Transport_IIOP_Current_Loader) -#endif /* TAO_AS_STATIC_LIBS */ - - -using namespace TAO; - - -/// Test referencing the TC data outside of the context of an upcall, -/// or a client-side interceptor - -int -test_transport_current (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::UserException)) -{ - // Get the Current object. - CORBA::Object_var tcobject = - orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current") - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - - if (TAO_debug_level >= 1) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Tester (%P|%t) Resolved initial reference for IIOP::Current\n"))); - - Transport::IIOP::Current_var tc = - Transport::IIOP::Current::_narrow (tcobject.in () - ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - if (TAO_debug_level >= 1) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Tester (%P|%t) Narowed the IIOP Transport Current\n"))); - - if (CORBA::is_nil (tc.in ())) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Tester (%P|%t) ERROR: Could not resolve ") - ACE_TEXT ("TAO::Transport::IIOP::Current object.\n"))); - - ACE_TRY_THROW (CORBA::INTERNAL ()); - } - - ::CORBA::String_var rhost (tc->remote_host (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_TRY_CHECK; - - ::CORBA::String_var lhost (tc->local_host (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_TRY_CHECK; - - ::CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ::TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ::TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ::TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ::TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Tester (%P|%t) Transport [%q] [%s:%d -> %s:%d] ") - ACE_TEXT ("Sent/Received [bytes=%q/%q, messages=%q/%q]\n"), - (ACE_UINT64)id, - rhost.in (), tc->remote_port (ACE_ENV_SINGLE_ARG_PARAMETER), - lhost.in (), tc->local_port (ACE_ENV_SINGLE_ARG_PARAMETER), - (ACE_UINT64)bs, - (ACE_UINT64)br, - (ACE_UINT64)rs, - (ACE_UINT64)rr)); - return 0; -} - diff --git a/TAO/tests/TransportCurrent/IIOP/Makefile.am b/TAO/tests/TransportCurrent/IIOP/Makefile.am deleted file mode 100644 index 52938e5c082..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/Makefile.am +++ /dev/null @@ -1,120 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.IIOP_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir) \ - -I$(srcdir)/../lib - -server_SOURCES = \ - Current_Test_Impl.cpp \ - IIOP_Server_Main.cpp \ - IIOP_Server_Request_Interceptor.cpp \ - IIOP_Tester.cpp \ - server.cpp \ - IIOP_Server_Request_Interceptor.h - -$(srcdir)/../lib: - mkdir -p $(srcdir)/../lib - - -server_DEPENDENCIES = \ - $(srcdir)/../lib - -server_LDFLAGS = \ - -L$(srcdir)/../lib - -server_LDADD = \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_TC_IIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_TC.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.IIOP_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir) \ - -I$(srcdir)/../lib - -client_SOURCES = \ - IIOP_Tester.cpp \ - client.cpp \ - IIOP_Server_Request_Interceptor.h - - -client_DEPENDENCIES = \ - $(srcdir)/../lib - -client_LDFLAGS = \ - -L$(srcdir)/../lib - -client_LDADD = \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO_TC_IIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_TC.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/TransportCurrent/IIOP/README b/TAO/tests/TransportCurrent/IIOP/README deleted file mode 100644 index b340cfcab02..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/README +++ /dev/null @@ -1,25 +0,0 @@ -This test has two parts, which run automatically: - -Part 1: - -IIOP_Transport_Current test: Demonstrates how in the application the -user can resolve the IIOP_Transport_Current and use it to obtain -IIOP-related transport properties for the current Transport. - -Part 2: - -Multi threading test: In this test the server has a Thread Pool. Using -Interceptors, the test tracks the transports that are used in the -individual invocations at various stage of the up-call. This validates -that the TC framework accurately tracks the correct transport for an -invocation, no matter what stage of the up-call in a multi-threaded -environment. - -We force creation of multiple transport by using the: static -Client_Strategy_Factory "-ORBTransportMuxStrategy exclusive" -directive. While this isn't 100% guaranteed, having multiple client -threads and making simultaneous invocations should trigger new transport -creation (as it did in lab conditions). - -See ../Framework/README for more detail on how and what contexts are -tested. diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp deleted file mode 100644 index 3cb8df90cc0..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/client.cpp +++ /dev/null @@ -1,303 +0,0 @@ -// -*- C++ -*- - -#include "ace/Get_Opt.h" -#include "ace/Task.h" - -#include "tao/DynamicInterface/Request.h" -#include "tao/ORBInitializer_Registry.h" - -#include "tao/TransportCurrent/Transport_Current.h" - -#include "Client_Request_Interceptor.h" -#include "Current_TestC.h" - -#include "Client_ORBInitializer.h" - -ACE_RCSID (IIOP, - client, - "$Id$") - -// Prototype - -int -test_transport_current (CORBA::ORB_ptr - ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::UserException)); - -using namespace TAO; - -const ACE_TCHAR* CLIENT_ORB_ID = ACE_TEXT ("client orb"); -const ACE_TCHAR* ior = "file://server.ior"; - -int nthreads = 1; -int niterations = 1; -int use_dii = 1; - - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "yt:n:k:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'y': - use_dii = 0; // Do not use DII - break; - case 'k': - ior = get_opts.opt_arg (); - break; - case 't': - nthreads = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'n': - niterations = ACE_OS::atoi (get_opts.opt_arg ()); - break; - default: - ACE_ERROR_RETURN ((LM_ERROR, - "Usage: %s " - "-k IOR " - "-t threads " - "-n iterations " - "-y " - "\n", - argv[0]), - -1); - } - return 0; -} - - -/// A helper class to encapsulate a task - -class Worker : public ACE_Task_Base -{ -public: - Worker (Test::Transport::CurrentTest_ptr server, int niterations, int use_dii_too); - virtual int svc (void); - -private: - // The server. - Test::Transport::CurrentTest_var server_; - - // The number of iterations on each client thread. - int niterations_; - - // Whether to use DII in addition to SII - int use_dii_too_; -}; - - -/// Ctor - -Worker::Worker (Test::Transport::CurrentTest_ptr server, - int niterations, - int use_dii_too) - : server_ (Test::Transport::CurrentTest::_duplicate (server)) - , niterations_ (niterations) - , use_dii_too_ (use_dii_too) -{ -} - - -/// Test referencing the TC data *inside* the context of a client-side -/// interceptor - -int -Worker::svc (void) -{ - ACE_TRY_NEW_ENV - { - - for (int i = 0; i < this->niterations_; ++i) - { - - // Minimum CORBA does not define Object::_request, so we're just - // skipping the DII part in those cases. -#if (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) - - if (this->use_dii_too_) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via DII\n"))); - - CORBA::Request_var request = - this->server_->_request ("invoked_by_client" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - request->set_return_type (CORBA::_tc_void); - - request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - } - -#endif /* (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) */ - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via SII\n"))); - - this->server_->invoked_by_client (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (TAO_debug_level > 0 && i % 100 == 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Iteration = %d\n"), - i)); - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client: exception raised"); - } - ACE_ENDTRY; - return 0; -} - - -/// The main driver -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - Test::Client_Request_Interceptor cri (CLIENT_ORB_ID, test_transport_current); - - PortableInterceptor::ORBInitializer_ptr temp_initializer = - PortableInterceptor::ORBInitializer::_nil (); - - ACE_NEW_RETURN (temp_initializer, - Test::Client_ORBInitializer (&cri), - -1); - - PortableInterceptor::ORBInitializer_var orb_initializer = - temp_initializer; - - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - CLIENT_ORB_ID - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Client (%P|%t) Failure to parse the command line.\n"), - ior), - -1); - - - ACE_TRY - { - test_transport_current (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Client (%P|%t) ERROR: ") - ACE_TEXT ("TC invocation, outside of ") - ACE_TEXT ("interceptor context is undefined.") - ACE_TEXT (" Expected exception was not thrown\n")), - -1); - } - ACE_CATCH (Transport::NoContext, ex) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Client (%P|%t) Expected exception occured when trying ") - ACE_TEXT ("to access traits outside the ") - ACE_TEXT ("interceptor or upcall context.\n"))); - } - ACE_ENDTRY; - - // Resolve the target object - CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Transport::CurrentTest_var server = - Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (server.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Client (%P|%t) The server object reference <%s> is nil.\n"), - ior), - -1); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Spawning %d threads\n"), nthreads)); - - // Spawn a number of clients doing the same thing for a - // predetermined number of times - Worker client (server.in (), niterations, use_dii); - -#if defined (ACE_HAS_THREADS) - if (client.activate (THR_NEW_LWP | THR_JOINABLE, - nthreads) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Client (%P|%t) Cannot activate %d client threads\n"), - nthreads), - -1); - client.thr_mgr ()->wait (); -#else - if (nthreads > 1) - ACE_ERROR ((LM_WARNING, - ACE_TEXT ("Client (%P|%t) Cannot use threads other than ") - ACE_TEXT ("the only one available.\n"))); - client.svc (); -#endif - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Collected any threads\n"))); - - CORBA::Long result = 0; - - // Verify enough interception points have been triggered - if (cri.interceptions () != 2 * // request & response - niterations * // iterations - nthreads * // threads - (2*use_dii)) // sii and dii, if needed - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Client (%P|%t) Expected %d client-side interceptions, but detected %d\n"), - 2 * niterations * nthreads * (2*use_dii), - cri.interceptions ())); - } - else - { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n"))); - - // Self-test the server side - result = server->self_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (result != 0) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Client (%P|%t) Server self-test reported failure\n"))); - } - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking oneway server->shutdown()\n"))); - - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("Client (%P|%t) Completed %s\n"), - ((result == 0) ? ACE_TEXT ("successfuly") : ACE_TEXT ("with failure")))); - return result; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Client: Transport Current test (client-side) failed:")); - return -1; - } - ACE_ENDTRY; -} diff --git a/TAO/tests/TransportCurrent/IIOP/client_dynamic.conf b/TAO/tests/TransportCurrent/IIOP/client_dynamic.conf deleted file mode 100644 index 56ff8d9c269..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/client_dynamic.conf +++ /dev/null @@ -1,3 +0,0 @@ -static Client_Strategy_Factory "-ORBTransportMuxStrategy exclusive" -dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() "" -dynamic TAO_Transport_IIOP_Current_Loader Service_Object * TAO_TC_IIOP:_make_TAO_Transport_IIOP_Current_Loader() "" diff --git a/TAO/tests/TransportCurrent/IIOP/client_static.conf b/TAO/tests/TransportCurrent/IIOP/client_static.conf deleted file mode 100644 index 56e191b9257..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/client_static.conf +++ /dev/null @@ -1,3 +0,0 @@ -static TAO_Transport_Current_Loader "" -static TAO_Transport_IIOP_Current_Loader "" -static Client_Strategy_Factory "-ORBTransportMuxStrategy exclusive" diff --git a/TAO/tests/TransportCurrent/IIOP/run_test.pl b/TAO/tests/TransportCurrent/IIOP/run_test.pl deleted file mode 100755 index faf9b921687..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/run_test.pl +++ /dev/null @@ -1,91 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use Config; -use PerlACE::Run_Test; - -sub add_path { - my($name) = shift; - my($value) = shift; - if (defined $ENV{$name}) { - $ENV{$name} .= $Config{'path_sep'} . $value - } - else { - $ENV{$name} = $value; - } -} - -# Set the library path for the client to be able to load -# the common library library. -add_path('LD_LIBRARY_PATH', '../lib'); -add_path('LIBPATH', '../lib'); -add_path('SHLIB_PATH', '../lib'); -add_path('PATH', '../lib'); -add_path('DYLD_LIBRARY_PATH', '../lib'); - -$status = 0; - -$client = PerlACE::LocalFile ("client"); - -$mode = shift (@ARGV); -if ( $mode =~ /-dynamic/) { - $client_conf_file = PerlACE::LocalFile ("client_dynamic.conf"); - $server_conf_file = PerlACE::LocalFile ("server_dynamic.conf"); -} -elsif ( $mode =~ /-static/) { - $client_conf_file = PerlACE::LocalFile ("client_static.conf"); - $server_conf_file = PerlACE::LocalFile ("server_static.conf"); -} -else { - print STDERR "Unknown $mode. Specify -static or -dynamic\n"; - exit 1; -} - -$iorfile = PerlACE::LocalFile ("server.ior"); -unlink $iorfile; - -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", - "@ARGV -c 0 -ORBSvcConf $server_conf_file -o server.ior"); -} -else { - $SV = new PerlACE::Process ("server", - "@ARGV -c 0 -ORBSvcConf $server_conf_file -o $iorfile"); -} - -$CL = new PerlACE::Process ($client, - "@ARGV -n 1 -ORBSvcConf $client_conf_file -k file://$iorfile"); - -print STDERR $SV->CommandLine()."\n"; -$SV->Spawn (); - -if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "$0: ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} - -print STDERR $CL->CommandLine()."\n"; -$client = $CL->SpawnWaitKill (300); - -if ($client != 0) { - print STDERR "$0: ERROR: client returned $client\n"; - $status = 1; -} - -$server = $SV->WaitKill (10); - -if ($server != 0) { - print STDERR "$0: ERROR: server returned $server\n"; - $status = 1; -} - -unlink $iorfile; - -exit $status; diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp deleted file mode 100644 index 579f11d7726..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/server.cpp +++ /dev/null @@ -1,242 +0,0 @@ -// -*- C++ -*- - -#include "ace/Get_Opt.h" -#include "ace/OS_NS_stdio.h" -#include "ace/Task.h" - -#include "tao/ORBInitializer_Registry.h" - -#include "Current_Test_Impl.h" -#include "Server_Request_Interceptor.h" -#include "Server_ORBInitializer.h" - - -ACE_RCSID (Transport_Current, - server, - "$Id$") - -const char *ior_output_file = "server.ior"; -int nthreads = 1; -int use_collocated_call = 1; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "t:o:n:c:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'c': - use_collocated_call = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'o': - ior_output_file = get_opts.opt_arg (); - break; - case 't': - nthreads = ACE_OS::atoi (get_opts.opt_arg ()); - break; - case 'n': // Does nothing. Added just for symetry with the client. - break; - default: - ACE_ERROR_RETURN ((LM_ERROR, - "Usage: %s " - "-o <iorfile>" - "-t threads " - "-n n (ignored, if provided) " - "-c make_collocated_calls " - "\n", - argv[0]), - -1); - } - - // Indicates sucessful parsing of the command line - return 0; -} - - - -/// A helper class to encapsulate a task - -class Worker : public ACE_Task_Base -{ -public: - Worker (CORBA::ORB_ptr); - virtual int svc (void); - -private: - // The ORB - CORBA::ORB_var orb_; -}; - - -/// Ctor - -Worker::Worker (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - - -/// Test referencing the TC data *inside* the context of a client-side -/// interceptor - -int -Worker::svc (void) -{ - ACE_TRY_NEW_ENV - { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Server: exception raised"); - } - ACE_ENDTRY; - return 0; -} - - - -/// Main driver - -int -server_main (int argc, - ACE_TCHAR *argv[], - Test::Server_Request_Interceptor *cri) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - PortableInterceptor::ORBInitializer_ptr temp_initializer = - PortableInterceptor::ORBInitializer::_nil (); - - ACE_NEW_RETURN (temp_initializer, - Test::Server_ORBInitializer (cri), - -1); // No exceptions yet! - - PortableInterceptor::ORBInitializer_var orb_initializer = - temp_initializer; - - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ACE_TEXT ("test_orb") - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (root_poa.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Server (%P|%t) Unable to obtain") - ACE_TEXT (" RootPOA reference.\n")), - -1); - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return -1; - - Current_Test_Impl server_impl (orb.in (), - root_poa.in (), - use_collocated_call); - - obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Transport::CurrentTest_var server = - Test::Transport::CurrentTest::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (server.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Server (%P|%t) Unable to obtain ") - ACE_TEXT ("reference to CurrentTest object.\n")), - -1); - - CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // If the ior_output_file exists, output the IOR to it. - if (ior_output_file != 0) - { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Server (%P|%t) Cannot write " - "IOR: %s - %m", - ior_output_file), - -1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - } - - // Spawn a number of clients doing the same thing for a - // predetermined number of times - Worker worker (orb.in ()); - -#if defined (ACE_HAS_THREADS) - if (worker.activate (THR_NEW_LWP | THR_JOINABLE, - nthreads) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Server (%P|%t) Cannot activate %d threads\n"), - nthreads), - -1); - worker.thr_mgr ()->wait (); -#else - if (nthreads > 1) - ACE_ERROR ((LM_WARNING, - ACE_TEXT ("Server (%P|%t) Cannot use threads other than ") - ACE_TEXT ("the only one available.\n"))); - worker.svc (); -#endif - - if (TAO_debug_level >= 1) - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Event loop finished.\n"))); - - if (!cri->self_test ()) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Server (%P|%t) ERROR: Interceptor self_test failed\n"))); - - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Server (%P|%t) ERROR: ")); - - return -1; - } - ACE_ENDTRY; - - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Completed successfuly.\n"))); - return 0; -} diff --git a/TAO/tests/TransportCurrent/IIOP/server_dynamic.conf b/TAO/tests/TransportCurrent/IIOP/server_dynamic.conf deleted file mode 100644 index df5758abd32..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/server_dynamic.conf +++ /dev/null @@ -1,2 +0,0 @@ -dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() "" -dynamic TAO_Transport_IIOP_Current_Loader Service_Object * TAO_TC_IIOP:_make_TAO_Transport_IIOP_Current_Loader() "" diff --git a/TAO/tests/TransportCurrent/IIOP/server_static.conf b/TAO/tests/TransportCurrent/IIOP/server_static.conf deleted file mode 100644 index a3bca724d53..00000000000 --- a/TAO/tests/TransportCurrent/IIOP/server_static.conf +++ /dev/null @@ -1,2 +0,0 @@ -static TAO_Transport_Current_Loader "" -static TAO_Transport_IIOP_Current_Loader "" diff --git a/TAO/tests/TransportCurrent/Makefile.am b/TAO/tests/TransportCurrent/Makefile.am deleted file mode 100644 index 31b17045a69..00000000000 --- a/TAO/tests/TransportCurrent/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - lib \ - IIOP \ - Framework - diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp deleted file mode 100644 index 40112cc0b5a..00000000000 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// -*- C++ -*- - -#include "ace/Log_Msg.h" - -ACE_RCSID (Current_Test_Lib, - Client_ORBInitializer, - "$Id$") - -#include "Client_Request_Interceptor.h" -#include "Client_ORBInitializer.h" - -namespace Test -{ - - Client_ORBInitializer::Client_ORBInitializer - (PortableInterceptor::ClientRequestInterceptor_ptr interceptor) - : interceptor_ - (PortableInterceptor::ClientRequestInterceptor::_duplicate (interceptor)) - { - /* no-op */ - } - - Client_ORBInitializer::~Client_ORBInitializer (void) - { - /* no-op */ - } - - void - Client_ORBInitializer::pre_init(PortableInterceptor::ORBInitInfo*) - throw (CORBA::SystemException) - { - /* no-op */ - } - - // A specialization to handle client-side interceptors - void Client_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo* oii) - throw (CORBA::SystemException) - { - oii->add_client_request_interceptor (this->interceptor_.in ()); - } - -} diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h deleted file mode 100644 index dcafa6638f4..00000000000 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h +++ /dev/null @@ -1,54 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Client_ORBInitializer.h - * - * $Id$ - * - * @author Iliyan jeliazkov <iliyan@ociweb.com> - */ -//============================================================================= - -#ifndef CLIENT_ORBINITIALIZER_T_H -#define CLIENT_ORBINITIALIZER_T_H -#include /**/ "ace/pre.h" -#include /**/ "ace/config.h" - -#include /**/ "Current_Test_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PI/PI.h" -#include "tao/PortableInterceptorC.h" - -namespace Test -{ - - class Current_Test_Export Client_ORBInitializer : - public PortableInterceptor::ORBInitializer - { - public: - Client_ORBInitializer (PortableInterceptor::ClientRequestInterceptor_ptr interceptor); - ~Client_ORBInitializer (void); - - virtual void pre_init(PortableInterceptor::ORBInitInfo*) - throw (CORBA::SystemException); - - virtual void post_init(PortableInterceptor::ORBInitInfo*) - throw (CORBA::SystemException); - - private: - PortableInterceptor::ClientRequestInterceptor_var interceptor_; - }; - -} - -#include /**/ "ace/post.h" - -#endif /* CLIENT_ORBINITIALIZER_T_H */ - - - diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp deleted file mode 100644 index f62ed6e1df1..00000000000 --- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp +++ /dev/null @@ -1,135 +0,0 @@ -// -*- C++ -*- - -#include "ace/Log_Msg.h" - -ACE_RCSID (ForwardRequest, - Client_Request_Interceptor, - "$Id$") - -#include "Current_TestC.h" -#include "Client_Request_Interceptor.h" -#include "Client_ORBInitializer.h" - -namespace Test -{ - - Client_Request_Interceptor::Client_Request_Interceptor (const char *orb_id, - TEST test) - : orb_id_ (CORBA::string_dup (orb_id)) - , request_count_ (0) - , requestID_ (1) - , test_ (test) - { - } - - CORBA::Long - Client_Request_Interceptor::interceptions (void) - { - return this->request_count_; - } - - char * - Client_Request_Interceptor::name (void) - throw (CORBA::SystemException) - { - return CORBA::string_dup ("Client_Request_Interceptor"); - } - - void - Client_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod) - throw (CORBA::SystemException, CORBA::UserException) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("CRI (%P|%t) Test accessing Transport Current from %s\n"), - amethod)); - - ++this->request_count_; - - int tmp = 0; - CORBA::ORB_var orb = CORBA::ORB_init (tmp, - 0, - orb_id_.in ()); - - // Call the test function, which will throw an exception on - // failure - (*this->test_) (orb.in ()); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("CRI (%P|%t) Successfully tested Transport Current from %s\n"), - amethod)); - } - - void - Client_Request_Interceptor::destroy (void) - throw (CORBA::SystemException) - { - } - - void - Client_Request_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest) - { - //Test TC - test_transport_current ("send_request"); - - CORBA::Boolean response_expected = - ri->response_expected (); - - // Oneway? - if (response_expected) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("CRI (%P|%t) Sending a two-way\n"))); - else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("CRI (%P|%t) Sending a one-way\n"))); - - // Make the context to send the context to the target - IOP::ServiceContext sc; - sc.context_id = Test::Transport::CurrentTest::ContextTag; - - // How long can a number really get? - char temp[32]; - { - ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); - - ACE_OS::sprintf (temp, "%d", this->requestID_); - this->requestID_++; - } - - CORBA::ULong string_len = ACE_OS::strlen (temp) + 1; - CORBA::Octet *buf = CORBA::OctetSeq::allocbuf (string_len); - ACE_OS::strcpy (reinterpret_cast <char *> (buf), temp); - - sc.context_data.replace (string_len, string_len, buf, 1); - - // Add this context to the service context list. - ri->add_request_service_context (sc, 0); - } - - void - Client_Request_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr) - throw (CORBA::SystemException) - { - test_transport_current ("send_poll"); - } - - void - Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr) - throw (CORBA::SystemException) - { - test_transport_current ("receive_reply"); - } - - void - Client_Request_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest) - { - test_transport_current ("receive_exception"); - } - - void - Client_Request_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest) - { - test_transport_current ("receive_other"); - } - -} diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h deleted file mode 100644 index 8b9d16adcc9..00000000000 --- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h +++ /dev/null @@ -1,128 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Client_Request_Interceptor.h - * - * $Id$ - * - * Implementation header for the client request interceptor for the - * Transport::Current test. - * - * @author Ossama Othman <ossama@uci.edu> - */ -//============================================================================= - -#ifndef CLIENT_REQUEST_INTERCEPTOR_H -#define CLIENT_REQUEST_INTERCEPTOR_H - -#include /**/ "ace/config.h" -#include /**/ "Current_Test_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PI/PI.h" -#include "tao/PortableInterceptorC.h" -#include "tao/LocalObject.h" -#include "tao/ORB.h" -#include "tao/CORBA_String.h" - -namespace Test -{ - - /// A metod doing the actual testing, so we could change it for the - /// different traits implementations - typedef int (*TEST) (CORBA::ORB_ptr); - - - /** - * @class Client_Request_Interceptor - * - * @brief Client request interceptor that exercises - * Transport::Current support. - * - * This client request interceptor forwards a request to a secondary - * object by throwing the PortableInterceptor::ForwardRequest - * exception from within the send_request() interception point. It - * only forwards the initial request. See the README file for - * details. - */ - class Current_Test_Export Client_Request_Interceptor - : public virtual PortableInterceptor::ClientRequestInterceptor, - public virtual TAO_Local_RefCounted_Object - { - public: - - /// Constructor. - Client_Request_Interceptor (const char *orb_id, - TEST test); - /** - * @name Methods Required by the Client Request Interceptor - * Interface - * - * These are methods that must be implemented since they are pure - * virtual in the abstract base class. They are the canonical - * methods required for all client request interceptors. - */ - //@{ - /// Return the name of this ClientRequestinterceptor. - virtual char * name (void) throw (CORBA::SystemException); - - virtual void destroy (void) throw (CORBA::SystemException); - - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest); - - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) - throw (CORBA::SystemException); - - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - throw (CORBA::SystemException); - - - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest); - - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest); - //@} - - // Number of interceptions - CORBA::Long interceptions (void); - - private: - // Implementation method, every inteception point will have to - // call it, supplying a name. - void test_transport_current (const ACE_TCHAR* amethod) - throw (CORBA::SystemException, CORBA::UserException); - - private: - ///The ID of the ORB this interceptor is registered with. - CORBA::String_var orb_id_; - - /// Pseudo-reference to the ORB this interceptor is registered - /// with. - CORBA::ORB_var orb_; - - /// The number of requests intercepted by this interceptor. - CORBA::ULong request_count_; - - /// Stringified reference to the object the initial request will be - /// forwarded to by this interceptor. - CORBA::String_var forward_str_; - - /// Synchronize internal state... - TAO_SYNCH_MUTEX lock_; - - /// Unique request ID - unsigned long requestID_; - - /// Test function - TEST test_; - }; - -} // namespace Test - -#endif /* CLIENT_REQUEST_INTERCEPTOR_H */ diff --git a/TAO/tests/TransportCurrent/lib/Current_Test.idl b/TAO/tests/TransportCurrent/lib/Current_Test.idl deleted file mode 100644 index a7f00f7d29f..00000000000 --- a/TAO/tests/TransportCurrent/lib/Current_Test.idl +++ /dev/null @@ -1,38 +0,0 @@ -// -*- IDL -*- - -//============================================================================= -/** - * @file Current_Test.idl - * - * $Id$ - * - * Simple IDL file to test TAO::TranspotCurrent - * support. - * - * @author Iliyan Jeliazkov <iliyan@ociweb.com> - */ -//============================================================================= - - - -module Test -{ - module Transport - { - interface CurrentTest - { - - const unsigned long ContextTag = 0xabcdef; - - void invoked_by_client (); - - void invoked_during_upcall (); - - long self_test (); - - oneway void shutdown (); - }; - }; -}; - - diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Export.h b/TAO/tests/TransportCurrent/lib/Current_Test_Export.h deleted file mode 100644 index cfdf16fe60e..00000000000 --- a/TAO/tests/TransportCurrent/lib/Current_Test_Export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -d Current_Test -// ------------------------------ -#ifndef CURRENT_TEST_EXPORT_H -#define CURRENT_TEST_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CURRENT_TEST_HAS_DLL) -# define CURRENT_TEST_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CURRENT_TEST_HAS_DLL */ - -#if !defined (CURRENT_TEST_HAS_DLL) -# define CURRENT_TEST_HAS_DLL 1 -#endif /* ! CURRENT_TEST_HAS_DLL */ - -#if defined (CURRENT_TEST_HAS_DLL) && (CURRENT_TEST_HAS_DLL == 1) -# if defined (CURRENT_TEST_BUILD_DLL) -# define Current_Test_Export ACE_Proper_Export_Flag -# define CURRENT_TEST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CURRENT_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CURRENT_TEST_BUILD_DLL */ -# define Current_Test_Export ACE_Proper_Import_Flag -# define CURRENT_TEST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CURRENT_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CURRENT_TEST_BUILD_DLL */ -#else /* CURRENT_TEST_HAS_DLL == 1 */ -# define Current_Test_Export -# define CURRENT_TEST_SINGLETON_DECLARATION(T) -# define CURRENT_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CURRENT_TEST_HAS_DLL == 1 */ - -// Set CURRENT_TEST_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CURRENT_TEST_NTRACE) -# if (ACE_NTRACE == 1) -# define CURRENT_TEST_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CURRENT_TEST_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CURRENT_TEST_NTRACE */ - -#if (CURRENT_TEST_NTRACE == 1) -# define CURRENT_TEST_TRACE(X) -#else /* (CURRENT_TEST_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CURRENT_TEST_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CURRENT_TEST_NTRACE == 1) */ - -#endif /* CURRENT_TEST_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h deleted file mode 100644 index f8dfc3f3ef3..00000000000 --- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h +++ /dev/null @@ -1,77 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Current_Test_Impl.h - * - * $Id$ - * - * Implementation header for the "test" IDL interface for the - * TAO::TransportCurrent test. - * - * @author Iliyan Jeliazkov <iliyan@ociweb.com> - */ -//============================================================================= - -#ifndef CURRENT_TEST_IMPL_H -#define CURRENT_TEST_IMPL_H - -#include "Current_TestS.h" -#include "tao/TransportCurrent/TCC.h" - -/** - * @class Current_Test_Impl - * - * @brief Simple test class. - * - * This class implements the "test" interface used in this test. - */ -class Current_Test_Impl : public virtual POA_Test::Transport::CurrentTest -{ -public: - - /// Constructor. - Current_Test_Impl (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, int do_collocated_calls = 1); - - /// Destructor. - ~Current_Test_Impl (void); - - /// Main servant test method. - virtual void invoked_by_client (void) throw (CORBA::SystemException); - - /// No-op method used so that a client request interceptor will be - /// invoked when invoking this method from the above invoke_me() - /// method. Say that 10 times fast. :-) - virtual void invoked_during_upcall (void) - throw (CORBA::SystemException); - - /// Shutdown the ORB. - virtual void shutdown (void) throw (CORBA::SystemException); - - // A self-test for coherency - virtual ::CORBA::Long self_test (void) throw (CORBA::SystemException); - -public: - /// Reports if unexpected errors have been encountered for the - /// lifetime of the instance - bool is_successful (void) const; - -private: - void test_transport_current (void) throw (CORBA::SystemException); - - /// Main servant test method. - void invoked_by_client_i (void) - throw (CORBA::SystemException, TAO::Transport::NoContext); - -private: - /// Pseudo-reference to the ORB. - CORBA::ORB_var orb_; - - /// Pseudo-reference to the POA (cache) - PortableServer::POA_var poa_; - - /// To do or not to do ... - int do_collocated_calls_; -}; - -#endif /* CURRENT_TEST_IMPL_H */ diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc b/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc deleted file mode 100644 index 993ff326393..00000000000 --- a/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc +++ /dev/null @@ -1,57 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(*idl): taoidldefaults { - - dynamicflags += CURRENT_TEST_BUILD_DLL - idlflags += -Wb,export_include=Current_Test_Export.h \ - -Wb,export_macro=Current_Test_Export - - IDL_Files { - Current_Test.idl - } - - custom_only = 1 -} - -project(*Client): tc { - - after += *idl TAO_TC - includes += . - libout = . - dynamicflags += CURRENT_TEST_BUILD_DLL - - Source_Files { - Client_Request_Interceptor.cpp - Client_ORBInitializer.cpp - } - - Source_Files { - Current_TestC.cpp - } - - IDL_Files { - } -} - -project(*Server): tc, pi_server { - - after += *Client - includes += . - libout = . - dynamicflags += CURRENT_TEST_BUILD_DLL - - Source_Files { - Server_Request_Interceptor.cpp - Server_ORBInitializer.cpp - } - - Source_Files { - Current_TestC.cpp - Current_TestS.cpp - } - - IDL_Files { - } -} - diff --git a/TAO/tests/TransportCurrent/lib/Makefile.am b/TAO/tests/TransportCurrent/lib/Makefile.am deleted file mode 100644 index 8bd002e5a05..00000000000 --- a/TAO/tests/TransportCurrent/lib/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_LTLIBRARIES = - -## Makefile.Current_Test_Lib_Idl.am - -BUILT_SOURCES = \ - Current_TestC.cpp \ - Current_TestC.h \ - Current_TestC.inl \ - Current_TestS.cpp \ - Current_TestS.h \ - Current_TestS.inl - -CLEANFILES = \ - Current_Test-stamp \ - Current_TestC.cpp \ - Current_TestC.h \ - Current_TestC.inl \ - Current_TestS.cpp \ - Current_TestS.h \ - Current_TestS.inl - -Current_TestC.cpp Current_TestC.h Current_TestC.inl Current_TestS.cpp Current_TestS.h Current_TestS.inl: Current_Test-stamp - -Current_Test-stamp: $(srcdir)/Current_Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_include=Current_Test_Export.h -Wb,export_macro=Current_Test_Export $(srcdir)/Current_Test.idl - @touch $@ - -noinst_HEADERS = \ - Current_Test.idl - -## Makefile.Current_Test_Lib_Client.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libCurrent_Test_Lib_Client.la - -libCurrent_Test_Lib_Client_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I. \ - -DCURRENT_TEST_BUILD_DLL - -libCurrent_Test_Lib_Client_la_SOURCES = \ - Client_ORBInitializer.cpp \ - Client_Request_Interceptor.cpp \ - Current_TestC.cpp - -noinst_HEADERS += \ - Client_ORBInitializer.h \ - Client_Request_Interceptor.h - -endif BUILD_EXCEPTIONS - -## Makefile.Current_Test_Lib_Server.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libCurrent_Test_Lib_Server.la - -libCurrent_Test_Lib_Server_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I. \ - -DCURRENT_TEST_BUILD_DLL - -libCurrent_Test_Lib_Server_la_SOURCES = \ - Current_TestC.cpp \ - Current_TestS.cpp \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp - -noinst_HEADERS += \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp deleted file mode 100644 index 72cc1b34782..00000000000 --- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// -*- C++ -*- - -#include "ace/Log_Msg.h" - -ACE_RCSID (Current_Test_Lib, - Server_ORBInitializer, - "$Id$") - -#include "Server_Request_Interceptor.h" -#include "Server_ORBInitializer.h" - -namespace Test -{ - - Server_ORBInitializer::Server_ORBInitializer - (PortableInterceptor::ServerRequestInterceptor_ptr interceptor) - : interceptor_ - (PortableInterceptor::ServerRequestInterceptor::_duplicate (interceptor)) - { - /* no-op */ - } - - Server_ORBInitializer::~Server_ORBInitializer (void) - { - /* no-op */ - } - - void - Server_ORBInitializer::pre_init(PortableInterceptor::ORBInitInfo*) - throw (CORBA::SystemException) - { - /* no-op */ - } - - // A specialization to handle client-side interceptors - void Server_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo* oii) - throw (CORBA::SystemException) - { - oii->add_server_request_interceptor (this->interceptor_.in ()); - } - -} diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h deleted file mode 100644 index 6a00e61fca1..00000000000 --- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h +++ /dev/null @@ -1,52 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Server_ORBInitializer.h - * - * $Id$ - * - * @author Iliyan jeliazkov <iliyan@ociweb.com> - */ -//============================================================================= - -#ifndef SERVER_ORBINITIALIZER_T_H -#define SERVER_ORBINITIALIZER_T_H -#include /**/ "ace/pre.h" -#include /**/ "ace/config.h" - -#include /**/ "Current_Test_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PI/PI.h" -#include "tao/PortableInterceptorC.h" - -namespace Test -{ - - class Current_Test_Export Server_ORBInitializer : - public PortableInterceptor::ORBInitializer - { - public: - Server_ORBInitializer (PortableInterceptor::ServerRequestInterceptor_ptr interceptor); - ~Server_ORBInitializer (void); - - virtual void pre_init(PortableInterceptor::ORBInitInfo*) - throw (CORBA::SystemException); - - virtual void post_init(PortableInterceptor::ORBInitInfo*) - throw (CORBA::SystemException); - - private: - PortableInterceptor::ServerRequestInterceptor_var interceptor_; - }; - -} - -#include /**/ "ace/post.h" - -#endif /* SERVER_ORBINITIALIZER_T_H */ - diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp deleted file mode 100644 index 1f05e06e8ac..00000000000 --- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp +++ /dev/null @@ -1,120 +0,0 @@ -// -*- C++ -*- - -#include "ace/Log_Msg.h" - -ACE_RCSID (Current_Test_Lib, - Server_Request_Interceptor, - "$Id$") - -#include "Server_Request_Interceptor.h" -#include "Server_ORBInitializer.h" - -namespace Test -{ - - Server_Request_Interceptor::Server_Request_Interceptor (const char* orbid, TEST test) - : request_count_ (0) - , orb_id_ (::CORBA::string_dup (orbid)) - , test_ (test) - { - } - - Server_Request_Interceptor::~Server_Request_Interceptor (void) - { - } - - void - Server_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod) - throw (CORBA::SystemException) - { - CORBA::String_var name (this->name ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s (%P|%t) Test accessing Transport Current from %s\n"), - name.in (), - amethod)); - - ++this->request_count_; - - if (TAO_debug_level >=1) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s (%P|%t) Getting the ORB\n"), - name.in ())); - - int tmpargc = 0; - CORBA::ORB_var orb = CORBA::ORB_init (tmpargc, - 0, - this->orb_id_.in ()); - if (TAO_debug_level >=1) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s (%P|%t) Resolving the TC\n"), - name.in ())); - - CORBA::Object_var tcobject = - orb->resolve_initial_references ("TAO::Transport::Current"); - - // Run the test function - (*this->test_) (orb.in ()); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s (%P|%t) Success - Transport Current from %s\n"), - name.in (), - amethod)); - } - - /// queries the status of the test - bool - Server_Request_Interceptor::self_test (void) - { - return true; - } - - - char * - Server_Request_Interceptor::name (void) - throw (CORBA::SystemException) - { - return CORBA::string_dup ("SRI "); - } - - void - Server_Request_Interceptor::destroy (void) - throw (CORBA::SystemException) - { - } - - void - Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest) - { - test_transport_current ("receive_request_service_contexts"); - } - - void - Server_Request_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest) - { - test_transport_current ("receive_request"); - } - - void - Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr) - throw (CORBA::SystemException) - { - test_transport_current ("send_reply"); - } - - void - Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest) - { - test_transport_current ("send_exception"); - } - - void - Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest) - { - test_transport_current ("send_other"); - } - -} /* namespace Test */ diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h deleted file mode 100644 index f489156c2ae..00000000000 --- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h +++ /dev/null @@ -1,109 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Server_Request_Interceptor.h - * - * $Id$ - * - * Implementation header for the server request interceptor for the - * PortableInterceptor::ForwardRequest test. - * - * @author Ossama Othman <ossama@uci.edu> - */ -//============================================================================= - -#ifndef SERVER_REQUEST_INTERCEPTOR_H -#define SERVER_REQUEST_INTERCEPTOR_H - -#include /**/ "ace/config.h" -#include /**/ "Current_Test_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "Current_TestC.h" - -#include "tao/TransportCurrent/TCC.h" -#include "tao/PortableInterceptorC.h" -#include "tao/LocalObject.h" -#include "tao/PI_Server/PI_Server.h" - -namespace Test -{ - - /// A metod doing the actual testing, so we could change it for the - /// different traits implementations - - typedef int (*TEST) (CORBA::ORB_ptr); - - /** - * @class Server_Request_Interceptor - * - * @brief Simple concrete server request interceptor. - * - */ - class Current_Test_Export Server_Request_Interceptor - : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object - { - public: - - /// Constructor. - Server_Request_Interceptor (const char*orb_id, - TEST test); - - /// Destructor. - virtual ~Server_Request_Interceptor (void); - - virtual void test_transport_current (const char* amethod) - throw (CORBA::SystemException); - - /// Coherency test - virtual bool self_test (void); - - /** - * @name Methods Required by the Server Request Interceptor - * Interface - * - * These are methods that must be implemented since they are pure - * virtual in the abstract base class. They are the canonical - * methods required for all server request interceptors. - */ - //@{ - /// Return the name of this ServerRequestinterceptor. - virtual char * name (void) throw (CORBA::SystemException); - - virtual void destroy (void) throw (CORBA::SystemException); - - virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest); - - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest); - - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - throw (CORBA::SystemException); - - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest); - - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - throw (CORBA::SystemException, PortableInterceptor::ForwardRequest); - //@} - - protected: - - /// The number of requests intercepted by this interceptor. - CORBA::ULong request_count_; - - CORBA::String_var orb_id_; - - TEST test_; - - }; - -} - -#endif /* SERVER_REQUEST_INTERCEPTOR_H */ diff --git a/TAO/tests/Two_Objects/.cvsignore b/TAO/tests/Two_Objects/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Two_Objects/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Two_Objects/Makefile.am b/TAO/tests/Two_Objects/Makefile.am deleted file mode 100644 index aebb6f9ad12..00000000000 --- a/TAO/tests/Two_Objects/Makefile.am +++ /dev/null @@ -1,115 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Two_Objects_Idl.am - -BUILT_SOURCES = \ - Two_ObjectsC.cpp \ - Two_ObjectsC.h \ - Two_ObjectsC.inl \ - Two_ObjectsS.cpp \ - Two_ObjectsS.h \ - Two_ObjectsS.inl - -CLEANFILES = \ - Two_Objects-stamp \ - Two_ObjectsC.cpp \ - Two_ObjectsC.h \ - Two_ObjectsC.inl \ - Two_ObjectsS.cpp \ - Two_ObjectsS.h \ - Two_ObjectsS.inl - -Two_ObjectsC.cpp Two_ObjectsC.h Two_ObjectsC.inl Two_ObjectsS.cpp Two_ObjectsS.h Two_ObjectsS.inl: Two_Objects-stamp - -Two_Objects-stamp: $(srcdir)/Two_Objects.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Two_Objects.idl - @touch $@ - -noinst_HEADERS = \ - Two_Objects.idl - -## Makefile.Two_Objects_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - First_i.cpp \ - Object_Factory_i.cpp \ - Second_i.cpp \ - Two_ObjectsC.cpp \ - Two_ObjectsS.cpp \ - server.cpp \ - worker.cpp \ - First_i.h \ - Object_Factory_i.h \ - Second_i.h \ - worker.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Two_Objects_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Two_ObjectsC.cpp \ - client.cpp \ - First_i.h \ - Object_Factory_i.h \ - Second_i.h \ - worker.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc index 5df5e080f97..1dbe304222f 100644 --- a/TAO/tests/Two_Objects/Two_Objects.mpc +++ b/TAO/tests/Two_Objects/Two_Objects.mpc @@ -1,15 +1,7 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - Two_Objects.idl - } - custom_only = 1 -} - project(*Server): taoserver { - after += *idl Source_Files { worker.cpp First_i.cpp @@ -17,24 +9,13 @@ project(*Server): taoserver { Object_Factory_i.cpp server.cpp } - Source_Files { - Two_ObjectsC.cpp - Two_ObjectsS.cpp - } - IDL_Files { - } } project(*Client): taoclient, anytypecode { - after += *idl after += *Server Source_Files { - client.cpp - } - Source_Files { Two_ObjectsC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp index 0e6d5a8e9f2..639cb344ab8 100644 --- a/TAO/tests/Two_Objects/server.cpp +++ b/TAO/tests/Two_Objects/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Test, server, "$Id$") int msglen = 100; //default length of reply message is 100 bytes int nthreads = 2; const char *ior_output_file = "test.ior"; -int orb_timeout = 30; //default timeout for ORB is 30 sec +int timeout = 30; //default timeout for ORB is 30 sec int @@ -35,7 +35,7 @@ parse_args (int argc, char *argv[]) break; case 't': - orb_timeout = ACE_OS::atoi (get_opts.opt_arg ()); + timeout = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': @@ -90,7 +90,7 @@ main (int argc, char *argv[]) ACE_DEBUG(( LM_DEBUG, "ior file = %s\t#threads = %d\t" "msglen = %d\tORB timeout = %d sec\n", - ior_output_file, nthreads, msglen, orb_timeout )); + ior_output_file, nthreads, msglen, timeout )); // Create the factory servant Object_Factory_i *factory_impl; @@ -127,7 +127,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // Instantiate the specified # of worker threads - Worker worker (orb.in (), orb_timeout); + Worker worker (orb.in (), timeout); if (worker.activate (THR_NEW_LWP | THR_JOINABLE, nthreads) != 0) diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp index ae0889a419a..b1581d8baa9 100644 --- a/TAO/tests/Two_Objects/worker.cpp +++ b/TAO/tests/Two_Objects/worker.cpp @@ -6,7 +6,7 @@ Worker::Worker (CORBA::ORB_ptr orb, int time) : orb_ (CORBA::ORB::_duplicate (orb)), - orb_timeout_(time) + timeout_(time) { } @@ -17,9 +17,9 @@ Worker::svc (void) ACE_TRY { - ACE_Time_Value tv (orb_timeout_); + ACE_Time_Value tv (timeout_); - // orb times out after <timeout> seconds + ///orb times out after <timeout> seconds this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Two_Objects/worker.h b/TAO/tests/Two_Objects/worker.h index 1e2a5a3b54e..42ed1fe0cb9 100644 --- a/TAO/tests/Two_Objects/worker.h +++ b/TAO/tests/Two_Objects/worker.h @@ -25,7 +25,7 @@ private: // The orb CORBA::ORB_var orb_; - int orb_timeout_; + int timeout_; }; #endif /* TAO_TWO_OBJECTS_WORKER_H */ diff --git a/TAO/tests/Typedef_String_Array/.cvsignore b/TAO/tests/Typedef_String_Array/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/Typedef_String_Array/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/Typedef_String_Array/Makefile.am b/TAO/tests/Typedef_String_Array/Makefile.am deleted file mode 100644 index ac0a0b5aa7c..00000000000 --- a/TAO/tests/Typedef_String_Array/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.typedef_string_array_idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.typedef_string_array_server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testImpl.cpp \ - testS.cpp \ - testImpl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.typedef_string_array_client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testImpl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc index c01bab7197e..a28ade36239 100644 --- a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc +++ b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc @@ -1,36 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - project(*server): taoserver { - after += *idl Source_Files { server.cpp testImpl.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } project(*client): taoclient, anytypecode { - after += *idl after += *server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } diff --git a/TAO/tests/UNKNOWN_Exception/.cvsignore b/TAO/tests/UNKNOWN_Exception/.cvsignore new file mode 100644 index 00000000000..f2ad85300eb --- /dev/null +++ b/TAO/tests/UNKNOWN_Exception/.cvsignore @@ -0,0 +1,2 @@ +client +server diff --git a/TAO/tests/UNKNOWN_Exception/Makefile.am b/TAO/tests/UNKNOWN_Exception/Makefile.am deleted file mode 100644 index 087f9441d42..00000000000 --- a/TAO/tests/UNKNOWN_Exception/Makefile.am +++ /dev/null @@ -1,103 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.UNKNOWN_Exception_Idl.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.UNKNOWN_Exception_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.UNKNOWN_Exception_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc index 875eebbdd8f..0fe69a4a621 100644 --- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc +++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc @@ -1,35 +1,17 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults { - IDL_Files { - test.idl - } - custom_only = 1 -} - -project(*Server): taoserver { - after += *idl +project(*Server): taoserver, exceptions { Source_Files { server.cpp } - Source_Files { - testC.cpp - testS.cpp - } - IDL_Files { - } } -project(*Client): taoclient, anytypecode { - after += *idl +project(*Client): taoclient, anytypecode, exceptions { after += *Server Source_Files { - client.cpp - } - Source_Files { testC.cpp - } - IDL_Files { + client.cpp } } + diff --git a/TAO/tests/Xt_Stopwatch/.cvsignore b/TAO/tests/Xt_Stopwatch/.cvsignore new file mode 100644 index 00000000000..955ffdc75d5 --- /dev/null +++ b/TAO/tests/Xt_Stopwatch/.cvsignore @@ -0,0 +1,4 @@ +client +client +server +server diff --git a/TAO/tests/Xt_Stopwatch/Makefile.am b/TAO/tests/Xt_Stopwatch/Makefile.am deleted file mode 100644 index a184bef15a8..00000000000 --- a/TAO/tests/Xt_Stopwatch/Makefile.am +++ /dev/null @@ -1,176 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Xt_Stopwatch_Server.am - -if BUILD_ACE_XTREACTOR -if BUILD_EXCEPTIONS -if BUILD_MOTIF -if BUILD_TAO_XTRESOURCE -if BUILD_X11 -if BUILD_XT - -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) - -server_SOURCES = \ - Stopwatch_display.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - timer.cpp \ - Stopwatch_display.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h \ - timer.h - -server_LDFLAGS = \ - $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_XtResource.la \ - $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -lXm \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) - -endif BUILD_XT -endif BUILD_X11 -endif BUILD_TAO_XTRESOURCE -endif BUILD_MOTIF -endif BUILD_EXCEPTIONS -endif BUILD_ACE_XTREACTOR - -## Makefile.Xt_Stopwatch_Client.am - -if BUILD_ACE_XTREACTOR -if BUILD_EXCEPTIONS -if BUILD_MOTIF -if BUILD_TAO_XTRESOURCE -if BUILD_X11 -if BUILD_XT - -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) - -client_SOURCES = \ - Control.cpp \ - client.cpp \ - testC.cpp \ - Control.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_LDFLAGS = \ - $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_XtResource.la \ - $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -lXm \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) - -endif BUILD_XT -endif BUILD_X11 -endif BUILD_TAO_XTRESOURCE -endif BUILD_MOTIF -endif BUILD_EXCEPTIONS -endif BUILD_ACE_XTREACTOR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB |