summaryrefslogtreecommitdiff
path: root/TAO/tests
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests')
-rw-r--r--TAO/tests/AMI/Makefile.bor7
-rw-r--r--TAO/tests/CDR/Makefile.bor10
-rw-r--r--TAO/tests/Collocation/Makefile.bor7
-rw-r--r--TAO/tests/Endpoint_Per_Priority/Makefile.bor6
-rw-r--r--TAO/tests/Explicit_Event_Loop/Makefile.bor6
-rw-r--r--TAO/tests/Faults/Makefile.bor9
-rw-r--r--TAO/tests/InterOp-Naming/Makefile.bor6
-rw-r--r--TAO/tests/Interceptors/Makefile.bor6
-rw-r--r--TAO/tests/MProfile/Makefile.bor6
-rw-r--r--TAO/tests/MProfile/test_i.h4
-rw-r--r--TAO/tests/Makefile.bor42
-rw-r--r--TAO/tests/Param_Test/Makefile.bor6
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Makefile.bor7
-rw-r--r--TAO/tests/Timeout/Makefile.bor6
14 files changed, 42 insertions, 86 deletions
diff --git a/TAO/tests/AMI/Makefile.bor b/TAO/tests/AMI/Makefile.bor
index 6cdc1d3da90..b891b969552 100644
--- a/TAO/tests/AMI/Makefile.bor
+++ b/TAO/tests/AMI/Makefile.bor
@@ -2,9 +2,6 @@
# Makefile for building the AMI test executables
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+MAKEFILES = server.bor client.bor simple_client.bor
-all:
- $(MAKE) -f server.bor $(MAKE_FLAGS)
- $(MAKE) -f client.bor $(MAKE_FLAGS)
- $(MAKE) -f simple_client.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/CDR/Makefile.bor b/TAO/tests/CDR/Makefile.bor
index 2a3727b57cf..7c8ef190efa 100644
--- a/TAO/tests/CDR/Makefile.bor
+++ b/TAO/tests/CDR/Makefile.bor
@@ -1,13 +1,7 @@
-
#
# Makefile for building the CDR tests
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+MAKEFILES = allocator.bor basic_types.bor growth.bor octet_sequence.bor tc.bor
-tests:
- $(MAKE) -f allocator.bor $(MAKE_FLAGS)
- $(MAKE) -f basic_types.bor $(MAKE_FLAGS)
- $(MAKE) -f growth.bor $(MAKE_FLAGS)
- $(MAKE) -f octet_sequence.bor $(MAKE_FLAGS)
- $(MAKE) -f tc.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Collocation/Makefile.bor b/TAO/tests/Collocation/Makefile.bor
index 851e33b1a20..597234b5974 100644
--- a/TAO/tests/Collocation/Makefile.bor
+++ b/TAO/tests/Collocation/Makefile.bor
@@ -2,9 +2,6 @@
# Makefile for building the Collocation test executables and libraries
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+MAKEFILES = Coll_Test_Stubs.bor Diamond.bor Collocation.bor
-all:
- $(MAKE) -f Coll_Test_Stubs.bor $(MAKE_FLAGS)
- $(MAKE) -f Diamond.bor $(MAKE_FLAGS)
- $(MAKE) -f Collocation.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Endpoint_Per_Priority/Makefile.bor b/TAO/tests/Endpoint_Per_Priority/Makefile.bor
index 6afe0052c99..5415c5f741a 100644
--- a/TAO/tests/Endpoint_Per_Priority/Makefile.bor
+++ b/TAO/tests/Endpoint_Per_Priority/Makefile.bor
@@ -2,8 +2,6 @@
# Makefile for building the Endpoint_Per_Priority test executables
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+MAKEFILES = server.bor client.bor
-all:
- $(MAKE) -f server.bor $(MAKE_FLAGS)
- $(MAKE) -f client.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Explicit_Event_Loop/Makefile.bor b/TAO/tests/Explicit_Event_Loop/Makefile.bor
index 60137283cb9..335981c0081 100644
--- a/TAO/tests/Explicit_Event_Loop/Makefile.bor
+++ b/TAO/tests/Explicit_Event_Loop/Makefile.bor
@@ -2,8 +2,6 @@
# Makefile for building the Explicit_Event_Loop test executables
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+MAKEFILES = server.bor client.bor
-all:
- $(MAKE) -f server.bor $(MAKE_FLAGS)
- $(MAKE) -f client.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Faults/Makefile.bor b/TAO/tests/Faults/Makefile.bor
index 57f5f8901cc..a4c8d9a474c 100644
--- a/TAO/tests/Faults/Makefile.bor
+++ b/TAO/tests/Faults/Makefile.bor
@@ -2,11 +2,6 @@
# Makefile for building the Faults test executables
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+MAKEFILES = server.bor middle.bor client.bor ping.bor pong.bor
-all:
- $(MAKE) -f server.bor $(MAKE_FLAGS)
- $(MAKE) -f middle.bor $(MAKE_FLAGS)
- $(MAKE) -f client.bor $(MAKE_FLAGS)
- $(MAKE) -f ping.bor $(MAKE_FLAGS)
- $(MAKE) -f pong.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/InterOp-Naming/Makefile.bor b/TAO/tests/InterOp-Naming/Makefile.bor
index f0603d3d459..6de3ea09f0a 100644
--- a/TAO/tests/InterOp-Naming/Makefile.bor
+++ b/TAO/tests/InterOp-Naming/Makefile.bor
@@ -2,8 +2,6 @@
# Makefile for building the InterOp-Naming test executables
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+MAKEFILES = server.bor client.bor
-all:
- $(MAKE) -f server.bor $(MAKE_FLAGS)
- $(MAKE) -f client.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Interceptors/Makefile.bor b/TAO/tests/Interceptors/Makefile.bor
index 15df3d031cb..1224510c2f9 100644
--- a/TAO/tests/Interceptors/Makefile.bor
+++ b/TAO/tests/Interceptors/Makefile.bor
@@ -2,8 +2,6 @@
# Makefile for building the Interceptors test executables
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+MAKEFILES = server.bor client.bor
-all:
- $(MAKE) -f server.bor $(MAKE_FLAGS)
- $(MAKE) -f client.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/MProfile/Makefile.bor b/TAO/tests/MProfile/Makefile.bor
index 2e280ea5fff..4a119810aa6 100644
--- a/TAO/tests/MProfile/Makefile.bor
+++ b/TAO/tests/MProfile/Makefile.bor
@@ -2,8 +2,6 @@
# Makefile for building the MProfile test executables
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+MAKEFILES = server.bor client.bor
-all:
- $(MAKE) -f server.bor $(MAKE_FLAGS)
- $(MAKE) -f client.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h
index 48c742508f8..0016ce9b90b 100644
--- a/TAO/tests/MProfile/test_i.h
+++ b/TAO/tests/MProfile/test_i.h
@@ -9,7 +9,7 @@
// test_i.h
//
// = AUTHOR
-// Carlos O'Ryan
+// Carlos O'Ryan <coryan@uci.edu>
//
// ============================================================================
@@ -35,7 +35,7 @@ public:
// ctor
// = The Simple_Server methods.
- void remote_call (CORBA::Environment &);
+ void remote_call (CORBA::Environment &)
ACE_THROW_SPEC ((CORBA::SystemException));
void shutdown (CORBA::Environment&)
diff --git a/TAO/tests/Makefile.bor b/TAO/tests/Makefile.bor
index ade0ddd46c0..1711fd29015 100644
--- a/TAO/tests/Makefile.bor
+++ b/TAO/tests/Makefile.bor
@@ -2,30 +2,20 @@
# Makefile for building the TAO tests
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+DIRS = \
+ CDR \
+ Collocation \
+ Connection_Purging \
+ DynAny_Test \
+ Endpoint_Per_Priority \
+ Explicit_Event_Loop \
+ Faults \
+ IDL_Test \
+ InterOp-Naming \
+ Interceptors \
+ IORManipulation \
+ MProfile \
+ Param_Test \
+ Timeout
-tests:
- cd $(ACE_ROOT)\TAO\tests\CDR
- $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
- cd $(ACE_ROOT)\TAO\tests\Connection_Purging
- $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
- cd $(ACE_ROOT)\TAO\tests\DynAny_Test
- $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
- cd $(ACE_ROOT)\TAO\tests\Endpoint_Per_Priority
- $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
- cd $(ACE_ROOT)\TAO\tests\Explicit_Event_Loop
- $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
- cd $(ACE_ROOT)\TAO\tests\Faults
- $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
- cd $(ACE_ROOT)\TAO\tests\IDL_Test
- $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
- cd $(ACE_ROOT)\TAO\tests\IORManipulation
- $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
- cd $(ACE_ROOT)\TAO\tests\InterOp-Naming
- $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
- cd $(ACE_ROOT)\TAO\tests\Interceptors
- $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
- cd $(ACE_ROOT)\TAO\tests\MProfile
- $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
- cd $(ACE_ROOT)\TAO\tests\Param_Test
- $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Param_Test/Makefile.bor b/TAO/tests/Param_Test/Makefile.bor
index cce6a0e677e..4693d686fc3 100644
--- a/TAO/tests/Param_Test/Makefile.bor
+++ b/TAO/tests/Param_Test/Makefile.bor
@@ -2,8 +2,6 @@
# Makefile for building the Param_Test executables
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+MAKEFILES = server.bor client.bor
-all:
- $(MAKE) -f server.bor $(MAKE_FLAGS)
- $(MAKE) -f client.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Smart_Proxies/Collocation/Makefile.bor b/TAO/tests/Smart_Proxies/Collocation/Makefile.bor
index 851e33b1a20..597234b5974 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Makefile.bor
+++ b/TAO/tests/Smart_Proxies/Collocation/Makefile.bor
@@ -2,9 +2,6 @@
# Makefile for building the Collocation test executables and libraries
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+MAKEFILES = Coll_Test_Stubs.bor Diamond.bor Collocation.bor
-all:
- $(MAKE) -f Coll_Test_Stubs.bor $(MAKE_FLAGS)
- $(MAKE) -f Diamond.bor $(MAKE_FLAGS)
- $(MAKE) -f Collocation.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Timeout/Makefile.bor b/TAO/tests/Timeout/Makefile.bor
index 353d14dba0e..7e6b7685129 100644
--- a/TAO/tests/Timeout/Makefile.bor
+++ b/TAO/tests/Timeout/Makefile.bor
@@ -2,8 +2,6 @@
# Makefile for building the Timeout test executables
#
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+MAKEFILES = server.bor client.bor
-all:
- $(MAKE) -f server.bor $(MAKE_FLAGS)
- $(MAKE) -f client.bor $(MAKE_FLAGS)
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
View Lorry Controller Status