summaryrefslogtreecommitdiff
path: root/TAO/tests/POA
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/POA')
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/Makefile.am120
-rw-r--r--TAO/tests/POA/Bug_2511_Regression/Makefile.am2
-rw-r--r--TAO/tests/POA/Deactivate_Object/Makefile.am2
-rw-r--r--TAO/tests/POA/Default_Servant/Makefile.am2
-rw-r--r--TAO/tests/POA/EndpointPolicy/Makefile.am40
-rw-r--r--TAO/tests/POA/Etherealization/Makefile.am2
-rw-r--r--TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am2
-rw-r--r--TAO/tests/POA/Identity/Makefile.am2
-rw-r--r--TAO/tests/POA/MT_Servant_Locator/Makefile.am2
-rw-r--r--TAO/tests/POA/Makefile.am1
-rw-r--r--TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am2
-rw-r--r--TAO/tests/POA/Non_Servant_Upcalls/Makefile.am2
-rw-r--r--TAO/tests/POA/Object_Reactivation/Makefile.am2
-rw-r--r--TAO/tests/POA/POA_Destruction/Makefile.am2
-rw-r--r--TAO/tests/POA/Reference_Counting/Makefile.am2
-rw-r--r--TAO/tests/POA/Single_Threaded_POA/Makefile.am2
-rw-r--r--TAO/tests/POA/wait_for_completion/Makefile.am2
17 files changed, 155 insertions, 34 deletions
diff --git a/TAO/tests/POA/Bug_1592_Regression/Makefile.am b/TAO/tests/POA/Bug_1592_Regression/Makefile.am
new file mode 100644
index 00000000000..5cce7c6c58c
--- /dev/null
+++ b/TAO/tests/POA/Bug_1592_Regression/Makefile.am
@@ -0,0 +1,120 @@
+## Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC. Any changes made directly to
+## this file will be lost the next time it is 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_1592_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_1592_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 \
+ ServantLocator.h \
+ Server_ORBInitializer.h \
+ Server_Request_Interceptor.h \
+ test_i.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_EXCEPTIONS
+
+## Makefile.Bug_1592_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 = \
+ ServantLocator.cpp \
+ Server_ORBInitializer.cpp \
+ Server_Request_Interceptor.cpp \
+ server.cpp \
+ testC.cpp \
+ testS.cpp \
+ test_i.cpp \
+ ServantLocator.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_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/Makefile.am b/TAO/tests/POA/Bug_2511_Regression/Makefile.am
index 06398d5da19..2f621ca4833 100644
--- a/TAO/tests/POA/Bug_2511_Regression/Makefile.am
+++ b/TAO/tests/POA/Bug_2511_Regression/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
@touch $@
noinst_PROGRAMS = server
diff --git a/TAO/tests/POA/Deactivate_Object/Makefile.am b/TAO/tests/POA/Deactivate_Object/Makefile.am
index dcde647032c..4fe0a22cff6 100644
--- a/TAO/tests/POA/Deactivate_Object/Makefile.am
+++ b/TAO/tests/POA/Deactivate_Object/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl
@touch $@
noinst_PROGRAMS = server
diff --git a/TAO/tests/POA/Default_Servant/Makefile.am b/TAO/tests/POA/Default_Servant/Makefile.am
index f55f9ec8940..66737a59334 100644
--- a/TAO/tests/POA/Default_Servant/Makefile.am
+++ b/TAO/tests/POA/Default_Servant/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
@touch $@
noinst_PROGRAMS = Default_Servant
diff --git a/TAO/tests/POA/EndpointPolicy/Makefile.am b/TAO/tests/POA/EndpointPolicy/Makefile.am
index c59078cc840..1dec2059461 100644
--- a/TAO/tests/POA/EndpointPolicy/Makefile.am
+++ b/TAO/tests/POA/EndpointPolicy/Makefile.am
@@ -45,55 +45,55 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
noinst_HEADERS = \
Test.idl
-## Makefile.EndpointPolicy_Server.am
+## Makefile.EndpointPolicy_Client.am
if BUILD_EXCEPTIONS
-bin_PROGRAMS = server
+noinst_PROGRAMS = client
-server_CPPFLAGS = \
+client_CPPFLAGS = \
-I$(ACE_ROOT) \
-I$(ACE_BUILDDIR) \
-I$(TAO_ROOT) \
-I$(TAO_BUILDDIR)
-server_SOURCES = \
- Hello.cpp \
+client_SOURCES = \
TestC.cpp \
- TestS.cpp \
- server.cpp \
+ client.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 \
+client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
endif BUILD_EXCEPTIONS
-## Makefile.EndpointPolicy_Client.am
+## Makefile.EndpointPolicy_Server.am
if BUILD_EXCEPTIONS
-noinst_PROGRAMS = client
+bin_PROGRAMS = server
-client_CPPFLAGS = \
+server_CPPFLAGS = \
-I$(ACE_ROOT) \
-I$(ACE_BUILDDIR) \
-I$(TAO_ROOT) \
-I$(TAO_BUILDDIR)
-client_SOURCES = \
+server_SOURCES = \
+ Hello.cpp \
TestC.cpp \
- client.cpp \
+ TestS.cpp \
+ server.cpp \
Hello.h
-client_LDADD = \
+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
diff --git a/TAO/tests/POA/Etherealization/Makefile.am b/TAO/tests/POA/Etherealization/Makefile.am
index 7e48dfb8170..77cdfb9a57a 100644
--- a/TAO/tests/POA/Etherealization/Makefile.am
+++ b/TAO/tests/POA/Etherealization/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
@touch $@
noinst_PROGRAMS = Etherealization
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am b/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am
index 81a0191efed..61d281b75b2 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
@touch $@
noinst_PROGRAMS = Excessive_Object_Deactivations
diff --git a/TAO/tests/POA/Identity/Makefile.am b/TAO/tests/POA/Identity/Makefile.am
index 0233b450a07..695ad799bc9 100644
--- a/TAO/tests/POA/Identity/Makefile.am
+++ b/TAO/tests/POA/Identity/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
@touch $@
noinst_PROGRAMS = Identity
diff --git a/TAO/tests/POA/MT_Servant_Locator/Makefile.am b/TAO/tests/POA/MT_Servant_Locator/Makefile.am
index 5d7183bdbe1..9134eb9da62 100644
--- a/TAO/tests/POA/MT_Servant_Locator/Makefile.am
+++ b/TAO/tests/POA/MT_Servant_Locator/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
@touch $@
noinst_PROGRAMS = MT_Servant_Locator
diff --git a/TAO/tests/POA/Makefile.am b/TAO/tests/POA/Makefile.am
index baa8f3833d1..608ca67e2ee 100644
--- a/TAO/tests/POA/Makefile.am
+++ b/TAO/tests/POA/Makefile.am
@@ -9,6 +9,7 @@
## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
SUBDIRS = \
+ Bug_1592_Regression \
Bug_2511_Regression \
Current \
Deactivate_Object \
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am
index 09eb04269e5..e04e7f6d880 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
@touch $@
noinst_PROGRAMS = Nested_Non_Servant_Upcalls
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am b/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am
index 7e0bc5f933a..7757a99059a 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
@touch $@
noinst_PROGRAMS = Non_Servant_Upcalls
diff --git a/TAO/tests/POA/Object_Reactivation/Makefile.am b/TAO/tests/POA/Object_Reactivation/Makefile.am
index 57ad776232c..4af80d8bcfb 100644
--- a/TAO/tests/POA/Object_Reactivation/Makefile.am
+++ b/TAO/tests/POA/Object_Reactivation/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
@touch $@
noinst_PROGRAMS = Object_Reactivation
diff --git a/TAO/tests/POA/POA_Destruction/Makefile.am b/TAO/tests/POA/POA_Destruction/Makefile.am
index 9a3da85c363..72dfca53cc1 100644
--- a/TAO/tests/POA/POA_Destruction/Makefile.am
+++ b/TAO/tests/POA/POA_Destruction/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
@touch $@
noinst_PROGRAMS = POA_Destruction
diff --git a/TAO/tests/POA/Reference_Counting/Makefile.am b/TAO/tests/POA/Reference_Counting/Makefile.am
index 7d254b6c7e2..62c2ce6cd17 100644
--- a/TAO/tests/POA/Reference_Counting/Makefile.am
+++ b/TAO/tests/POA/Reference_Counting/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Hello.idl
@touch $@
noinst_PROGRAMS = server
diff --git a/TAO/tests/POA/Single_Threaded_POA/Makefile.am b/TAO/tests/POA/Single_Threaded_POA/Makefile.am
index d9745f895e2..18dd78bee27 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Makefile.am
+++ b/TAO/tests/POA/Single_Threaded_POA/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
@touch $@
noinst_PROGRAMS = Single_Threaded_POA
diff --git a/TAO/tests/POA/wait_for_completion/Makefile.am b/TAO/tests/POA/wait_for_completion/Makefile.am
index 6aebb6f3cfa..c2cd0e64584 100644
--- a/TAO/tests/POA/wait_for_completion/Makefile.am
+++ b/TAO/tests/POA/wait_for_completion/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
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
+ $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
@touch $@
noinst_PROGRAMS = wait_for_completion
View Lorry Controller Status