ChangeLogTag:Mon Feb 26 09:32:24 2001 Carlos O'Ryan <coryan@cs.wustl.edu>

6 files changed, 16 insertions, 17 deletions

diff --git a/TAO/tests/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
index a2c4e48a50b..a319c554c9f 100755
--- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
@@ -26,7 +26,7 @@ unlink $iorfile2;
 # available range.
 
 $server_args =
-    "-p $iorfile1 -o $iorfile2 -a 65 -b 75 -c 70 -ORBSvcConf server.conf "
+    "-p $iorfile1 -o $iorfile2 -a 65 -b 75 -c 70 -ORBDebugLevel 0 -ORBSvcConf server.conf "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=65 "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=75 "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=73 ";
@@ -40,7 +40,7 @@ if ($^O eq "MSWin32")
                     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=1 ";
 }
 
-$client_args = "-p file://$iorfile1 -o file://$iorfile2";
+$client_args = "-p file://$iorfile1 -o file://$iorfile2 -ORBDebugLevel 10";
 
 $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
                        $server_args);
diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index 59ae6518638..d229244c8d1 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -99,16 +99,16 @@ main (int argc, char **argv)
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      test::data data (data_bytes);
-      data.length (data_bytes);
+      test::data the_data0 (data_bytes);
+      the_data0.length (data_bytes);
 
       data_bytes *= 10;
-      test::data data1 (data_bytes);
-      data.length (data_bytes);
+      test::data the_data1 (data_bytes);
+      the_data1.length (data_bytes);
 
       data_bytes /= 100;
-      test::data data2 (data_bytes);
-      data.length (data_bytes);
+      test::data the_data2 (data_bytes);
+      the_data2.length (data_bytes);
 
       for (CORBA::ULong i = 1; i <= iterations; ++i)
         {
@@ -118,19 +118,19 @@ main (int argc, char **argv)
 
           // Invoke the oneway method.
           test_object->method (i,
-                               data,
+                               the_data0,
                                ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           // Invoke the oneway method.
           test_object->method (i,
-                               data1,
+                               the_data1,
                                ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           // Invoke the oneway method.
           test_object->method (i,
-                               data2,
+                               the_data2,
                                ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
diff --git a/TAO/tests/Smart_Proxies/Makefile b/TAO/tests/Smart_Proxies/Makefile
index 425a9bf77d3..6d2923535d4 100644
--- a/TAO/tests/Smart_Proxies/Makefile
+++ b/TAO/tests/Smart_Proxies/Makefile
@@ -43,7 +43,7 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-LDFLAGS += -L$(TAO_ROOT)/tao -I$(TAO_ROOT)/tao
+LDFLAGS  += -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/tao
 
 .PRECIOUS: testC.h testC.i testC.cpp
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Makefile b/TAO/tests/Smart_Proxies/On_Demand/Makefile
index daf3d1381da..b925e343ad0 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Makefile
+++ b/TAO/tests/Smart_Proxies/On_Demand/Makefile
@@ -56,7 +56,7 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-LDFLAGS += -L$(TAO_ROOT)/tao -I$(TAO_ROOT)/tao
+LDFLAGS  += -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/tao
 
 .PRECIOUS: testC.h testC.i testC.cpp
diff --git a/TAO/tests/Smart_Proxies/Policy/Makefile b/TAO/tests/Smart_Proxies/Policy/Makefile
index 0e51a2e3e5b..c6558bca250 100644
--- a/TAO/tests/Smart_Proxies/Policy/Makefile
+++ b/TAO/tests/Smart_Proxies/Policy/Makefile
@@ -43,7 +43,6 @@ include $(TAO_ROOT)/taoconfig.mk
 #----------------------------------------------------------------------------
 
 LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS +=
 
 .PRECIOUS: testC.h testC.i testC.cpp
 .PRECIOUS: testS.h testS.i testS.cpp
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index f0f53a77c7c..86ce08e0086 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -271,8 +271,8 @@ main (int argc, char **argv)
                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      test::data data (data_bytes);
-      data.length (data_bytes);
+      test::data the_data (data_bytes);
+      the_data.length (data_bytes);
 
       for (CORBA::ULong i = 1; i <= iterations; ++i)
         {
@@ -282,7 +282,7 @@ main (int argc, char **argv)
 
           // Invoke the oneway method.
           test_object->method (i,
-                               data,
+                               the_data,
                                work,
                                ACE_TRY_ENV);
           ACE_TRY_CHECK;